Skip to content

Commit e3dcbab

Browse files
davidvinczenordicjm
authored andcommitted
bootutil: Conditionally include crypto/common.h
This is an Mbed TLS header including mbedtls/version.h which can cause build errors when the PSA Crypto backend is used with the TF-PSA-Crypto library. Do not include crypto/common.h for builds with PSA Crypto. Change-Id: I341846965de26ae2d63f1d6c163cd7a9025d6a1c Signed-off-by: David Vincze <[email protected]>
1 parent adbe1cf commit e3dcbab

File tree

1 file changed

+4
-2
lines changed
  • boot/bootutil/include/bootutil/crypto

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* SPDX-License-Identifier: Apache-2.0
33
*
4-
* Copyright (c) 2023-2024 Arm Limited
4+
* Copyright (c) 2023-2025 Arm Limited
55
*/
66

77
/*
@@ -68,7 +68,9 @@
6868
#include "mbedtls/oid.h"
6969
#include "mbedtls/asn1.h"
7070
#include "bootutil/sign_key.h"
71-
#include "common.h"
71+
#if !defined(MCUBOOT_USE_PSA_CRYPTO)
72+
#include "bootutil/crypto/common.h"
73+
#endif
7274

7375
#ifdef __cplusplus
7476
extern "C" {

0 commit comments

Comments
 (0)