Add missing uses of mbedtls_ssl_get_minor()

This commit is contained in:
Hanno Becker 2019-07-19 16:10:49 +01:00
parent ae3f8511fd
commit 981f81dc30
2 changed files with 10 additions and 10 deletions

View file

@ -965,7 +965,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
p += 2; p += 2;
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl,
ssl->minor_ver, mbedtls_ssl_get_minor_ver( ssl ),
ciphersuite_info ) ciphersuite_info )
{ {
if( ssl_validate_ciphersuite( ciphersuite_info, ssl, if( ssl_validate_ciphersuite( ciphersuite_info, ssl,
@ -1885,7 +1885,7 @@ static int ssl_parse_server_hello( mbedtls_ssl_context *ssl )
* Perform cipher suite validation in same way as in ssl_write_client_hello. * Perform cipher suite validation in same way as in ssl_write_client_hello.
*/ */
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl,
ssl->minor_ver, mbedtls_ssl_get_minor_ver( ssl ),
ciphersuite_info ) ciphersuite_info )
{ {
if( ssl_validate_ciphersuite( ciphersuite_info, ssl, if( ssl_validate_ciphersuite( ciphersuite_info, ssl,

View file

@ -1250,12 +1250,12 @@ static int ssl_parse_client_hello_v2( mbedtls_ssl_context *ssl )
for( j = 0, p = buf + 6; j < ciph_len; j += 3, p += 3 ) for( j = 0, p = buf + 6; j < ciph_len; j += 3, p += 3 )
{ {
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \ MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \
ssl->minor_ver, \ mbedtls_ssl_get_minor_ver( ssl ), \
cur_info ) cur_info )
{ {
#else #else
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \ MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \
ssl->minor_ver, \ mbedtls_ssl_get_minor_ver( ssl ), \
cur_info ) cur_info )
{ {
for( j = 0, p = buf + 6; j < ciph_len; j += 3, p += 3 ) for( j = 0, p = buf + 6; j < ciph_len; j += 3, p += 3 )
@ -2184,12 +2184,12 @@ read_record_header:
for( j = 0, p = buf + ciph_offset + 2; j < ciph_len; j += 2, p += 2 ) for( j = 0, p = buf + ciph_offset + 2; j < ciph_len; j += 2, p += 2 )
{ {
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \ MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \
ssl->minor_ver, \ mbedtls_ssl_get_minor_ver( ssl ), \
cur_info ) cur_info )
{ {
#else #else
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \ MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl, \
ssl->minor_ver, \ mbedtls_ssl_get_minor_ver( ssl ), \
cur_info ) cur_info )
{ {
for( j = 0, p = buf + ciph_offset + 2; j < ciph_len; j += 2, p += 2 ) for( j = 0, p = buf + ciph_offset + 2; j < ciph_len; j += 2, p += 2 )