Merge pull request #9566 from kfnta/alzix/crypto-warn

Fix warning in Crypto when using boot seed injection

Author: Nir Sonnenschein

features/mbedtls/platform/TARGET_PSA/COMPONENT_PSA_SRV_IMPL/inc/default_random_seed.h

@@ -3,6 +3,8 @@
 #ifndef DEFAULT_RANDOM_SEED_H
 #define DEFAULT_RANDOM_SEED_H
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif

features/mbedtls/platform/inc/platform_mbed.h

@@ -17,6 +17,24 @@
  *  This file is part of mbed TLS (https://tls.mbed.org)
  */
 
+
+#ifndef __PLATFORM_MBED__H__
+#define __PLATFORM_MBED__H__
+
+#if (defined(TARGET_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
+
+#include "default_random_seed.h"
+
+#if !defined(MBEDTLS_PLATFORM_NV_SEED_READ_MACRO)
+#define MBEDTLS_PLATFORM_NV_SEED_READ_MACRO mbed_default_seed_read
+#endif
+
+#if !defined(MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO)
+#define MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO mbed_default_seed_write
+#endif
+
+#endif  // (defined(TARGET_PSA) && defined(MBEDTLS_ENTROPY_NV_SEED))
+
 #if DEVICE_TRNG
 #define MBEDTLS_ENTROPY_HARDWARE_ALT
 #endif
@@ -31,3 +49,5 @@
 #define MBEDTLS_ERR_PLATFORM_HW_FAILED       -0x0080
 
 #define MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED -0x0070
+
+#endif  // __PLATFORM_MBED__H__

targets/targets.json

@@ -7904,9 +7904,7 @@
             "PSOC6_DYNSRM_DISABLE=1",
             "MBEDTLS_PSA_CRYPTO_SPM",
             "MBEDTLS_PSA_CRYPTO_C",
-            "MBEDTLS_ENTROPY_NV_SEED",
-            "MBEDTLS_PLATFORM_NV_SEED_READ_MACRO=mbed_default_seed_read",
-            "MBEDTLS_PLATFORM_NV_SEED_WRITE_MACRO=mbed_default_seed_write"
+            "MBEDTLS_ENTROPY_NV_SEED"
         ],
         "deliver_to_target": "FUTURE_SEQUANA_PSA",
         "overrides": {