AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SSL v2 handshake should also handle dynamic ciphersuites

Browse Source
This commit is contained in:
Paul Bakker 2013-06-29 15:33:42 +02:00
parent f8d018a274
commit 59c28a2723
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/ssl_srv.c
View File

@ -272,6 +272,7 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
unsigned int ciph_len, sess_len, chal_len;
unsigned char *buf, *p;
const int *ciphersuites;
const ssl_ciphersuite_t *ciphersuite_info;
SSL_DEBUG_MSG( 2, ( "=> parse client hello v2" ) );
@ -439,13 +440,24 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
{
// Only allow non-ECC ciphersuites as we do not have extensions
//
if( p[0] == 0 &&
p[1] == 0 &&
if( p[0] == 0 && p[1] == 0 &&
( ( ciphersuites[i] >> 8 ) & 0xFF ) == 0 &&
p[2] == ( ciphersuites[i] & 0xFF ) )
{
ciphersuite_info = ssl_ciphersuite_from_id( ciphersuites[i] );
if( ciphersuite_info == NULL )
{
SSL_DEBUG_MSG( 1, ( "ciphersuite info for %02x not found",
ciphersuites[i] ) );
return( POLARSSL_ERR_SSL_BAD_INPUT_DATA );
}
goto have_ciphersuite_v2;
}
}
}
SSL_DEBUG_MSG( 1, ( "got no ciphersuites in common" ) );
@ -453,6 +465,7 @@ static int ssl_parse_client_hello_v2( ssl_context *ssl )
have_ciphersuite_v2:
ssl->session_negotiate->ciphersuite = ciphersuites[i];
ssl->transform_negotiate->ciphersuite_info = ciphersuite_info;
ssl_optimize_checksum( ssl, ssl->transform_negotiate->ciphersuite_info );
/*