From 9f4606e6d2fcbd14556bbfc483f63c05db001e33 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 24 Jun 2022 15:00:50 +0200 Subject: [PATCH] Rename mbedtls_ssl_get_ciphersuite_sig_pk_ext_XXX in mbedtls_ssl_get_ciphersuite_sig_pk_ext_XXX() Signed-off-by: Neil Armstrong --- include/mbedtls/ssl_ciphersuites.h | 4 ++-- library/ssl_ciphersuites.c | 4 ++-- library/ssl_tls12_server.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/mbedtls/ssl_ciphersuites.h b/include/mbedtls/ssl_ciphersuites.h index 5352d7592..cd6ccbc90 100644 --- a/include/mbedtls/ssl_ciphersuites.h +++ b/include/mbedtls/ssl_ciphersuites.h @@ -390,8 +390,8 @@ const mbedtls_ssl_ciphersuite_t *mbedtls_ssl_ciphersuite_from_id( int ciphersuit #if defined(MBEDTLS_PK_C) mbedtls_pk_type_t mbedtls_ssl_get_ciphersuite_sig_pk_alg( const mbedtls_ssl_ciphersuite_t *info ); #if defined(MBEDTLS_USE_PSA_CRYPTO) -psa_algorithm_t mbedtls_ssl_get_ciphersuite_sig_pk_ext_alg( const mbedtls_ssl_ciphersuite_t *info ); -psa_key_usage_t mbedtls_ssl_get_ciphersuite_sig_pk_ext_usage( const mbedtls_ssl_ciphersuite_t *info ); +psa_algorithm_t mbedtls_ssl_get_ciphersuite_sig_pk_psa_alg( const mbedtls_ssl_ciphersuite_t *info ); +psa_key_usage_t mbedtls_ssl_get_ciphersuite_sig_pk_psa_usage( const mbedtls_ssl_ciphersuite_t *info ); #endif mbedtls_pk_type_t mbedtls_ssl_get_ciphersuite_sig_alg( const mbedtls_ssl_ciphersuite_t *info ); #endif diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c index 73a99e320..9b980234a 100644 --- a/library/ssl_ciphersuites.c +++ b/library/ssl_ciphersuites.c @@ -1922,7 +1922,7 @@ mbedtls_pk_type_t mbedtls_ssl_get_ciphersuite_sig_pk_alg( const mbedtls_ssl_ciph } #if defined(MBEDTLS_USE_PSA_CRYPTO) -psa_algorithm_t mbedtls_ssl_get_ciphersuite_sig_pk_ext_alg( const mbedtls_ssl_ciphersuite_t *info ) +psa_algorithm_t mbedtls_ssl_get_ciphersuite_sig_pk_psa_alg( const mbedtls_ssl_ciphersuite_t *info ) { switch( info->key_exchange ) { @@ -1946,7 +1946,7 @@ psa_algorithm_t mbedtls_ssl_get_ciphersuite_sig_pk_ext_alg( const mbedtls_ssl_ci } } -psa_key_usage_t mbedtls_ssl_get_ciphersuite_sig_pk_ext_usage( const mbedtls_ssl_ciphersuite_t *info ) +psa_key_usage_t mbedtls_ssl_get_ciphersuite_sig_pk_psa_usage( const mbedtls_ssl_ciphersuite_t *info ) { switch( info->key_exchange ) { diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c index 161a5ebe3..2e2a5734f 100644 --- a/library/ssl_tls12_server.c +++ b/library/ssl_tls12_server.c @@ -684,9 +684,9 @@ static int ssl_pick_cert( mbedtls_ssl_context *ssl, mbedtls_ssl_key_cert *cur, *list; #if defined(MBEDTLS_USE_PSA_CRYPTO) psa_algorithm_t pk_alg = - mbedtls_ssl_get_ciphersuite_sig_pk_ext_alg( ciphersuite_info ); + mbedtls_ssl_get_ciphersuite_sig_pk_psa_alg( ciphersuite_info ); psa_key_usage_t pk_usage = - mbedtls_ssl_get_ciphersuite_sig_pk_ext_usage( ciphersuite_info ); + mbedtls_ssl_get_ciphersuite_sig_pk_psa_usage( ciphersuite_info ); #else mbedtls_pk_type_t pk_alg = mbedtls_ssl_get_ciphersuite_sig_pk_alg( ciphersuite_info );