commit 9bef51ce4ad3b0add2edeff2dc67fb79412c6e07
author Roland Mikhel <roland.mikhel@arm.com> Mon Sep 25 10:32:52 2023 +0200
committer Dávid Vincze <david.vincze@arm.com> Tue Sep 26 07:55:30 2023 +0200
tree 169fdfe9daa47c632353f8262185e87ede8d350e
parent db2024eb205bc05161321414ede305c145a1c65a

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

boot/bootutil/include/bootutil/crypto/ecdsa.h

diff --git a/boot/bootutil/include/bootutil/crypto/ecdsa.h b/boot/bootutil/include/bootutil/crypto/ecdsa.h
index aa5c532..a733886 100644
--- a/boot/bootutil/include/bootutil/crypto/ecdsa.h
+++ b/boot/bootutil/include/bootutil/crypto/ecdsa.h
@@ -74,7 +74,8 @@
 extern "C" {
 #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.
  */
@@ -124,7 +125,7 @@
 
     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)
 #ifndef MCUBOOT_ECDSA_NEED_ASN1_SIG