[crypto] update mbedtls psa crypto context structs

Author: silabs-HarshaK

include/openthread/instance.h

@@ -52,7 +52,7 @@ extern "C" {
  *
  * @note This number versions both OpenThread platform and user APIs.
  */
-#define OPENTHREAD_API_VERSION (586)
+#define OPENTHREAD_API_VERSION (587)
 
 /**
  * @addtogroup api-instance

include/openthread/platform/crypto.h

@@ -123,6 +123,9 @@ typedef struct otCryptoKey
  * @struct otCryptoContext
  *
  * Stores the context object for platform APIs.
+ *
+ * If `OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT` is enabled, the platform allocates and populates this.
+ * Otherwise OpenThread core allocates and populates this.
  */
 typedef struct otCryptoContext
 {
@@ -325,6 +328,9 @@ void otPlatCryptoFree(void *aPtr);
  * @retval OT_ERROR_FAILED        Failed to initialize HMAC operation.
  * @retval OT_ERROR_INVALID_ARGS  @p aContext was NULL
  *
+ * @note If `OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT` is enabled, @p aContext is populated by the platform.
+ *       Otherwise OpenThread core allocates and populates it.
+ *
  * @note The platform driver shall point the context to the correct object such as psa_mac_operation_t or
  *       mbedtls_md_context_t.
  */
@@ -389,6 +395,9 @@ otError otPlatCryptoHmacSha256Finish(otCryptoContext *aContext, uint8_t *aBuf, s
  * @retval OT_ERROR_INVALID_ARGS  @p aContext was NULL
  * @retval OT_ERROR_NO_BUFS       Cannot allocate the context.
  *
+ * @note If `OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT` is enabled, @p aContext is populated by the platform.
+ *       Otherwise OpenThread core allocates and populates it.
+ *
  * @note The platform driver shall point the context to the correct object such as psa_key_id
  *       or mbedtls_aes_context_t.
  */
@@ -435,10 +444,13 @@ otError otPlatCryptoAesFree(otCryptoContext *aContext);
  *
  * @param[in]  aContext           Context for HKDF operation.
  *
- * @retval OT_ERROR_NONE          Successfully Initialised AES operation.
- * @retval OT_ERROR_FAILED        Failed to Initialise AES operation.
+ * @retval OT_ERROR_NONE          Successfully Initialised HKDF operation.
+ * @retval OT_ERROR_FAILED        Failed to Initialise HKDF operation.
  * @retval OT_ERROR_INVALID_ARGS  @p aContext was NULL
  *
+ * @note If `OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT` is enabled, @p aContext is populated by the platform.
+ *       Otherwise OpenThread core allocates and populates it.
+ *
  * @note The platform driver shall point the context to the correct object such as psa_key_derivation_operation_t
  *       or HmacSha256::Hash
  */
@@ -499,6 +511,8 @@ otError otPlatCryptoHkdfDeinit(otCryptoContext *aContext);
  * @retval OT_ERROR_FAILED        Failed to initialise SHA-256 operation.
  * @retval OT_ERROR_INVALID_ARGS  @p aContext was NULL
  *
+ * @note If `OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT` is enabled, @p aContext is populated by the platform.
+ *       Otherwise OpenThread core allocates and populates it.
  *
  * @note The platform driver shall point the context to the correct object such as psa_hash_operation_t
  *       or mbedtls_sha256_context.

src/core/config/crypto.h

@@ -59,6 +59,15 @@
 /** Use platform provided crypto library */
 #define OPENTHREAD_CONFIG_CRYPTO_LIB_PLATFORM 2
 
+/**
+ * @def OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
+ *
+ * Define to 1 to enable the platform to allocate crypto operation context.
+ */
+#ifndef OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
+#define OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT 0
+#endif
+
 #if OPENTHREAD_CONFIG_CRYPTO_LIB == OPENTHREAD_CONFIG_CRYPTO_LIB_PLATFORM
 
 /**

src/core/crypto/aes_ecb.cpp

@@ -40,8 +40,13 @@ namespace Crypto {
 
 AesEcb::AesEcb(void)
 {
+#if OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
+    mContext.mContext     = nullptr;
+    mContext.mContextSize = 0;
+#else
     mContext.mContext     = mContextStorage;
     mContext.mContextSize = sizeof(mContextStorage);
+#endif
     SuccessOrAssert(otPlatCryptoAesInit(&mContext));
 }
 

src/core/crypto/aes_ecb.hpp

@@ -86,7 +86,9 @@ class AesEcb
 
 private:
     otCryptoContext mContext;
+#if !OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
     OT_DEFINE_ALIGNED_VAR(mContextStorage, kAesContextSize, uint64_t);
+#endif
 };
 
 /**

src/core/crypto/hkdf_sha256.cpp

@@ -44,8 +44,13 @@ namespace Crypto {
 
 HkdfSha256::HkdfSha256(void)
 {
+#if OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
+    mContext.mContext     = nullptr;
+    mContext.mContextSize = 0;
+#else
     mContext.mContext     = mContextStorage;
     mContext.mContextSize = sizeof(mContextStorage);
+#endif
     SuccessOrAssert(otPlatCryptoHkdfInit(&mContext));
 }
 

src/core/crypto/hkdf_sha256.hpp

@@ -94,7 +94,9 @@ class HkdfSha256
 
 private:
     otCryptoContext mContext;
+#if !OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
     OT_DEFINE_ALIGNED_VAR(mContextStorage, kHkdfContextSize, uint64_t);
+#endif
 };
 
 /**

src/core/crypto/hmac_sha256.cpp

@@ -41,8 +41,13 @@ namespace Crypto {
 
 HmacSha256::HmacSha256(void)
 {
+#if OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
+    mContext.mContext     = nullptr;
+    mContext.mContextSize = 0;
+#else
     mContext.mContext     = mContextStorage;
     mContext.mContextSize = sizeof(mContextStorage);
+#endif
 
     SuccessOrAssert(otPlatCryptoHmacSha256Init(&mContext));
 }

src/core/crypto/hmac_sha256.hpp

@@ -124,7 +124,9 @@ class HmacSha256
 
 private:
     otCryptoContext mContext;
+#if !OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
     OT_DEFINE_ALIGNED_VAR(mContextStorage, kHmacSha256ContextSize, uint64_t);
+#endif
 };
 
 /**

src/core/crypto/sha256.cpp

@@ -42,8 +42,14 @@ namespace Crypto {
 
 Sha256::Sha256(void)
 {
+#if OPENTHREAD_CONFIG_CRYPTO_PLATFORM_ALLOCS_CONTEXT
+    mContext.mContext     = nullptr;
+    mContext.mContextSize = 0;
+#else
     mContext.mContext     = mContextStorage;
     mContext.mContextSize = sizeof(mContextStorage);
+#endif
+
     SuccessOrAssert(otPlatCryptoSha256Init(&mContext));
 }