commit ac4c625dead70e4930a78116cdf7897fe8e0902e
author Xiaokang Qian <xiaokang.qian@arm.com> Mon Feb 06 10:15:00 2023 +0000
committer Xiaokang Qian <xiaokang.qian@arm.com> Wed Feb 08 05:47:48 2023 +0000
tree 88463ecf3f3af93321a486fd5a4542df27816206
parent 6be8290aba46158bb79b7c36ebae950f292097aa

Add hash check of ciphersuite for ticket psk

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>

library/ssl_tls13_client.c

diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 68bea23..6238499 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -1107,6 +1107,16 @@
 #if defined(MBEDTLS_SSL_SESSION_TICKETS)
     if (selected_identity == 0 && ssl_tls13_has_configured_ticket(ssl)) {
         ret = ssl_tls13_ticket_get_psk(ssl, &hash_alg, &psk, &psk_len);
+        if (mbedtls_psa_translate_md(ssl->handshake->ciphersuite_info->mac)
+            != hash_alg) {
+            MBEDTLS_SSL_DEBUG_MSG(
+                1, ("Invalid ciphersuite for ticket psk."));
+
+            MBEDTLS_SSL_PEND_FATAL_ALERT(
+                MBEDTLS_SSL_ALERT_MSG_ILLEGAL_PARAMETER,
+                MBEDTLS_ERR_SSL_ILLEGAL_PARAMETER);
+            return MBEDTLS_ERR_SSL_ILLEGAL_PARAMETER;
+        }
     } else
 #endif
     if (mbedtls_ssl_conf_has_static_psk(ssl->conf)) {