Secure renegotiation extension should only be sent in case client supports secure renegotiation

This commit is contained in:
Paul Bakker 2013-06-06 11:22:13 +02:00
parent 822e958bb2
commit 7c3c3899cf
2 changed files with 27 additions and 19 deletions

View file

@ -1,5 +1,10 @@
PolarSSL ChangeLog
= Branch 1.2
Bugfix
* Secure renegotiation extension should only be sent in case client
supports secure renegotiation
= Version 1.2.7 released 2013-04-13
Features
* Ability to specify allowed ciphersuites based on the protocol version.

View file

@ -864,6 +864,8 @@ static int ssl_write_server_hello( ssl_context *ssl )
SSL_DEBUG_MSG( 3, ( "server hello, compress alg.: %d",
ssl->session_negotiate->compression ) );
if( ssl->secure_renegotiation == SSL_SECURE_RENEGOTIATION )
{
SSL_DEBUG_MSG( 3, ( "server hello, prepping for secure renegotiation extension" ) );
ext_len += 5 + ssl->verify_data_len * 2;
@ -889,6 +891,7 @@ static int ssl_write_server_hello( ssl_context *ssl )
p += ssl->verify_data_len;
memcpy( p, ssl->own_verify_data, ssl->verify_data_len );
p += ssl->verify_data_len;
}
ssl->out_msglen = p - buf;
ssl->out_msgtype = SSL_MSG_HANDSHAKE;