generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enhance PACKET readability

Browse Source 
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>
This commit is contained in:
Matt Caswell 2015-08-03 17:20:47 +01:00
parent f9f6053442
commit bc6616a434
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ssl/packet_locl.h
View File

@ -80,8 +80,7 @@ typedef struct {
} PACKET; } PACKET;
/* /*
* Returns 1 if there are exactly |len| bytes left to be read from |pkt| * Returns the number of bytes remaining to be read in the PACKET
* and 0 otherwise
*/ */
__owur static inline size_t PACKET_remaining(PACKET *pkt) __owur static inline size_t PACKET_remaining(PACKET *pkt)
{ {

2
ssl/s3_srvr.c
View File

@ -1059,7 +1059,7 @@ int ssl3_get_client_hello(SSL *s)
memset(s->s3->client_random, 0, SSL3_RANDOM_SIZE); memset(s->s3->client_random, 0, SSL3_RANDOM_SIZE);
if (!PACKET_peek_copy_bytes(&pkt, s->s3->client_random, i) if (!PACKET_peek_copy_bytes(&pkt, s->s3->client_random, i)
|| !PACKET_forward(&pkt, cl) || !PACKET_forward(&pkt, cl)
|| !PACKET_remaining(&pkt) == 0) { || PACKET_remaining(&pkt) != 0) {
SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_RECORD_LENGTH_MISMATCH); SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_RECORD_LENGTH_MISMATCH);
al = SSL_AD_DECODE_ERROR; al = SSL_AD_DECODE_ERROR;
goto f_err; goto f_err;

4
ssl/t1_lib.c
View File

@ -2036,7 +2036,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
} }
} }
/* We shouldn't have any bytes left */ /* We shouldn't have any bytes left */
if (PACKET_remaining(&ssubpkt)) if (PACKET_remaining(&ssubpkt) != 0)
goto err; goto err;
} }
@ -2140,7 +2140,7 @@ static int ssl_scan_clienthello_tlsext(SSL *s, PACKET *pkt, int *al)
|| (dsize & 1) != 0 || (dsize & 1) != 0
|| (dsize == 0) || (dsize == 0)
|| !PACKET_get_bytes(&subpkt, &data, dsize) || !PACKET_get_bytes(&subpkt, &data, dsize)
|| PACKET_remaining(&subpkt) || PACKET_remaining(&subpkt) != 0
|| !tls1_save_sigalgs(s, data, dsize)) { || !tls1_save_sigalgs(s, data, dsize)) {
goto err; goto err;
} }

2
test/packettest.c
View File

@ -67,7 +67,7 @@ static int test_PACKET_remaining(PACKET *pkt)
|| !PACKET_forward(pkt, BUF_LEN - 1) || !PACKET_forward(pkt, BUF_LEN - 1)
|| PACKET_remaining(pkt) != 1 || PACKET_remaining(pkt) != 1
|| !PACKET_forward(pkt, 1) || !PACKET_forward(pkt, 1)
|| PACKET_remaining(pkt)) { || PACKET_remaining(pkt) != 0) {
fprintf(stderr, "test_PACKET_remaining() failed\n"); fprintf(stderr, "test_PACKET_remaining() failed\n");
return 0; return 0;
} }