commit 1aa6e8d6e9f5af25c24a2484d774f9a879aa873a
author Ronald Cron <ronald.cron@arm.com> Thu Feb 23 09:46:54 2023 +0100
committer Ronald Cron <ronald.cron@arm.com> Thu Feb 23 09:48:50 2023 +0100
tree 438cba68e47d80e5a6a302a5ad26434af24cd992
parent d89360b87bb5bcf09a21c74a799056c49260b260

Restore same PSK length enforcement

Restore same PSK length enforcement in
conf_psk and set_hs_psk, whether the
negotiated protocol is TLS 1.2 or TLS 1.3.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 4312f15..86f5c0b 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -2145,12 +2145,9 @@
         return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
     }
 
-#if defined(MBEDTLS_SSL_PROTO_TLS1_2)
-    if (ssl->tls_version == MBEDTLS_SSL_VERSION_TLS1_2 &&
-        psk_len > MBEDTLS_PSK_MAX_LEN) {
+    if (psk_len > MBEDTLS_PSK_MAX_LEN) {
         return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
     }
-#endif /* MBEDTLS_SSL_PROTO_TLS1_2 */
 
     ssl_remove_psk(ssl);