ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-12 01:42:21 +08:00
Code Issues Releases Wiki Activity

fix various issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-01-12 12:58:00 +08:00
parent 0e5bcb6bf5
commit 2d0bd32982
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_cli.c
View File

@ -1133,7 +1133,7 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
if( ( ret = ssl_write_sig_alg_ext( ssl, p + 2 + ext_len, if( ( ret = ssl_write_sig_alg_ext( ssl, p + 2 + ext_len,
end, &olen ) ) != 0 ) end, &olen ) ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_write_sig_algs_ext", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "ssl_write_sig_alg_ext", ret );
return( ret ); return( ret );
} }
ext_len += olen; ext_len += olen;

4
library/ssl_misc.h
View File

@ -1821,12 +1821,12 @@ static inline const void *mbedtls_ssl_conf_get_sig_algs(
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
#if defined(MBEDTLS_SSL_PROTO_TLS1_2) #if defined(MBEDTLS_SSL_PROTO_TLS1_2)
if( mbedtls_ssl_conf_is_tls12_only( conf )) if( mbedtls_ssl_conf_is_tls12_enabled( conf ))
return( conf->sig_hashes ); return( conf->sig_hashes );
#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
if( mbedtls_ssl_conf_is_tls13_only( conf )) if( mbedtls_ssl_conf_is_tls13_enabled( conf ))
return( conf->tls13_sig_algs ); return( conf->tls13_sig_algs );
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */

4
library/ssl_tls13_generic.c
View File

@ -284,12 +284,12 @@ static void ssl_tls13_create_verify_structure( const unsigned char *transcript_h
} }
static int ssl_tls13_sig_alg_is_offered( const mbedtls_ssl_context *ssl, static int ssl_tls13_sig_alg_is_offered( const mbedtls_ssl_context *ssl,
uint16_t received_sig_alg ) uint16_t proposed_sig_alg )
{ {
for( const uint16_t *sig_alg = mbedtls_ssl_conf_get_sig_algs( ssl->conf ); for( const uint16_t *sig_alg = mbedtls_ssl_conf_get_sig_algs( ssl->conf );
*sig_alg != MBEDTLS_TLS1_3_SIG_NONE; sig_alg++ ) *sig_alg != MBEDTLS_TLS1_3_SIG_NONE; sig_alg++ )
{ {
if( *sig_alg == received_sig_alg ) if( *sig_alg == proposed_sig_alg )
return( 1 ); return( 1 );
} }
return( 0 ); return( 0 );