Commit bc6616a4 authored by Matt Caswell's avatar Matt Caswell
Browse files

Enhance PACKET readability 



Enhance the PACKET code readability, and fix a stale comment. Thanks
to Ben Kaduk (bkaduk@akamai.com) for pointing this out.

Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent f9f60534

ssl/packet_locl.h

+1 −2
Original line number Diff line number Diff line
@@ -80,8 +80,7 @@ typedef struct { 
} PACKET;



/*

 * Returns 1 if there are exactly |len| bytes left to be read from |pkt|

 * and 0 otherwise

 * Returns the number of bytes remaining to be read in the PACKET

 */

__owur static inline size_t PACKET_remaining(PACKET *pkt)

{

ssl/s3_srvr.c

+1 −1
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ int ssl3_get_client_hello(SSL *s) 
        memset(s->s3->client_random, 0, SSL3_RANDOM_SIZE);

        if (!PACKET_peek_copy_bytes(&pkt, s->s3->client_random, i)

                || !PACKET_forward(&pkt, cl)

                || !PACKET_remaining(&pkt) == 0) {

                || PACKET_remaining(&pkt) != 0) {

            SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_RECORD_LENGTH_MISMATCH);

            al = SSL_AD_DECODE_ERROR;

            goto f_err;

ssl/t1_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -2036,7 +2036,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al) 
                    }

            }

            /* We shouldn't have any bytes left */

            if (PACKET_remaining(&ssubpkt))

            if (PACKET_remaining(&ssubpkt) != 0)

                goto err;



        }
@@ -2140,7 +2140,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al) 
                    || (dsize & 1) != 0

                    || (dsize == 0)

                    || !PACKET_get_bytes(&subpkt, &data, dsize)

                    || PACKET_remaining(&subpkt)

                    || PACKET_remaining(&subpkt) != 0

                    || !tls1_save_sigalgs(s, data, dsize)) {

                goto err;

            }

test/packettest.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int test_PACKET_remaining(PACKET *pkt) 
            || !PACKET_forward(pkt, BUF_LEN - 1)

            ||  PACKET_remaining(pkt) != 1

            || !PACKET_forward(pkt, 1)

            ||  PACKET_remaining(pkt)) {

            ||  PACKET_remaining(pkt) != 0) {

        fprintf(stderr, "test_PACKET_remaining() failed\n");

        return 0;

    }