commit 21f9095fa8fe7cd0badd2573595807d1143d2773
author Jerry Yu <jerry.h.yu@arm.com> Sat Oct 08 10:30:53 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Sat Oct 08 14:35:34 2022 +0800
tree ad99acae9c4278af3f132d21721914eaddf68db1
parent 379b91a393b8d81e25408458a7573e026e1d80b6

Revert "move ciphersuite validation to set_session"

This reverts commit 19ae6f62c7a4e6cf14bf61fcb6ea070d34e70f2a.

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 7b85c70..b0c2a3f 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -668,19 +668,17 @@
 static psa_algorithm_t ssl_tls13_ciphersuite_to_alg( mbedtls_ssl_context *ssl,
                                                      int ciphersuite )
 {
+    const mbedtls_ssl_ciphersuite_t *ciphersuite_info = NULL;
+    ciphersuite_info = mbedtls_ssl_ciphersuite_from_id( ciphersuite );
 
-    psa_algorithm_t psa_alg;
-    if( mbedtls_ssl_tls13_ciphersuite_to_alg(
-                    ssl, ciphersuite, &psa_alg ) != 0 )
+    if( mbedtls_ssl_validate_ciphersuite(
+                        ssl, ciphersuite_info,
+                        MBEDTLS_SSL_VERSION_TLS1_3,
+                        MBEDTLS_SSL_VERSION_TLS1_3 ) == 0 )
     {
-        /* ciphersuite is `ssl->session_negotiate->ciphersuite` or
-         * PSA_ALG_SHA256, both are validated before writting pre_shared_key.
-         */
-        MBEDTLS_SSL_DEBUG_MSG( 2, ( "should never happen" ) );
-        return( PSA_ALG_NONE );
+        return( mbedtls_psa_translate_md( ciphersuite_info->mac ) );
     }
-
-    return( psa_alg );
+    return( PSA_ALG_NONE );
 }
 
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)