commit 5c28e7aa0ebfa3d025e7802ae29eb86e43b0e92f
author Jerry Yu <jerry.h.yu@arm.com> Sat Jul 30 23:22:08 2022 +0800
committer Jerry Yu <jerry.h.yu@arm.com> Thu Aug 11 21:25:35 2022 +0800
tree 13db39c502018fc8457cb65d5b25bdddb8abf152
parent 56acc9421ce52d7e508cbe4bfbe453be75949589

remove psk key when ephemeral selected

ephemeral is selected, `handshake->psk` must be removed.
Otherwise the encrypt key will be caculate fail.

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

library/ssl_tls13_server.c

diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 15656fe..d527959 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -761,6 +761,9 @@
     else
     if( ssl_tls13_check_ephemeral_key_exchange( ssl ) )
     {
+#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
+        mbedtls_ssl_remove_psk( ssl );
+#endif
         ssl->handshake->key_exchange_mode =
             MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL;
         MBEDTLS_SSL_DEBUG_MSG( 2, ( "key exchange mode: ephemeral" ) );