From 35608703f75c4c6644988e44b022f4cf131984b2 Mon Sep 17 00:00:00 2001
From: Abtin Keshavarzian <abtink@google.com>
Date: Mon, 16 Dec 2024 10:19:50 -0800
Subject: [PATCH] [secure-transport] set app keys on config before SSL context
 setup (#11044)

This commit updates `Setup()`, which initializes and sets up
`mbedtls_ssl_config` and `mbedtls_ssl_context`. The call
`mExtension->SetApplicationSecureKeys()` (which updates the
`mbedtls_ssl_config`) is now called before `mbedtls_ssl_setup()`
associates the config with the `mbedtls_ssl_context`. This
follows the recommendation that the config structure is not
modified after `ssl_setup()` and while a session is active.
---
 src/core/meshcop/secure_transport.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/core/meshcop/secure_transport.cpp b/src/core/meshcop/secure_transport.cpp
index 289720ed4..9c0602893 100644
--- a/src/core/meshcop/secure_transport.cpp
+++ b/src/core/meshcop/secure_transport.cpp
@@ -357,10 +357,14 @@ Error SecureTransport::Setup(void)
     //- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     // Setup the `Extension` components.
 
-#if OPENTHREAD_CONFIG_TLS_API_ENABLE && defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
+#if OPENTHREAD_CONFIG_TLS_API_ENABLE
     if (mExtension != nullptr)
     {
+#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED)
         mExtension->mEcdheEcdsaInfo.Init();
+#endif
+        rval = mExtension->SetApplicationSecureKeys();
+        VerifyOrExit(rval == 0);
     }
 #endif
 
@@ -404,14 +408,8 @@ Error SecureTransport::Setup(void)
     if (mCipherSuite == kEcjpakeWithAes128Ccm8)
     {
         rval = mbedtls_ssl_set_hs_ecjpake_password(&mSsl, mPsk, mPskLength);
+        VerifyOrExit(rval == 0);
     }
-#if OPENTHREAD_CONFIG_TLS_API_ENABLE
-    else if (mExtension != nullptr)
-    {
-        rval = mExtension->SetApplicationSecureKeys();
-    }
-#endif
-    VerifyOrExit(rval == 0);
 
     mReceiveMessage = nullptr;
     mMessageSubType = Message::kSubTypeNone;
@@ -937,6 +935,10 @@ int SecureTransport::Extension::SetApplicationSecureKeys(void)
 
     switch (mSecureTransport.mCipherSuite)
     {
+    case kEcjpakeWithAes128Ccm8:
+        // PSK will be set on `mbedtls_ssl_context` when set up.
+        break;
+
 #ifdef MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
     case kEcdheEcdsaWithAes128Ccm8:
     case kEcdheEcdsaWithAes128GcmSha256: