diff options
| author | Matt Caswell <matt@openssl.org> | 2015-08-03 17:20:47 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-08-13 20:34:51 +0100 |
| commit | bc6616a4347d4c30bce1d1918da09f09f84c0403 (patch) | |
| tree | c7fc9a59f688b9a1fd7ec2e4e5864d0705e99272 | |
| parent | f9f6053442a2918d0445866252256b2cb54a1187 (diff) | |
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: Emilia Käsper <emilia@openssl.org>
| -rw-r--r-- | ssl/packet_locl.h | 3 | ||||
| -rw-r--r-- | ssl/s3_srvr.c | 2 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 4 | ||||
| -rw-r--r-- | test/packettest.c | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/ssl/packet_locl.h b/ssl/packet_locl.h index 80d0b93fd9..a5e4d00911 100644 --- a/ssl/packet_locl.h +++ b/ssl/packet_locl.h @@ -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) { diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index c723ea0f2d..a015a495c7 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -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; diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index ece2b72ac6..e37411ccbf 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -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; } diff --git a/test/packettest.c b/test/packettest.c index d6d0c082f5..c3ac53bcb0 100644 --- a/test/packettest.c +++ b/test/packettest.c @@ -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; } |