Skip to content

Commit e42c648

Browse files
AGlass0fMilkutzig
authored andcommitted
Temporarily disable use of TinyCrypt with Mbed-OS
TinyCrypt uses a modified version of micro-ecc that is also used by the Mbed Cordio BLE stack. When building mcuboot for a target with BLE enabled, this causes multiple-defined symbol errors during linking. Due to the nature of Mbed's current build system, it is difficult to fix this. Mbed will soon release a more flexible cmake-based build system that will make it possible to exclude these TinyCrypt files from an application build that may also link Cordio BLE sources. Until then, this commit temporarily disables the use of TinyCrypt with Mbed-OS and excludes its sources from the build to avoid this build error. Signed-off-by: George Beckstein <becksteing@embeddedplanet.com>
1 parent 1c399bb commit e42c648

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.mbedignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ ext/fiat/*
1414
ext/mbedtls/*
1515
ext/mbedtls-asn1/*
1616
ext/nrf/*
17-
ext/tinycrypt/tests/*
17+
ext/tinycrypt/tests/*
18+
ext/tinycrypt/*
19+
ext/tinycrypt-sha512/*

boot/mbed/include/mcuboot_config/mcuboot_config.h

+3-5
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,10 @@
4646
#define MCUBOOT_USE_MBED_TLS
4747
#elif (MCUBOOT_CRYPTO_BACKEND == TINYCRYPT)
4848
/**
49-
* XXX TinyCrypt is currently only supported in GCC builds
50-
* See https://github.com/mcu-tools/mcuboot/pull/791#discussion_r515050672 for more information.
49+
* XXX TinyCrypt is currently not supported by Mbed-OS due to build conflicts.
50+
* See https://github.com/AGlass0fMilk/mbed-mcuboot-blinky/issues/2
5151
*/
52-
#if !defined(__GNUC__)
53-
#error TinyCrypt is currently only supported in GCC builds for Mbed-OS.
54-
#endif
52+
#error TinyCrypt is currently not supported by Mbed-OS due to build conflicts.
5553
#define MCUBOOT_USE_TINYCRYPT
5654
#endif
5755

0 commit comments

Comments
 (0)