yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-02 20:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/627' into baremetal

Browse source
This commit is contained in:
Simon Butcher 2019-07-23 16:06:07 +01:00
parent 25b5579a09 981f81dc30
commit c0b3633194
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/ssl_cli.c
View file

@ -965,7 +965,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
p += 2;
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl,
ssl->minor_ver,
mbedtls_ssl_get_minor_ver( ssl ),
ciphersuite_info )
{
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.
*/
MBEDTLS_SSL_BEGIN_FOR_EACH_CIPHERSUITE( ssl,
ssl->minor_ver,
mbedtls_ssl_get_minor_ver( ssl ),
ciphersuite_info )
{
if( ssl_validate_ciphersuite( ciphersuite_info, ssl,

16
library/ssl_srv.c
View file

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