Skip to content

Commit bc5eb3f

Browse files
committed
[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]>
1 parent 37486f5 commit bc5eb3f

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
@@ -309,8 +309,13 @@ elseif(CONFIG_BOOT_SIGNATURE_TYPE_ED25519 OR CONFIG_BOOT_ENCRYPT_X25519)
309309
${FIAT_DIR}/src/curve25519.c
310310
)
311311
else()
312+
if(MBEDTLS_ASN1_DIR)
313+
zephyr_library_sources(
314+
${MBEDTLS_ASN1_DIR}/src/asn1parse.c
315+
)
316+
endif()
317+
312318
zephyr_library_sources(
313-
${MBEDTLS_ASN1_DIR}/src/asn1parse.c
314319
${BOOT_DIR}/bootutil/src/ed25519_psa.c
315320
)
316321
endif()

0 commit comments

Comments
 (0)