Rebase and add fixes

Signed-off-by: Xiaofei Bai <xiaofei.bai@arm.com>
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 )
             {