projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a test for 'openssl passwd'
[oweals/openssl.git]
/
ssl
/
t1_reneg.c
diff --git
a/ssl/t1_reneg.c
b/ssl/t1_reneg.c
index 15a4e27a154004b56e922d1dc07f1c895fd23d77..01dc403bdb571e66d25e18f6b7271d02902fff06 100644
(file)
--- a/
ssl/t1_reneg.c
+++ b/
ssl/t1_reneg.c
@@
-45,7
+45,7
@@
int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al)
/* Parse the length byte */
if (!PACKET_get_1(pkt, &ilen)
/* Parse the length byte */
if (!PACKET_get_1(pkt, &ilen)
-
|| !PACKET_get_bytes(pkt, &d, ilen)) {
+ || !PACKET_get_bytes(pkt, &d, ilen)) {
SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
SSL_R_RENEGOTIATION_ENCODING_ERR);
*al = SSL_AD_ILLEGAL_PARAMETER;
SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT,
SSL_R_RENEGOTIATION_ENCODING_ERR);
*al = SSL_AD_ILLEGAL_PARAMETER;
@@
-143,8
+143,8
@@
int ssl_parse_serverhello_renegotiate_ext(SSL *s, PACKET *pkt, int *al)
}
if (!PACKET_get_bytes(pkt, &data, s->s3->previous_client_finished_len)
}
if (!PACKET_get_bytes(pkt, &data, s->s3->previous_client_finished_len)
-
|| memcmp(data, s->s3->previous_client_finished,
- s->s3->previous_client_finished_len) != 0) {
+ || memcmp(data, s->s3->previous_client_finished,
+
s->s3->previous_client_finished_len) != 0) {
SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
SSL_R_RENEGOTIATION_MISMATCH);
*al = SSL_AD_HANDSHAKE_FAILURE;
SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
SSL_R_RENEGOTIATION_MISMATCH);
*al = SSL_AD_HANDSHAKE_FAILURE;
@@
-152,8
+152,8
@@
int ssl_parse_serverhello_renegotiate_ext(SSL *s, PACKET *pkt, int *al)
}
if (!PACKET_get_bytes(pkt, &data, s->s3->previous_server_finished_len)
}
if (!PACKET_get_bytes(pkt, &data, s->s3->previous_server_finished_len)
-
|| memcmp(data, s->s3->previous_server_finished,
- s->s3->previous_server_finished_len) != 0) {
+ || memcmp(data, s->s3->previous_server_finished,
+
s->s3->previous_server_finished_len) != 0) {
SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
SSL_R_RENEGOTIATION_MISMATCH);
*al = SSL_AD_ILLEGAL_PARAMETER;
SSLerr(SSL_F_SSL_PARSE_SERVERHELLO_RENEGOTIATE_EXT,
SSL_R_RENEGOTIATION_MISMATCH);
*al = SSL_AD_ILLEGAL_PARAMETER;