Skip to content

Commit 59a21d2

Browse files
nordicjmjukkar
authored andcommitted
[nrf fromlist] boot: zephyr: Fix including asn1 when ed25519 is used
Fixes wrongly including the asn1 MBEDTLS file when the Kconfig is set to not include it Upstream PR #: 2416 Signed-off-by: Jamie McCrae <[email protected]> (cherry picked from commit bc5eb3f)
1 parent f131a8a commit 59a21d2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

boot/zephyr/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,13 @@ elseif(CONFIG_BOOT_SIGNATURE_TYPE_ED25519 OR CONFIG_BOOT_ENCRYPT_X25519)
303303
${FIAT_DIR}/src/curve25519.c
304304
)
305305
else()
306+
if(MBEDTLS_ASN1_DIR)
307+
zephyr_library_sources(
308+
${MBEDTLS_ASN1_DIR}/src/asn1parse.c
309+
)
310+
endif()
311+
306312
zephyr_library_sources(
307-
${MBEDTLS_ASN1_DIR}/src/asn1parse.c
308313
${BOOT_DIR}/bootutil/src/ed25519_psa.c
309314
)
310315
endif()

0 commit comments

Comments
 (0)