commit 6dc90da7401bd9e9154d1be071c9ede99b771791
author Xiaofei Bai <xiaofei.bai@arm.com> Fri Nov 26 08:11:40 2021 +0000
committer Xiaofei Bai <xiaofei.bai@arm.com> Fri Nov 26 08:12:43 2021 +0000
tree 9c26d7822587109e3dd54a6591bba61b9392cf26
parent 953950112097472abf560f8b5d100fcc34f3cef8

Rebased on 74217ee 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 8e25f32..4bc23a6 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -6376,7 +6376,7 @@
 #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 @@
 #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
 };

library/ssl_tls13_generic.c

diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index d749d7d..86d984f 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -375,7 +375,7 @@
             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;

programs/ssl/ssl_client2.c

diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index bf1c2e1..4b9b90c 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1540,7 +1540,7 @@
             }
             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
             {