commit 953950112097472abf560f8b5d100fcc34f3cef8
author Xiaofei Bai <xiaofei.bai@arm.com> Thu Nov 25 08:51:30 2021 +0000
committer Xiaofei Bai <xiaofei.bai@arm.com> Fri Nov 26 08:09:26 2021 +0000
tree 5bf617faed9ee298f280f32351785b087c9a5034
parent feecbbbb930d8ae180ead14807f9293fa0389a08

Rebase and add fixes

Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index b7e73c9..8e25f32 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6374,11 +6374,11 @@
 
     /* 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 @@
 
     /* 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

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 8f6453c..bf1c2e1 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1536,7 +1536,7 @@
             }
             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 )
             {