Commit e3dcbab3 authored Jun 25, 2025 by David Vincze Committed by Jamie Jun 25, 2025

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 <david.vincze@arm.com>

parent adbe1cfb

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

+4 −2

Original line number	Diff line number	Diff line
		/*
		* SPDX-License-Identifier: Apache-2.0
		*
		* Copyright (c) 2023-2024 Arm Limited
		* Copyright (c) 2023-2025 Arm Limited
		*/

		/*
		@@ -68,7 +68,9 @@
		#include "mbedtls/oid.h"
		#include "mbedtls/asn1.h"
		#include "bootutil/sign_key.h"
		#include "common.h"
		#if !defined(MCUBOOT_USE_PSA_CRYPTO)
		#include "bootutil/crypto/common.h"
		#endif

		#ifdef __cplusplus
		extern "C" {

Admin message