X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=ssl%2Ft1_reneg.c;h=5e9c71eecc592b71f19937689cd7cc9dfffadf8c;hb=6b473acabdfc72c99677a15f03295c12e4ff32fb;hp=492386efe65a58d5b05496124ce3b88f47810c9e;hpb=fadd9a1e2d2ab1d63bd05c30a0d845e837deb9be;p=openssl.git diff --git a/ssl/t1_reneg.c b/ssl/t1_reneg.c index 492386efe6..5e9c71eecc 100644 --- a/ssl/t1_reneg.c +++ b/ssl/t1_reneg.c @@ -11,44 +11,6 @@ #include #include "ssl_locl.h" -/* - * Parse the client's renegotiation binding and abort if it's not right - */ -int ssl_parse_clienthello_renegotiate_ext(SSL *s, PACKET *pkt, int *al) -{ - unsigned int ilen; - const unsigned char *d; - - /* Parse the length byte */ - if (!PACKET_get_1(pkt, &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; - return 0; - } - - /* Check that the extension matches */ - if (ilen != s->s3->previous_client_finished_len) { - SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, - SSL_R_RENEGOTIATION_MISMATCH); - *al = SSL_AD_HANDSHAKE_FAILURE; - return 0; - } - - if (memcmp(d, s->s3->previous_client_finished, - s->s3->previous_client_finished_len)) { - SSLerr(SSL_F_SSL_PARSE_CLIENTHELLO_RENEGOTIATE_EXT, - SSL_R_RENEGOTIATION_MISMATCH); - *al = SSL_AD_HANDSHAKE_FAILURE; - return 0; - } - - s->s3->send_connection_binding = 1; - - return 1; -} - /* Add the server's renegotiation binding */ int ssl_add_serverhello_renegotiate_ext(SSL *s, WPACKET *pkt) {