Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 13:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(marvell-tools): include mbedtls/version.h before use" into integration

Browse source
This commit is contained in:
Olivier Deprez 2024-01-23 10:55:11 +01:00 • committed by TrustedFirmware Code Review
commit 9f9b4814c5
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelog.yaml
View file

@ -1369,6 +1369,9 @@ subsections:
deprecated: deprecated:
- cert_create - cert_create
- title: Marvell Tools
scope: marvell-tools
- title: Dependencies - title: Dependencies
scope: deps scope: deps

2
tools/marvell/doimage/doimage.c
View file

@ -18,6 +18,7 @@
#include <libconfig.h> /* for parsing config file */ #include <libconfig.h> /* for parsing config file */
/* mbedTLS stuff */ /* mbedTLS stuff */
#include <mbedtls/version.h>
#if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ENTROPY_C) && \ #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ENTROPY_C) && \
defined(MBEDTLS_SHA256_C) && \ defined(MBEDTLS_SHA256_C) && \
defined(MBEDTLS_PK_PARSE_C) && defined(MBEDTLS_FS_IO) && \ defined(MBEDTLS_PK_PARSE_C) && defined(MBEDTLS_FS_IO) && \
@ -28,7 +29,6 @@
#include <mbedtls/md.h> #include <mbedtls/md.h>
#include <mbedtls/pk.h> #include <mbedtls/pk.h>
#include <mbedtls/sha256.h> #include <mbedtls/sha256.h>
#include <mbedtls/version.h>
#include <mbedtls/x509.h> #include <mbedtls/x509.h>
#else #else
#error "Bad mbedTLS configuration!" #error "Bad mbedTLS configuration!"