OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

bootutil/crypto: Do not include import key with PSA 

This fixes a build error when PSA Crypto API is being used
as it has no need for bootutil_import_key but it's included
currently since it's allowed to have both Mbed TLS and PSA defined.

Signed-off-by: Roland Mikhel <roland.mikhel@arm.com>
Change-Id: If38d3011fc4fa2d317f8be65df9e231d7d57dcbf
This commit is contained in:
Roland Mikhel 2023-09-25 10:32:52 +02:00 committed by Dávid Vincze
parent db2024eb20
commit 9bef51ce4a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot/bootutil/include/bootutil/crypto/ecdsa.h
View File

@ -74,7 +74,8 @@
extern "C" { extern "C" {
#endif #endif
#if defined(MCUBOOT_USE_TINYCRYPT) || defined(MCUBOOT_USE_MBED_TLS) || defined(MCUBOOT_USE_CC310) #if (defined(MCUBOOT_USE_TINYCRYPT) || defined(MCUBOOT_USE_MBED_TLS) || \
defined(MCUBOOT_USE_CC310)) && !defined(MCUBOOT_USE_PSA_CRYPTO)
/* /*
* Declaring these like this adds NULL termination. * Declaring these like this adds NULL termination.
*/ */
@ -124,7 +125,7 @@ static int bootutil_import_key(uint8_t **cp, uint8_t *end)
return 0; return 0;
} }
#endif /* MCUBOOT_USE_TINYCRYPT || MCUBOOT_USE_MBED_TLS || MCUBOOT_USE_CC310 */ #endif /* (MCUBOOT_USE_TINYCRYPT || MCUBOOT_USE_MBED_TLS || MCUBOOT_USE_CC310) && !MCUBOOT_USE_PSA_CRYPTO */
#if defined(MCUBOOT_USE_TINYCRYPT) #if defined(MCUBOOT_USE_TINYCRYPT)
#ifndef MCUBOOT_ECDSA_NEED_ASN1_SIG #ifndef MCUBOOT_ECDSA_NEED_ASN1_SIG