From 6dc90da7401bd9e9154d1be071c9ede99b771791 Mon Sep 17 00:00:00 2001 From: Xiaofei Bai Date: Fri, 26 Nov 2021 08:11:40 +0000 Subject: [PATCH] Rebased on 74217ee and add fixes Signed-off-by: Xiaofei Bai --- library/ssl_tls.c | 4 ++-- library/ssl_tls13_generic.c | 2 +- programs/ssl/ssl_client2.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 8e25f32eca..4bc23a6188 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -6376,7 +6376,7 @@ static uint16_t ssl_preset_default_sig_algs[] = { #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256, #endif - MBEDTLS_TLS13_SIG_RSA_PKCS1_SHA256, + MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256, MBEDTLS_TLS1_3_SIG_NONE }; @@ -6396,7 +6396,7 @@ static uint16_t ssl_preset_suiteb_sig_algs[] = { #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256, #endif - MBEDTLS_TLS13_SIG_RSA_PKCS1_SHA256, + MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256, MBEDTLS_TLS1_3_SIG_NONE }; diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index d749d7d4cb..86d984f0b0 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -375,7 +375,7 @@ static int ssl_tls13_parse_certificate_verify( mbedtls_ssl_context *ssl, sig_alg = MBEDTLS_PK_ECDSA; break; #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) - case MBEDTLS_TLS13_SIG_RSA_PSS_RSAE_SHA256: + case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256: MBEDTLS_SSL_DEBUG_MSG( 4, ( "Certificate Verify: using RSA PSS" ) ); md_alg = MBEDTLS_MD_SHA256; sig_alg = MBEDTLS_PK_RSASSA_PSS; diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index bf1c2e189a..4b9b90cce6 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1540,7 +1540,7 @@ int main( int argc, char *argv[] ) } else if( strcmp( q, "rsa_pkcs1_sha256" ) == 0 ) { - sig_alg_list[i++] = MBEDTLS_TLS13_SIG_RSA_PKCS1_SHA256; + sig_alg_list[i++] = MBEDTLS_TLS1_3_SIG_RSA_PKCS1_SHA256; } else {