From 953950112097472abf560f8b5d100fcc34f3cef8 Mon Sep 17 00:00:00 2001 From: Xiaofei Bai Date: Thu, 25 Nov 2021 08:51:30 +0000 Subject: [PATCH] Rebase and add fixes Signed-off-by: Xiaofei Bai --- library/ssl_tls.c | 8 ++++---- programs/ssl/ssl_client2.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index b7e73c985d..8e25f32eca 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -6374,11 +6374,11 @@ static uint16_t ssl_preset_default_sig_algs[] = { /* RSA algorithms */ #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) - MBEDTLS_TLS13_SIG_RSA_PSS_RSAE_SHA256, + MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256, #endif MBEDTLS_TLS13_SIG_RSA_PKCS1_SHA256, - MBEDTLS_TLS13_SIG_NONE + MBEDTLS_TLS1_3_SIG_NONE }; static uint16_t ssl_preset_suiteb_sig_algs[] = { @@ -6394,11 +6394,11 @@ static uint16_t ssl_preset_suiteb_sig_algs[] = { /* RSA algorithms */ #if defined(MBEDTLS_X509_RSASSA_PSS_SUPPORT) - MBEDTLS_TLS13_SIG_RSA_PSS_RSAE_SHA256, + MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256, #endif MBEDTLS_TLS13_SIG_RSA_PKCS1_SHA256, - MBEDTLS_TLS13_SIG_NONE + MBEDTLS_TLS1_3_SIG_NONE }; #endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */ #endif diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 8f6453cd02..bf1c2e189a 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -1536,7 +1536,7 @@ int main( int argc, char *argv[] ) } else if( strcmp( q, "rsa_pss_rsae_sha256" ) == 0 ) { - sig_alg_list[i++] = MBEDTLS_TLS13_SIG_RSA_PSS_RSAE_SHA256; + sig_alg_list[i++] = MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256; } else if( strcmp( q, "rsa_pkcs1_sha256" ) == 0 ) {