From a05bfeed1e90a8dca3a3debd69ec1cef8ce5206e Mon Sep 17 00:00:00 2001 From: Harry Ramsey Date: Mon, 14 Oct 2024 07:19:01 +0100 Subject: [PATCH] Refactor tf-psa-crypto to use error_common.h instead of error.h This commit refactors tf-psa-crypto to include error_common.h instead of error.h as these files have been split and the relevant error codes are now inside error_common.h. Signed-off-by: Harry Ramsey --- tf-psa-crypto/core/psa_crypto.c | 4 ++-- tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h | 4 ++-- tf-psa-crypto/drivers/builtin/src/aes.c | 2 +- tf-psa-crypto/drivers/builtin/src/asn1parse.c | 2 +- tf-psa-crypto/drivers/builtin/src/asn1write.c | 2 +- tf-psa-crypto/drivers/builtin/src/bignum.c | 2 +- tf-psa-crypto/drivers/builtin/src/bignum_core.c | 2 +- tf-psa-crypto/drivers/builtin/src/bignum_mod.c | 2 +- tf-psa-crypto/drivers/builtin/src/bignum_mod_raw.c | 2 +- tf-psa-crypto/drivers/builtin/src/ccm.c | 2 +- tf-psa-crypto/drivers/builtin/src/chacha20.c | 2 +- tf-psa-crypto/drivers/builtin/src/chachapoly.c | 2 +- tf-psa-crypto/drivers/builtin/src/cipher.c | 2 +- tf-psa-crypto/drivers/builtin/src/cipher_wrap.c | 2 +- tf-psa-crypto/drivers/builtin/src/cmac.c | 2 +- tf-psa-crypto/drivers/builtin/src/constant_time.c | 2 +- tf-psa-crypto/drivers/builtin/src/ctr_drbg.c | 2 +- tf-psa-crypto/drivers/builtin/src/des.c | 2 +- tf-psa-crypto/drivers/builtin/src/dhm.c | 2 +- tf-psa-crypto/drivers/builtin/src/ecdh.c | 2 +- tf-psa-crypto/drivers/builtin/src/ecdsa.c | 2 +- tf-psa-crypto/drivers/builtin/src/ecjpake.c | 2 +- tf-psa-crypto/drivers/builtin/src/ecp.c | 2 +- tf-psa-crypto/drivers/builtin/src/ecp_curves.c | 2 +- tf-psa-crypto/drivers/builtin/src/ecp_curves_new.c | 2 +- tf-psa-crypto/drivers/builtin/src/entropy.c | 2 +- tf-psa-crypto/drivers/builtin/src/entropy_poll.c | 2 +- tf-psa-crypto/drivers/builtin/src/gcm.c | 2 +- tf-psa-crypto/drivers/builtin/src/hkdf.c | 2 +- tf-psa-crypto/drivers/builtin/src/hmac_drbg.c | 2 +- tf-psa-crypto/drivers/builtin/src/lmots.c | 2 +- tf-psa-crypto/drivers/builtin/src/lms.c | 2 +- tf-psa-crypto/drivers/builtin/src/md.c | 2 +- tf-psa-crypto/drivers/builtin/src/md5.c | 2 +- tf-psa-crypto/drivers/builtin/src/nist_kw.c | 2 +- tf-psa-crypto/drivers/builtin/src/oid.c | 2 +- tf-psa-crypto/drivers/builtin/src/pem.c | 2 +- tf-psa-crypto/drivers/builtin/src/pk.c | 2 +- tf-psa-crypto/drivers/builtin/src/pk_ecc.c | 2 +- tf-psa-crypto/drivers/builtin/src/pk_wrap.c | 2 +- tf-psa-crypto/drivers/builtin/src/pkcs12.c | 2 +- tf-psa-crypto/drivers/builtin/src/pkcs5.c | 2 +- tf-psa-crypto/drivers/builtin/src/pkparse.c | 2 +- tf-psa-crypto/drivers/builtin/src/pkwrite.c | 2 +- tf-psa-crypto/drivers/builtin/src/platform.c | 2 +- tf-psa-crypto/drivers/builtin/src/poly1305.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c | 2 +- tf-psa-crypto/drivers/builtin/src/psa_util.c | 2 +- tf-psa-crypto/drivers/builtin/src/ripemd160.c | 2 +- tf-psa-crypto/drivers/builtin/src/rsa.c | 2 +- tf-psa-crypto/drivers/builtin/src/sha1.c | 2 +- tf-psa-crypto/drivers/builtin/src/sha256.c | 2 +- tf-psa-crypto/drivers/builtin/src/sha3.c | 2 +- tf-psa-crypto/drivers/builtin/src/sha512.c | 2 +- tf-psa-crypto/tests/suites/helpers.function | 4 ++-- tf-psa-crypto/tests/suites/main_test.function | 2 +- tf-psa-crypto/tests/suites/test_suite_error.function | 4 ++-- tf-psa-crypto/tests/suites/test_suite_pk.function | 2 +- 65 files changed, 69 insertions(+), 69 deletions(-) diff --git a/tf-psa-crypto/core/psa_crypto.c b/tf-psa-crypto/core/psa_crypto.c index d1c93fd215..3d859f189d 100644 --- a/tf-psa-crypto/core/psa_crypto.c +++ b/tf-psa-crypto/core/psa_crypto.c @@ -58,13 +58,13 @@ #include "mbedtls/ecdh.h" #include "mbedtls/ecp.h" #include "mbedtls/entropy.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/gcm.h" #include "mbedtls/md5.h" #include "mbedtls/pk.h" #include "pk_wrap.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/ripemd160.h" #include "mbedtls/rsa.h" #include "mbedtls/sha1.h" diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h index 58f1cde331..4598a93f5a 100644 --- a/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h +++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/error_common.h @@ -7,8 +7,8 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#ifndef MBEDTLS_ERROR_COMMON_H -#define MBEDTLS_ERROR_COMMON_H +#ifndef MBEDTLS_ERRORCOMMON_COMMON_H +#define MBEDTLS_ERRORCOMMON_COMMON_H #include "mbedtls/build_info.h" diff --git a/tf-psa-crypto/drivers/builtin/src/aes.c b/tf-psa-crypto/drivers/builtin/src/aes.c index b9145eaff3..c36845b924 100644 --- a/tf-psa-crypto/drivers/builtin/src/aes.c +++ b/tf-psa-crypto/drivers/builtin/src/aes.c @@ -20,7 +20,7 @@ #include "mbedtls/aes.h" #include "mbedtls/platform.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_AES_USE_HARDWARE_ONLY) #if !((defined(MBEDTLS_ARCH_IS_ARMV8_A) && defined(MBEDTLS_AESCE_C)) || \ diff --git a/tf-psa-crypto/drivers/builtin/src/asn1parse.c b/tf-psa-crypto/drivers/builtin/src/asn1parse.c index ecea90434b..61288656ba 100644 --- a/tf-psa-crypto/drivers/builtin/src/asn1parse.c +++ b/tf-psa-crypto/drivers/builtin/src/asn1parse.c @@ -12,7 +12,7 @@ #include "mbedtls/asn1.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/asn1write.c b/tf-psa-crypto/drivers/builtin/src/asn1write.c index 6355fad3b6..3e154f4184 100644 --- a/tf-psa-crypto/drivers/builtin/src/asn1write.c +++ b/tf-psa-crypto/drivers/builtin/src/asn1write.c @@ -11,7 +11,7 @@ defined(PSA_HAVE_ALG_SOME_ECDSA) #include "mbedtls/asn1write.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/bignum.c b/tf-psa-crypto/drivers/builtin/src/bignum.c index 424490951d..36c18a47dc 100644 --- a/tf-psa-crypto/drivers/builtin/src/bignum.c +++ b/tf-psa-crypto/drivers/builtin/src/bignum.c @@ -30,7 +30,7 @@ #include "bignum_internal.h" #include "bn_mul.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "constant_time_internal.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/bignum_core.c b/tf-psa-crypto/drivers/builtin/src/bignum_core.c index 60f48f92de..67d5025b82 100644 --- a/tf-psa-crypto/drivers/builtin/src/bignum_core.c +++ b/tf-psa-crypto/drivers/builtin/src/bignum_core.c @@ -11,7 +11,7 @@ #include -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform_util.h" #include "constant_time_internal.h" diff --git a/tf-psa-crypto/drivers/builtin/src/bignum_mod.c b/tf-psa-crypto/drivers/builtin/src/bignum_mod.c index dfd332a703..0d5534f8f4 100644 --- a/tf-psa-crypto/drivers/builtin/src/bignum_mod.c +++ b/tf-psa-crypto/drivers/builtin/src/bignum_mod.c @@ -12,7 +12,7 @@ #include #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/bignum.h" #include "mbedtls/platform.h" diff --git a/tf-psa-crypto/drivers/builtin/src/bignum_mod_raw.c b/tf-psa-crypto/drivers/builtin/src/bignum_mod_raw.c index 5343bc650d..5b889c87f1 100644 --- a/tf-psa-crypto/drivers/builtin/src/bignum_mod_raw.c +++ b/tf-psa-crypto/drivers/builtin/src/bignum_mod_raw.c @@ -11,7 +11,7 @@ #include -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform_util.h" #include "mbedtls/platform.h" diff --git a/tf-psa-crypto/drivers/builtin/src/ccm.c b/tf-psa-crypto/drivers/builtin/src/ccm.c index 68af90337b..0e6637fa6d 100644 --- a/tf-psa-crypto/drivers/builtin/src/ccm.c +++ b/tf-psa-crypto/drivers/builtin/src/ccm.c @@ -20,7 +20,7 @@ #include "mbedtls/ccm.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/constant_time.h" #if defined(MBEDTLS_BLOCK_CIPHER_C) diff --git a/tf-psa-crypto/drivers/builtin/src/chacha20.c b/tf-psa-crypto/drivers/builtin/src/chacha20.c index 3501837d3a..36a70b3b73 100644 --- a/tf-psa-crypto/drivers/builtin/src/chacha20.c +++ b/tf-psa-crypto/drivers/builtin/src/chacha20.c @@ -15,7 +15,7 @@ #include "mbedtls/chacha20.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include #include diff --git a/tf-psa-crypto/drivers/builtin/src/chachapoly.c b/tf-psa-crypto/drivers/builtin/src/chachapoly.c index 5bfee0982b..3130ac1d70 100644 --- a/tf-psa-crypto/drivers/builtin/src/chachapoly.c +++ b/tf-psa-crypto/drivers/builtin/src/chachapoly.c @@ -12,7 +12,7 @@ #include "mbedtls/chachapoly.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/constant_time.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/cipher.c b/tf-psa-crypto/drivers/builtin/src/cipher.c index 7f4c121492..15b97fa248 100644 --- a/tf-psa-crypto/drivers/builtin/src/cipher.c +++ b/tf-psa-crypto/drivers/builtin/src/cipher.c @@ -16,7 +16,7 @@ #include "mbedtls/cipher.h" #include "cipher_wrap.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/constant_time.h" #include "constant_time_internal.h" diff --git a/tf-psa-crypto/drivers/builtin/src/cipher_wrap.c b/tf-psa-crypto/drivers/builtin/src/cipher_wrap.c index d2fee22e2b..9726b3162b 100644 --- a/tf-psa-crypto/drivers/builtin/src/cipher_wrap.c +++ b/tf-psa-crypto/drivers/builtin/src/cipher_wrap.c @@ -14,7 +14,7 @@ #if defined(MBEDTLS_CIPHER_C) #include "cipher_wrap.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_CHACHAPOLY_C) #include "mbedtls/chachapoly.h" diff --git a/tf-psa-crypto/drivers/builtin/src/cmac.c b/tf-psa-crypto/drivers/builtin/src/cmac.c index 5e517c4b1b..706602419a 100644 --- a/tf-psa-crypto/drivers/builtin/src/cmac.c +++ b/tf-psa-crypto/drivers/builtin/src/cmac.c @@ -32,7 +32,7 @@ #include "mbedtls/cmac.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform.h" #include "constant_time_internal.h" diff --git a/tf-psa-crypto/drivers/builtin/src/constant_time.c b/tf-psa-crypto/drivers/builtin/src/constant_time.c index 95b81221f4..e233b6206f 100644 --- a/tf-psa-crypto/drivers/builtin/src/constant_time.c +++ b/tf-psa-crypto/drivers/builtin/src/constant_time.c @@ -16,7 +16,7 @@ #include "common.h" #include "constant_time_internal.h" #include "mbedtls/constant_time.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform_util.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/ctr_drbg.c b/tf-psa-crypto/drivers/builtin/src/ctr_drbg.c index b82044eb7d..facfc2e115 100644 --- a/tf-psa-crypto/drivers/builtin/src/ctr_drbg.c +++ b/tf-psa-crypto/drivers/builtin/src/ctr_drbg.c @@ -17,7 +17,7 @@ #include "ctr.h" #include "mbedtls/ctr_drbg.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/des.c b/tf-psa-crypto/drivers/builtin/src/des.c index 4bb354af77..03d79ede38 100644 --- a/tf-psa-crypto/drivers/builtin/src/des.c +++ b/tf-psa-crypto/drivers/builtin/src/des.c @@ -16,7 +16,7 @@ #if defined(MBEDTLS_DES_C) #include "mbedtls/des.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform_util.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/dhm.c b/tf-psa-crypto/drivers/builtin/src/dhm.c index 75af8b7910..c7c3e08669 100644 --- a/tf-psa-crypto/drivers/builtin/src/dhm.c +++ b/tf-psa-crypto/drivers/builtin/src/dhm.c @@ -19,7 +19,7 @@ #include "mbedtls/dhm.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/ecdh.c b/tf-psa-crypto/drivers/builtin/src/ecdh.c index 28fe757eab..db77a31038 100644 --- a/tf-psa-crypto/drivers/builtin/src/ecdh.c +++ b/tf-psa-crypto/drivers/builtin/src/ecdh.c @@ -18,7 +18,7 @@ #include "mbedtls/ecdh.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/ecdsa.c b/tf-psa-crypto/drivers/builtin/src/ecdsa.c index 57d52fee2d..7971ef4ae2 100644 --- a/tf-psa-crypto/drivers/builtin/src/ecdsa.c +++ b/tf-psa-crypto/drivers/builtin/src/ecdsa.c @@ -27,7 +27,7 @@ #include "mbedtls/platform.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_ECP_RESTARTABLE) diff --git a/tf-psa-crypto/drivers/builtin/src/ecjpake.c b/tf-psa-crypto/drivers/builtin/src/ecjpake.c index ebdae9280e..a0a386b8a6 100644 --- a/tf-psa-crypto/drivers/builtin/src/ecjpake.c +++ b/tf-psa-crypto/drivers/builtin/src/ecjpake.c @@ -16,7 +16,7 @@ #include "mbedtls/ecjpake.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/ecp.c b/tf-psa-crypto/drivers/builtin/src/ecp.c index 1e6b69b982..ef586284d5 100644 --- a/tf-psa-crypto/drivers/builtin/src/ecp.c +++ b/tf-psa-crypto/drivers/builtin/src/ecp.c @@ -36,7 +36,7 @@ #include "mbedtls/ecp.h" #include "mbedtls/threading.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "bn_mul.h" #include "ecp_invasive.h" diff --git a/tf-psa-crypto/drivers/builtin/src/ecp_curves.c b/tf-psa-crypto/drivers/builtin/src/ecp_curves.c index 97636a7298..99ced0dde3 100644 --- a/tf-psa-crypto/drivers/builtin/src/ecp_curves.c +++ b/tf-psa-crypto/drivers/builtin/src/ecp_curves.c @@ -13,7 +13,7 @@ #include "mbedtls/ecp.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "bn_mul.h" #include "bignum_core.h" diff --git a/tf-psa-crypto/drivers/builtin/src/ecp_curves_new.c b/tf-psa-crypto/drivers/builtin/src/ecp_curves_new.c index 169247f3bf..6506a22767 100644 --- a/tf-psa-crypto/drivers/builtin/src/ecp_curves_new.c +++ b/tf-psa-crypto/drivers/builtin/src/ecp_curves_new.c @@ -14,7 +14,7 @@ #include "mbedtls/ecp.h" #include "mbedtls/platform.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform.h" diff --git a/tf-psa-crypto/drivers/builtin/src/entropy.c b/tf-psa-crypto/drivers/builtin/src/entropy.c index 7dcf067a52..fd222c0d74 100644 --- a/tf-psa-crypto/drivers/builtin/src/entropy.c +++ b/tf-psa-crypto/drivers/builtin/src/entropy.c @@ -12,7 +12,7 @@ #include "mbedtls/entropy.h" #include "entropy_poll.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/entropy_poll.c b/tf-psa-crypto/drivers/builtin/src/entropy_poll.c index 611768cd85..bd2cf693e6 100644 --- a/tf-psa-crypto/drivers/builtin/src/entropy_poll.c +++ b/tf-psa-crypto/drivers/builtin/src/entropy_poll.c @@ -20,7 +20,7 @@ #include "mbedtls/entropy.h" #include "entropy_poll.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_TIMING_C) #include "mbedtls/timing.h" diff --git a/tf-psa-crypto/drivers/builtin/src/gcm.c b/tf-psa-crypto/drivers/builtin/src/gcm.c index dda1ff21f5..84062662a0 100644 --- a/tf-psa-crypto/drivers/builtin/src/gcm.c +++ b/tf-psa-crypto/drivers/builtin/src/gcm.c @@ -22,7 +22,7 @@ #include "mbedtls/gcm.h" #include "mbedtls/platform.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/constant_time.h" #if defined(MBEDTLS_BLOCK_CIPHER_C) diff --git a/tf-psa-crypto/drivers/builtin/src/hkdf.c b/tf-psa-crypto/drivers/builtin/src/hkdf.c index 631ac24e53..b2410208ec 100644 --- a/tf-psa-crypto/drivers/builtin/src/hkdf.c +++ b/tf-psa-crypto/drivers/builtin/src/hkdf.c @@ -11,7 +11,7 @@ #include #include "mbedtls/hkdf.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" int mbedtls_hkdf(const mbedtls_md_info_t *md, const unsigned char *salt, size_t salt_len, const unsigned char *ikm, size_t ikm_len, diff --git a/tf-psa-crypto/drivers/builtin/src/hmac_drbg.c b/tf-psa-crypto/drivers/builtin/src/hmac_drbg.c index c29fad337f..eba5079531 100644 --- a/tf-psa-crypto/drivers/builtin/src/hmac_drbg.c +++ b/tf-psa-crypto/drivers/builtin/src/hmac_drbg.c @@ -17,7 +17,7 @@ #include "mbedtls/hmac_drbg.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/lmots.c b/tf-psa-crypto/drivers/builtin/src/lmots.c index c51cb41ece..23e235c5b5 100644 --- a/tf-psa-crypto/drivers/builtin/src/lmots.c +++ b/tf-psa-crypto/drivers/builtin/src/lmots.c @@ -28,7 +28,7 @@ #include "mbedtls/lms.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "psa_util_internal.h" #include "psa/crypto.h" diff --git a/tf-psa-crypto/drivers/builtin/src/lms.c b/tf-psa-crypto/drivers/builtin/src/lms.c index 7f7bec068b..d354046bed 100644 --- a/tf-psa-crypto/drivers/builtin/src/lms.c +++ b/tf-psa-crypto/drivers/builtin/src/lms.c @@ -29,7 +29,7 @@ #include "psa/crypto.h" #include "psa_util_internal.h" #include "mbedtls/lms.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/platform_util.h" #include "mbedtls/platform.h" diff --git a/tf-psa-crypto/drivers/builtin/src/md.c b/tf-psa-crypto/drivers/builtin/src/md.c index eee8aa37f5..5100528592 100644 --- a/tf-psa-crypto/drivers/builtin/src/md.c +++ b/tf-psa-crypto/drivers/builtin/src/md.c @@ -32,7 +32,7 @@ #include "mbedtls/md.h" #include "md_wrap.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/md5.h" #include "mbedtls/ripemd160.h" diff --git a/tf-psa-crypto/drivers/builtin/src/md5.c b/tf-psa-crypto/drivers/builtin/src/md5.c index fd9a8e960b..5e5ee86c94 100644 --- a/tf-psa-crypto/drivers/builtin/src/md5.c +++ b/tf-psa-crypto/drivers/builtin/src/md5.c @@ -16,7 +16,7 @@ #include "mbedtls/md5.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/nist_kw.c b/tf-psa-crypto/drivers/builtin/src/nist_kw.c index a4b4be759d..431a8efdb9 100644 --- a/tf-psa-crypto/drivers/builtin/src/nist_kw.c +++ b/tf-psa-crypto/drivers/builtin/src/nist_kw.c @@ -21,7 +21,7 @@ #include "mbedtls/nist_kw.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/constant_time.h" #include "constant_time_internal.h" diff --git a/tf-psa-crypto/drivers/builtin/src/oid.c b/tf-psa-crypto/drivers/builtin/src/oid.c index ae30dfe64d..ad3d8e03bc 100644 --- a/tf-psa-crypto/drivers/builtin/src/oid.c +++ b/tf-psa-crypto/drivers/builtin/src/oid.c @@ -13,7 +13,7 @@ #include "mbedtls/oid.h" #include "mbedtls/rsa.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/pk.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/pem.c b/tf-psa-crypto/drivers/builtin/src/pem.c index 98f708f42e..212889293f 100644 --- a/tf-psa-crypto/drivers/builtin/src/pem.c +++ b/tf-psa-crypto/drivers/builtin/src/pem.c @@ -16,7 +16,7 @@ #include "mbedtls/md.h" #include "mbedtls/cipher.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/pk.c b/tf-psa-crypto/drivers/builtin/src/pk.c index 28b4e7a65a..9632c76ff5 100644 --- a/tf-psa-crypto/drivers/builtin/src/pk.c +++ b/tf-psa-crypto/drivers/builtin/src/pk.c @@ -14,7 +14,7 @@ #include "pk_internal.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_RSA_C) #include "mbedtls/rsa.h" diff --git a/tf-psa-crypto/drivers/builtin/src/pk_ecc.c b/tf-psa-crypto/drivers/builtin/src/pk_ecc.c index 707988d2d9..0c4ffbfb13 100644 --- a/tf-psa-crypto/drivers/builtin/src/pk_ecc.c +++ b/tf-psa-crypto/drivers/builtin/src/pk_ecc.c @@ -8,7 +8,7 @@ #include "common.h" #include "mbedtls/pk.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/ecp.h" #include "pk_internal.h" diff --git a/tf-psa-crypto/drivers/builtin/src/pk_wrap.c b/tf-psa-crypto/drivers/builtin/src/pk_wrap.c index 31ec2fdf3e..9063555d64 100644 --- a/tf-psa-crypto/drivers/builtin/src/pk_wrap.c +++ b/tf-psa-crypto/drivers/builtin/src/pk_wrap.c @@ -12,7 +12,7 @@ #if defined(MBEDTLS_PK_C) #include "pk_wrap.h" #include "pk_internal.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/psa_util.h" /* Even if RSA not activated, for the sake of RSA-alt */ diff --git a/tf-psa-crypto/drivers/builtin/src/pkcs12.c b/tf-psa-crypto/drivers/builtin/src/pkcs12.c index a3467b9820..0c78569079 100644 --- a/tf-psa-crypto/drivers/builtin/src/pkcs12.c +++ b/tf-psa-crypto/drivers/builtin/src/pkcs12.c @@ -21,7 +21,7 @@ #include "mbedtls/cipher.h" #endif /* MBEDTLS_CIPHER_C */ #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/pkcs5.c b/tf-psa-crypto/drivers/builtin/src/pkcs5.c index c57f672f8a..b43aaf7b7e 100644 --- a/tf-psa-crypto/drivers/builtin/src/pkcs5.c +++ b/tf-psa-crypto/drivers/builtin/src/pkcs5.c @@ -20,7 +20,7 @@ #if defined(MBEDTLS_PKCS5_C) #include "mbedtls/pkcs5.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_ASN1_PARSE_C) #include "mbedtls/asn1.h" diff --git a/tf-psa-crypto/drivers/builtin/src/pkparse.c b/tf-psa-crypto/drivers/builtin/src/pkparse.c index 3419ad90cc..006774ca23 100644 --- a/tf-psa-crypto/drivers/builtin/src/pkparse.c +++ b/tf-psa-crypto/drivers/builtin/src/pkparse.c @@ -14,7 +14,7 @@ #include "mbedtls/oid.h" #include "mbedtls/platform_util.h" #include "mbedtls/platform.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/ecp.h" #include "pk_internal.h" diff --git a/tf-psa-crypto/drivers/builtin/src/pkwrite.c b/tf-psa-crypto/drivers/builtin/src/pkwrite.c index 0b57995849..ba073ad716 100644 --- a/tf-psa-crypto/drivers/builtin/src/pkwrite.c +++ b/tf-psa-crypto/drivers/builtin/src/pkwrite.c @@ -13,7 +13,7 @@ #include "mbedtls/asn1write.h" #include "mbedtls/oid.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "pk_internal.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/platform.c b/tf-psa-crypto/drivers/builtin/src/platform.c index 890c4cbaba..c535e9e9da 100644 --- a/tf-psa-crypto/drivers/builtin/src/platform.c +++ b/tf-psa-crypto/drivers/builtin/src/platform.c @@ -11,7 +11,7 @@ #include "mbedtls/platform.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" /* The compile time configuration of memory allocation via the macros * MBEDTLS_PLATFORM_{FREE/CALLOC}_MACRO takes precedence over the runtime diff --git a/tf-psa-crypto/drivers/builtin/src/poly1305.c b/tf-psa-crypto/drivers/builtin/src/poly1305.c index 81a484691a..6d898f7c8a 100644 --- a/tf-psa-crypto/drivers/builtin/src/poly1305.c +++ b/tf-psa-crypto/drivers/builtin/src/poly1305.c @@ -12,7 +12,7 @@ #include "mbedtls/poly1305.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c index a201985b4f..bcd7d9544e 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c @@ -21,7 +21,7 @@ #include "mbedtls/chachapoly.h" #include "mbedtls/cipher.h" #include "mbedtls/gcm.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" static psa_status_t psa_aead_setup( mbedtls_psa_aead_operation_t *operation, diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c index 3216c94898..2f635e81db 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c @@ -15,7 +15,7 @@ #include "psa_crypto_random_impl.h" #include "mbedtls/cipher.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c index 749e11be03..cc5b483ced 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_BASIC) || \ defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_IMPORT) || \ diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c index ae38f6d7c6..1d7828e956 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c @@ -21,7 +21,7 @@ #include "psa_crypto_ffdh.h" #include "psa_crypto_random_impl.h" #include "mbedtls/platform.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_EXPORT) || \ defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_GENERATE) || \ diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c index eeb7666c1c..0849c9f259 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c @@ -14,7 +14,7 @@ #include "psa_crypto_core.h" #include "psa_crypto_hash.h" -#include +#include #include #if defined(MBEDTLS_PSA_BUILTIN_HASH) diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c index 8fe6218118..9486b317f9 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c @@ -16,7 +16,7 @@ #include "psa_crypto_mac.h" #include -#include +#include #include "mbedtls/constant_time.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c index 9ac2e8c486..2703e7d7d7 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c @@ -19,7 +19,7 @@ #include "psa_util_internal.h" #include -#include +#include #include /* diff --git a/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c index 5fe26ec87c..9678a96f8b 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c @@ -23,7 +23,7 @@ #include "mbedtls/platform.h" #include -#include +#include #include "rsa_internal.h" #if defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_CRYPT) || \ diff --git a/tf-psa-crypto/drivers/builtin/src/psa_util.c b/tf-psa-crypto/drivers/builtin/src/psa_util.c index 36ad0ce59a..55803ea5e4 100644 --- a/tf-psa-crypto/drivers/builtin/src/psa_util.c +++ b/tf-psa-crypto/drivers/builtin/src/psa_util.c @@ -9,7 +9,7 @@ #include "common.h" /* This is needed for MBEDTLS_ERR_XXX macros */ -#include +#include #if defined(MBEDTLS_ASN1_WRITE_C) #include diff --git a/tf-psa-crypto/drivers/builtin/src/ripemd160.c b/tf-psa-crypto/drivers/builtin/src/ripemd160.c index 0845fe821f..b696c04b4d 100644 --- a/tf-psa-crypto/drivers/builtin/src/ripemd160.c +++ b/tf-psa-crypto/drivers/builtin/src/ripemd160.c @@ -17,7 +17,7 @@ #include "mbedtls/ripemd160.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/rsa.c b/tf-psa-crypto/drivers/builtin/src/rsa.c index 33bb1d346e..458ee26a3e 100644 --- a/tf-psa-crypto/drivers/builtin/src/rsa.c +++ b/tf-psa-crypto/drivers/builtin/src/rsa.c @@ -35,7 +35,7 @@ #include "mbedtls/oid.h" #include "mbedtls/asn1write.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "constant_time_internal.h" #include "mbedtls/constant_time.h" #include "md_psa.h" diff --git a/tf-psa-crypto/drivers/builtin/src/sha1.c b/tf-psa-crypto/drivers/builtin/src/sha1.c index bd1b6301fd..208bac44dc 100644 --- a/tf-psa-crypto/drivers/builtin/src/sha1.c +++ b/tf-psa-crypto/drivers/builtin/src/sha1.c @@ -16,7 +16,7 @@ #include "mbedtls/sha1.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/sha256.c b/tf-psa-crypto/drivers/builtin/src/sha256.c index 842b892cd5..f2800e4db1 100644 --- a/tf-psa-crypto/drivers/builtin/src/sha256.c +++ b/tf-psa-crypto/drivers/builtin/src/sha256.c @@ -54,7 +54,7 @@ #include "mbedtls/sha256.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/sha3.c b/tf-psa-crypto/drivers/builtin/src/sha3.c index 57385595f5..dc7cac47f0 100644 --- a/tf-psa-crypto/drivers/builtin/src/sha3.c +++ b/tf-psa-crypto/drivers/builtin/src/sha3.c @@ -43,7 +43,7 @@ #include "mbedtls/sha3.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include diff --git a/tf-psa-crypto/drivers/builtin/src/sha512.c b/tf-psa-crypto/drivers/builtin/src/sha512.c index 9d8cffbc68..b915f99c13 100644 --- a/tf-psa-crypto/drivers/builtin/src/sha512.c +++ b/tf-psa-crypto/drivers/builtin/src/sha512.c @@ -32,7 +32,7 @@ #include "mbedtls/sha512.h" #include "mbedtls/platform_util.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #if defined(_MSC_VER) || defined(__WATCOMC__) #define UL64(x) x##ui64 diff --git a/tf-psa-crypto/tests/suites/helpers.function b/tf-psa-crypto/tests/suites/helpers.function index b561f4766a..f28da70537 100644 --- a/tf-psa-crypto/tests/suites/helpers.function +++ b/tf-psa-crypto/tests/suites/helpers.function @@ -16,8 +16,8 @@ #include #include -#if defined(MBEDTLS_ERROR_C) -#include "mbedtls/error.h" +#if defined(MBEDTLS_ERRORCOMMON_C) +#include "mbedtls/error_common.h" #endif #include "mbedtls/platform.h" diff --git a/tf-psa-crypto/tests/suites/main_test.function b/tf-psa-crypto/tests/suites/main_test.function index c0cc2ac50b..fd0656ba38 100644 --- a/tf-psa-crypto/tests/suites/main_test.function +++ b/tf-psa-crypto/tests/suites/main_test.function @@ -232,7 +232,7 @@ int main(int argc, const char *argv[]) #if defined(MBEDTLS_TEST_HOOKS) extern void (*mbedtls_test_hook_test_fail)(const char *test, int line, const char *file); mbedtls_test_hook_test_fail = &mbedtls_test_fail; -#if defined(MBEDTLS_ERROR_C) +#if defined(MBEDTLS_ERRORCOMMON_C) mbedtls_test_hook_error_add = &mbedtls_test_err_add_check; #endif #endif diff --git a/tf-psa-crypto/tests/suites/test_suite_error.function b/tf-psa-crypto/tests/suites/test_suite_error.function index 4c38ab05f2..2c17463b3b 100644 --- a/tf-psa-crypto/tests/suites/test_suite_error.function +++ b/tf-psa-crypto/tests/suites/test_suite_error.function @@ -1,9 +1,9 @@ /* BEGIN_HEADER */ -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES - * depends_on:MBEDTLS_ERROR_C + * depends_on:MBEDTLS_ERRORCOMMON_C * END_DEPENDENCIES */ diff --git a/tf-psa-crypto/tests/suites/test_suite_pk.function b/tf-psa-crypto/tests/suites/test_suite_pk.function index 55848abdf1..bad09fac89 100644 --- a/tf-psa-crypto/tests/suites/test_suite_pk.function +++ b/tf-psa-crypto/tests/suites/test_suite_pk.function @@ -7,7 +7,7 @@ #include "mbedtls/asn1.h" #include "mbedtls/base64.h" #include "mbedtls/ecp.h" -#include "mbedtls/error.h" +#include "mbedtls/error_common.h" #include "mbedtls/rsa.h" #include "rsa_internal.h" #include "pk_internal.h"