Skip to content

Commit ca168fe

Browse files
Vge0rgede-nordic
authored andcommitted
[nrf noup] boot: zephyr: Enable zeroize ALT func
-This enables the MBEDTLS_PLATFORM_ZEROIZE_ALT definition on Mbed TLS build of the MCUBOOT when the platform library is enabled. If not defined the Mbed TLS will compile the zeroize function and it will cause multiple definition errors. This is a noup because the configuration does not exist outside the sdk-nrf. Ref: NCSDK-13503 Signed-off-by: Georgios Vasilakis <[email protected]> Signed-off-by: Torsten Rasmussen <[email protected]> Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit 542f51f) (cherry picked from commit b9a2382) Signed-off-by: Dominik Ermel <[email protected]>
1 parent d3d9c95 commit ca168fe

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

boot/zephyr/include/mcuboot-mbedtls-cfg.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
* the simulator build.rs accordingly.
2222
*/
2323

24+
/*
25+
* When the CC3XX_PLATFORM library is enabled we need to
26+
* inform the Mbed TLS library to not compile the
27+
* platform_zeroize function, otherwise we will get
28+
* a multiple definitions error.
29+
*/
30+
#if defined(CONFIG_NRF_CC3XX_PLATFORM)
31+
#define MBEDTLS_PLATFORM_ZEROIZE_ALT
32+
#endif
33+
2434
#if defined(CONFIG_BOOT_SIGNATURE_TYPE_RSA) || defined(CONFIG_BOOT_ENCRYPT_RSA)
2535
#include "config-rsa.h"
2636
#elif defined(CONFIG_BOOT_SIGNATURE_TYPE_ECDSA_P256) || \

0 commit comments

Comments
 (0)