mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-05 14:10:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Various style fixes from the TLSv1.3 record changes review

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Matt Caswell 2016-12-02 11:10:16 +00:00
parent 88858868ab
commit 829754a622
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ssl/packet.c
View File

@ -63,7 +63,7 @@ int WPACKET_reserve_bytes(WPACKET *pkt, size_t len, unsigned char **allocbytes)
return 0; return 0;
} }
if (allocbytes != NULL) if (allocbytes != NULL)
*allocbytes = GETBUF(pkt) + pkt->curr; *allocbytes = WPACKET_get_curr(pkt);
return 1; return 1;
} }

6
ssl/record/rec_layer_s3.c
View File

@ -638,7 +638,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
unsigned char *recordstart; unsigned char *recordstart;
int i, mac_size, clear = 0; int i, mac_size, clear = 0;
size_t prefix_len = 0; size_t prefix_len = 0;
int eivlen; int eivlen = 0;
size_t align = 0; size_t align = 0;
SSL3_BUFFER *wb; SSL3_BUFFER *wb;
SSL_SESSION *sess; SSL_SESSION *sess;
@ -776,11 +776,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
eivlen = EVP_GCM_TLS_EXPLICIT_IV_LEN; eivlen = EVP_GCM_TLS_EXPLICIT_IV_LEN;
} else if (mode == EVP_CIPH_CCM_MODE) { } else if (mode == EVP_CIPH_CCM_MODE) {
eivlen = EVP_CCM_TLS_EXPLICIT_IV_LEN; eivlen = EVP_CCM_TLS_EXPLICIT_IV_LEN;
} else {
eivlen = 0;
} }
} else {
eivlen = 0;
} }
totlen = 0; totlen = 0;