diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 88ba65d2e4..e76086a12c 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2092,7 +2092,7 @@ static inline int mbedtls_ssl_sig_alg_is_offered( const mbedtls_ssl_context *ssl return( 0 ); } -static inline int mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg( +static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg( uint16_t sig_alg, mbedtls_pk_type_t *pk_type, mbedtls_md_type_t *md_alg ) { *pk_type = mbedtls_ssl_pk_alg_from_sig( sig_alg & 0xff ); diff --git a/library/ssl_tls12_client.c b/library/ssl_tls12_client.c index 47557aea9d..3ac17ce475 100644 --- a/library/ssl_tls12_client.c +++ b/library/ssl_tls12_client.c @@ -2359,7 +2359,7 @@ start_processing: */ MBEDTLS_SSL_CHK_BUF_READ_PTR( p, end, 2 ); sig_alg = MBEDTLS_GET_UINT16_BE( p, 0 ); - if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg( + if( mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg( sig_alg, &pk_alg, &md_alg ) != 0 && ! mbedtls_ssl_sig_alg_is_offered( ssl, sig_alg ) && ! mbedtls_ssl_sig_alg_is_supported( ssl, sig_alg ) ) diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index d1e2e493dc..64e134dfac 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -213,7 +213,7 @@ static int ssl_tls13_parse_certificate_verify( mbedtls_ssl_context *ssl, goto error; } - if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg( + if( mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg( algorithm, &sig_alg, &md_alg ) != 0 ) { goto error; @@ -1029,7 +1029,7 @@ static int ssl_tls13_write_certificate_verify_body( mbedtls_ssl_context *ssl, MBEDTLS_SSL_DEBUG_MSG( 2, ( "CertificateVerify with %s", mbedtls_ssl_sig_alg_to_str( algorithm )) ); - if( mbedtls_ssl_tls13_get_pk_type_and_md_alg_from_sig_alg( + if( mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg( algorithm, &pk_type, &md_alg ) != 0 ) { return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );