From 16298cdd9de88ff801cd19364a05a9030cb4f0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Wed, 22 Jan 2025 14:04:36 +0100 Subject: [PATCH 1/3] Revert "[nrf noup] Move headers found in Oberon PSA core" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Reverted done because /library/common.h is used here but it is intended to be changed in a coming commit This reverts commit 51a390fe7492c7debea40f053439426ee0bf1015. Signed-off-by: Frank Audun Kvamtrø --- {include/library => library}/alignment.h | 0 {include/library => library}/bignum_mod.h | 0 {include/library => library}/check_crypto_config.h | 0 {include/library => library}/common.h | 0 {include/library => library}/constant_time_impl.h | 0 {include/library => library}/constant_time_internal.h | 0 {include/library => library}/entropy_poll.h | 0 {include/library => library}/md_psa.h | 0 {include/library => library}/psa_crypto_core.h | 0 {include/library => library}/psa_crypto_core_common.h | 0 {include/library => library}/psa_crypto_driver_wrappers.h | 0 .../library => library}/psa_crypto_driver_wrappers_no_static.h | 0 {include/library => library}/psa_crypto_invasive.h | 0 {include/library => library}/psa_crypto_its.h | 0 {include/library => library}/psa_crypto_random_impl.h | 0 {include/library => library}/psa_crypto_se.h | 0 {include/library => library}/psa_crypto_slot_management.h | 0 {include/library => library}/psa_crypto_storage.h | 0 {include/library => library}/psa_util_internal.h | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename {include/library => library}/alignment.h (100%) rename {include/library => library}/bignum_mod.h (100%) rename {include/library => library}/check_crypto_config.h (100%) rename {include/library => library}/common.h (100%) rename {include/library => library}/constant_time_impl.h (100%) rename {include/library => library}/constant_time_internal.h (100%) rename {include/library => library}/entropy_poll.h (100%) rename {include/library => library}/md_psa.h (100%) rename {include/library => library}/psa_crypto_core.h (100%) rename {include/library => library}/psa_crypto_core_common.h (100%) rename {include/library => library}/psa_crypto_driver_wrappers.h (100%) rename {include/library => library}/psa_crypto_driver_wrappers_no_static.h (100%) rename {include/library => library}/psa_crypto_invasive.h (100%) rename {include/library => library}/psa_crypto_its.h (100%) rename {include/library => library}/psa_crypto_random_impl.h (100%) rename {include/library => library}/psa_crypto_se.h (100%) rename {include/library => library}/psa_crypto_slot_management.h (100%) rename {include/library => library}/psa_crypto_storage.h (100%) rename {include/library => library}/psa_util_internal.h (100%) diff --git a/include/library/alignment.h b/library/alignment.h similarity index 100% rename from include/library/alignment.h rename to library/alignment.h diff --git a/include/library/bignum_mod.h b/library/bignum_mod.h similarity index 100% rename from include/library/bignum_mod.h rename to library/bignum_mod.h diff --git a/include/library/check_crypto_config.h b/library/check_crypto_config.h similarity index 100% rename from include/library/check_crypto_config.h rename to library/check_crypto_config.h diff --git a/include/library/common.h b/library/common.h similarity index 100% rename from include/library/common.h rename to library/common.h diff --git a/include/library/constant_time_impl.h b/library/constant_time_impl.h similarity index 100% rename from include/library/constant_time_impl.h rename to library/constant_time_impl.h diff --git a/include/library/constant_time_internal.h b/library/constant_time_internal.h similarity index 100% rename from include/library/constant_time_internal.h rename to library/constant_time_internal.h diff --git a/include/library/entropy_poll.h b/library/entropy_poll.h similarity index 100% rename from include/library/entropy_poll.h rename to library/entropy_poll.h diff --git a/include/library/md_psa.h b/library/md_psa.h similarity index 100% rename from include/library/md_psa.h rename to library/md_psa.h diff --git a/include/library/psa_crypto_core.h b/library/psa_crypto_core.h similarity index 100% rename from include/library/psa_crypto_core.h rename to library/psa_crypto_core.h diff --git a/include/library/psa_crypto_core_common.h b/library/psa_crypto_core_common.h similarity index 100% rename from include/library/psa_crypto_core_common.h rename to library/psa_crypto_core_common.h diff --git a/include/library/psa_crypto_driver_wrappers.h b/library/psa_crypto_driver_wrappers.h similarity index 100% rename from include/library/psa_crypto_driver_wrappers.h rename to library/psa_crypto_driver_wrappers.h diff --git a/include/library/psa_crypto_driver_wrappers_no_static.h b/library/psa_crypto_driver_wrappers_no_static.h similarity index 100% rename from include/library/psa_crypto_driver_wrappers_no_static.h rename to library/psa_crypto_driver_wrappers_no_static.h diff --git a/include/library/psa_crypto_invasive.h b/library/psa_crypto_invasive.h similarity index 100% rename from include/library/psa_crypto_invasive.h rename to library/psa_crypto_invasive.h diff --git a/include/library/psa_crypto_its.h b/library/psa_crypto_its.h similarity index 100% rename from include/library/psa_crypto_its.h rename to library/psa_crypto_its.h diff --git a/include/library/psa_crypto_random_impl.h b/library/psa_crypto_random_impl.h similarity index 100% rename from include/library/psa_crypto_random_impl.h rename to library/psa_crypto_random_impl.h diff --git a/include/library/psa_crypto_se.h b/library/psa_crypto_se.h similarity index 100% rename from include/library/psa_crypto_se.h rename to library/psa_crypto_se.h diff --git a/include/library/psa_crypto_slot_management.h b/library/psa_crypto_slot_management.h similarity index 100% rename from include/library/psa_crypto_slot_management.h rename to library/psa_crypto_slot_management.h diff --git a/include/library/psa_crypto_storage.h b/library/psa_crypto_storage.h similarity index 100% rename from include/library/psa_crypto_storage.h rename to library/psa_crypto_storage.h diff --git a/include/library/psa_util_internal.h b/library/psa_util_internal.h similarity index 100% rename from include/library/psa_util_internal.h rename to library/psa_util_internal.h From 3f665673f09be450d95ff0217e8df88d92631b96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Wed, 22 Jan 2025 10:04:53 +0100 Subject: [PATCH 2/3] [nrf fromlist] Rename common.h to mbedtls_common.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Changing all instances of #include "common.h" to #include "mbedcrypto_common.h" to prevent collitions -Changing the name of common.h to mbedcrypto_common.h -Mbed TLS uses the file name "common.h" for common settings relevant for build. Unfortunately common.h is not guarded with any folder-structure as this is an internal file that is present in the folder where source-files resides. Due to the way that zephyr adds include-folders it will be difficult to prevent someone coming up with the same name and adding the include-folder earlier than Mbed TLS. Note: This change will be proposed upstream in Mbed TLS with the hope that this commit is can be reverted Signed-off-by: Frank Audun Kvamtrø (cherry picked from commit fcf3eac94f406fee639a4e456ece15b86c8669b2) --- 3rdparty/everest/library/Hacl_Curve25519_joined.c | 3 +-- 3rdparty/everest/library/everest.c | 3 +-- 3rdparty/everest/library/x25519.c | 2 +- library/aes.c | 2 +- library/aesce.c | 2 +- library/aesce.h | 2 +- library/aesni.c | 2 +- library/aria.c | 2 +- library/asn1parse.c | 2 +- library/asn1write.c | 2 +- library/base64.c | 2 +- library/base64_internal.h | 2 +- library/bignum.c | 2 +- library/bignum_core.c | 2 +- library/bignum_core.h | 2 +- library/bignum_mod.c | 2 +- library/bignum_mod.h | 2 +- library/bignum_mod_raw.c | 2 +- library/bignum_mod_raw.h | 2 +- library/bignum_mod_raw_invasive.h | 2 +- library/block_cipher.c | 2 +- library/camellia.c | 2 +- library/ccm.c | 2 +- library/chacha20.c | 2 +- library/chachapoly.c | 2 +- library/cipher.c | 2 +- library/cipher_wrap.c | 2 +- library/cmac.c | 2 +- library/constant_time.c | 2 +- library/constant_time_impl.h | 2 +- library/constant_time_internal.h | 2 +- library/ctr.h | 2 +- library/ctr_drbg.c | 2 +- library/debug.c | 2 +- library/des.c | 2 +- library/dhm.c | 2 +- library/ecdh.c | 2 +- library/ecdsa.c | 2 +- library/ecjpake.c | 2 +- library/ecp.c | 2 +- library/ecp_curves.c | 2 +- library/ecp_curves_new.c | 2 +- library/ecp_invasive.h | 2 +- library/entropy.c | 2 +- library/entropy_poll.c | 2 +- library/error.c | 2 +- library/gcm.c | 2 +- library/hkdf.c | 2 +- library/hmac_drbg.c | 2 +- library/lmots.c | 2 +- library/lms.c | 2 +- library/{common.h => mbedcrypto_common.h} | 0 library/md.c | 2 +- library/md5.c | 2 +- library/md_psa.h | 2 +- library/memory_buffer_alloc.c | 2 +- library/mps_reader.c | 2 +- library/mps_trace.c | 2 +- library/mps_trace.h | 2 +- library/net_sockets.c | 2 +- library/nist_kw.c | 2 +- library/oid.c | 2 +- library/padlock.c | 2 +- library/pem.c | 2 +- library/pk.c | 2 +- library/pk_ecc.c | 2 +- library/pk_wrap.c | 2 +- library/pkcs12.c | 2 +- library/pkcs5.c | 2 +- library/pkcs7.c | 2 +- library/pkparse.c | 2 +- library/pkwrite.c | 2 +- library/platform.c | 2 +- library/platform_util.c | 2 +- library/poly1305.c | 2 +- library/psa_crypto.c | 2 +- library/psa_crypto_aead.c | 2 +- library/psa_crypto_cipher.c | 2 +- library/psa_crypto_client.c | 2 +- library/psa_crypto_driver_wrappers.h | 2 +- library/psa_crypto_driver_wrappers_no_static.c | 2 +- library/psa_crypto_ecp.c | 2 +- library/psa_crypto_ffdh.c | 2 +- library/psa_crypto_hash.c | 2 +- library/psa_crypto_invasive.h | 2 +- library/psa_crypto_mac.c | 2 +- library/psa_crypto_pake.c | 2 +- library/psa_crypto_rsa.c | 2 +- library/psa_crypto_se.c | 2 +- library/psa_crypto_slot_management.c | 2 +- library/psa_crypto_storage.c | 2 +- library/psa_its_file.c | 2 +- library/psa_util.c | 2 +- library/ripemd160.c | 2 +- library/rsa.c | 2 +- library/rsa_alt_helpers.c | 2 +- library/sha1.c | 2 +- library/sha256.c | 2 +- library/sha3.c | 2 +- library/sha512.c | 2 +- library/ssl_cache.c | 2 +- library/ssl_ciphersuites.c | 2 +- library/ssl_client.c | 2 +- library/ssl_client.h | 2 +- library/ssl_cookie.c | 2 +- library/ssl_debug_helpers.h | 2 +- library/ssl_debug_helpers_generated.c | 3 +-- library/ssl_misc.h | 2 +- library/ssl_msg.c | 2 +- library/ssl_ticket.c | 2 +- library/ssl_tls.c | 2 +- library/ssl_tls12_client.c | 2 +- library/ssl_tls12_server.c | 2 +- library/ssl_tls13_client.c | 2 +- library/ssl_tls13_generic.c | 2 +- library/ssl_tls13_invasive.h | 2 +- library/ssl_tls13_keys.c | 2 +- library/ssl_tls13_server.c | 2 +- library/threading.c | 2 +- library/timing.c | 2 +- library/version.c | 2 +- library/version_features.c | 2 +- library/x509.c | 2 +- library/x509_create.c | 2 +- library/x509_crl.c | 2 +- library/x509_crt.c | 2 +- library/x509_csr.c | 2 +- library/x509write.c | 2 +- library/x509write_crt.c | 2 +- library/x509write_csr.c | 2 +- programs/test/metatest.c | 2 +- .../driver_templates/psa_crypto_driver_wrappers.h.jinja | 2 +- .../psa_crypto_driver_wrappers_no_static.c.jinja | 2 +- scripts/data_files/error.fmt | 2 +- scripts/data_files/version_features.fmt | 2 +- scripts/generate_ssl_debug_helpers.py | 2 +- tests/include/test/macros.h | 2 +- tests/src/certs.c | 2 +- tests/suites/test_suite_common.function | 2 +- tests/suites/test_suite_pkcs12.function | 2 +- tests/suites/test_suite_psa_crypto.function | 2 +- tests/suites/test_suite_psa_crypto_memory.function | 2 +- 142 files changed, 141 insertions(+), 144 deletions(-) rename library/{common.h => mbedcrypto_common.h} (100%) diff --git a/3rdparty/everest/library/Hacl_Curve25519_joined.c b/3rdparty/everest/library/Hacl_Curve25519_joined.c index a778160fff..acbda4e783 100644 --- a/3rdparty/everest/library/Hacl_Curve25519_joined.c +++ b/3rdparty/everest/library/Hacl_Curve25519_joined.c @@ -28,7 +28,7 @@ #define _DEFAULT_SOURCE #endif -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) @@ -47,4 +47,3 @@ #include "kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c" #endif /* defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) */ - diff --git a/3rdparty/everest/library/everest.c b/3rdparty/everest/library/everest.c index fefc6a2ce4..940e31b13a 100644 --- a/3rdparty/everest/library/everest.c +++ b/3rdparty/everest/library/everest.c @@ -19,7 +19,7 @@ * This file is part of Mbed TLS (https://tls.mbed.org). */ -#include "common.h" +#include "mbedcrypto_common.h" #include @@ -99,4 +99,3 @@ int mbedtls_everest_calc_secret( mbedtls_ecdh_context_everest *ctx, size_t *olen } #endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */ - diff --git a/3rdparty/everest/library/x25519.c b/3rdparty/everest/library/x25519.c index 83064dc619..c35a52df01 100644 --- a/3rdparty/everest/library/x25519.c +++ b/3rdparty/everest/library/x25519.c @@ -19,7 +19,7 @@ * This file is part of Mbed TLS (https://tls.mbed.org) */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ECDH_C) && defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) diff --git a/library/aes.c b/library/aes.c index b1a5c3ed10..9431fd65f4 100644 --- a/library/aes.c +++ b/library/aes.c @@ -11,7 +11,7 @@ * http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_AES_C) diff --git a/library/aesce.c b/library/aesce.c index 6a9e0a1c6b..b0417f5c5d 100644 --- a/library/aesce.c +++ b/library/aesce.c @@ -39,7 +39,7 @@ #endif /* defined(__clang__) && (__clang_major__ >= 4) */ #include -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_AESCE_C) diff --git a/library/aesce.h b/library/aesce.h index a14d085efa..719bb6ed53 100644 --- a/library/aesce.h +++ b/library/aesce.h @@ -15,7 +15,7 @@ #define MBEDTLS_AESCE_H #include "mbedtls/build_info.h" -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/aes.h" diff --git a/library/aesni.c b/library/aesni.c index 8e5bd55ab9..e8300f4277 100644 --- a/library/aesni.c +++ b/library/aesni.c @@ -10,7 +10,7 @@ * [CLMUL-WP] https://www.intel.com/content/www/us/en/develop/download/intel-carry-less-multiplication-instruction-and-its-usage-for-computing-the-gcm-mode.html */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_AESNI_C) diff --git a/library/aria.c b/library/aria.c index d9f84cc59d..e3896cd393 100644 --- a/library/aria.c +++ b/library/aria.c @@ -11,7 +11,7 @@ * [2] https://tools.ietf.org/html/rfc5794 */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ARIA_C) diff --git a/library/asn1parse.c b/library/asn1parse.c index e33fdf71da..38168baf9a 100644 --- a/library/asn1parse.c +++ b/library/asn1parse.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ASN1_PARSE_C) || defined(MBEDTLS_X509_CREATE_C) || \ defined(MBEDTLS_PSA_UTIL_HAVE_ECDSA) diff --git a/library/asn1write.c b/library/asn1write.c index 775a9ef530..9845034656 100644 --- a/library/asn1write.c +++ b/library/asn1write.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ASN1_WRITE_C) || defined(MBEDTLS_X509_USE_C) || \ defined(MBEDTLS_PSA_UTIL_HAVE_ECDSA) diff --git a/library/base64.c b/library/base64.c index 9677dee5b2..d5e940e2f7 100644 --- a/library/base64.c +++ b/library/base64.c @@ -7,7 +7,7 @@ #include -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BASE64_C) diff --git a/library/base64_internal.h b/library/base64_internal.h index a09bd23777..789aa62f28 100644 --- a/library/base64_internal.h +++ b/library/base64_internal.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_BASE64_INTERNAL #define MBEDTLS_BASE64_INTERNAL -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_TEST_HOOKS) diff --git a/library/bignum.c b/library/bignum.c index 424490951d..86d2f0b178 100644 --- a/library/bignum.c +++ b/library/bignum.c @@ -21,7 +21,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) diff --git a/library/bignum_core.c b/library/bignum_core.c index 4231554b84..1f06ffe9ce 100644 --- a/library/bignum_core.c +++ b/library/bignum_core.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) diff --git a/library/bignum_core.h b/library/bignum_core.h index cf6485a148..6b5ee483ed 100644 --- a/library/bignum_core.h +++ b/library/bignum_core.h @@ -68,7 +68,7 @@ #ifndef MBEDTLS_BIGNUM_CORE_H #define MBEDTLS_BIGNUM_CORE_H -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) #include "mbedtls/bignum.h" diff --git a/library/bignum_mod.c b/library/bignum_mod.c index dfd332a703..93aae51479 100644 --- a/library/bignum_mod.c +++ b/library/bignum_mod.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ECP_WITH_MPI_UINT) diff --git a/library/bignum_mod.h b/library/bignum_mod.h index 963d8881ac..a2bc543d2c 100644 --- a/library/bignum_mod.h +++ b/library/bignum_mod.h @@ -69,7 +69,7 @@ #ifndef MBEDTLS_BIGNUM_MOD_H #define MBEDTLS_BIGNUM_MOD_H -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) #include "mbedtls/bignum.h" diff --git a/library/bignum_mod_raw.c b/library/bignum_mod_raw.c index 5343bc650d..691484e867 100644 --- a/library/bignum_mod_raw.c +++ b/library/bignum_mod_raw.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_ECP_WITH_MPI_UINT) diff --git a/library/bignum_mod_raw.h b/library/bignum_mod_raw.h index 7bb4ca3cf5..a72659664d 100644 --- a/library/bignum_mod_raw.h +++ b/library/bignum_mod_raw.h @@ -66,7 +66,7 @@ #ifndef MBEDTLS_BIGNUM_MOD_RAW_H #define MBEDTLS_BIGNUM_MOD_RAW_H -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) #include "mbedtls/bignum.h" diff --git a/library/bignum_mod_raw_invasive.h b/library/bignum_mod_raw_invasive.h index 94a0d06cf0..9f16790fcb 100644 --- a/library/bignum_mod_raw_invasive.h +++ b/library/bignum_mod_raw_invasive.h @@ -12,7 +12,7 @@ #ifndef MBEDTLS_BIGNUM_MOD_RAW_INVASIVE_H #define MBEDTLS_BIGNUM_MOD_RAW_INVASIVE_H -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/bignum.h" #include "bignum_mod.h" diff --git a/library/block_cipher.c b/library/block_cipher.c index 51cdcdf46b..d327aef6af 100644 --- a/library/block_cipher.c +++ b/library/block_cipher.c @@ -9,7 +9,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BLOCK_CIPHER_SOME_PSA) #include "psa/crypto.h" diff --git a/library/camellia.c b/library/camellia.c index b1c0a08ca2..1df94f3d6e 100644 --- a/library/camellia.c +++ b/library/camellia.c @@ -11,7 +11,7 @@ * http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/01espec.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CAMELLIA_C) diff --git a/library/ccm.c b/library/ccm.c index 45ed697dd3..e90ba56264 100644 --- a/library/ccm.c +++ b/library/ccm.c @@ -14,7 +14,7 @@ * RFC 5116 "An Interface and Algorithms for Authenticated Encryption" */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CCM_C) diff --git a/library/chacha20.c b/library/chacha20.c index acaae5b2e9..bb79a50bd3 100644 --- a/library/chacha20.c +++ b/library/chacha20.c @@ -9,7 +9,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CHACHA20_C) diff --git a/library/chachapoly.c b/library/chachapoly.c index a1314eab6d..e6d77a58a8 100644 --- a/library/chachapoly.c +++ b/library/chachapoly.c @@ -6,7 +6,7 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CHACHAPOLY_C) diff --git a/library/cipher.c b/library/cipher.c index c4cbbe45b0..cd2cf15757 100644 --- a/library/cipher.c +++ b/library/cipher.c @@ -9,7 +9,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CIPHER_C) diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c index d2fee22e2b..14611c091c 100644 --- a/library/cipher_wrap.c +++ b/library/cipher_wrap.c @@ -9,7 +9,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CIPHER_C) diff --git a/library/cmac.c b/library/cmac.c index eda10d0b3d..9cd516689e 100644 --- a/library/cmac.c +++ b/library/cmac.c @@ -26,7 +26,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CMAC_C) diff --git a/library/constant_time.c b/library/constant_time.c index d212ddfd81..42705848de 100644 --- a/library/constant_time.c +++ b/library/constant_time.c @@ -13,7 +13,7 @@ #include #include -#include "common.h" +#include "mbedcrypto_common.h" #include "constant_time_internal.h" #include "mbedtls/constant_time.h" #include "mbedtls/error.h" diff --git a/library/constant_time_impl.h b/library/constant_time_impl.h index 2a4574ba68..5d9d7552c5 100644 --- a/library/constant_time_impl.h +++ b/library/constant_time_impl.h @@ -10,7 +10,7 @@ #include -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) #include "mbedtls/bignum.h" diff --git a/library/constant_time_internal.h b/library/constant_time_internal.h index 61a5c6d4e9..5617c4e250 100644 --- a/library/constant_time_internal.h +++ b/library/constant_time_internal.h @@ -11,7 +11,7 @@ #include #include -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_BIGNUM_C) #include "mbedtls/bignum.h" diff --git a/library/ctr.h b/library/ctr.h index aa48fb9e70..d6fe9ef8c8 100644 --- a/library/ctr.h +++ b/library/ctr.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_CTR_H #define MBEDTLS_CTR_H -#include "common.h" +#include "mbedcrypto_common.h" /** * \brief Increment a big-endian 16-byte value. diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c index b82044eb7d..aef254b834 100644 --- a/library/ctr_drbg.c +++ b/library/ctr_drbg.c @@ -10,7 +10,7 @@ * https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-90r.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_CTR_DRBG_C) diff --git a/library/debug.c b/library/debug.c index c36ed3c5c2..34bc805bdc 100644 --- a/library/debug.c +++ b/library/debug.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_DEBUG_C) diff --git a/library/des.c b/library/des.c index f0032b3b56..df6c8db663 100644 --- a/library/des.c +++ b/library/des.c @@ -11,7 +11,7 @@ * http://csrc.nist.gov/publications/fips/fips46-3/fips46-3.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_DES_C) diff --git a/library/dhm.c b/library/dhm.c index bcc07f5441..2fc5e2fe80 100644 --- a/library/dhm.c +++ b/library/dhm.c @@ -13,7 +13,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_DHM_C) diff --git a/library/ecdh.c b/library/ecdh.c index b276c6adad..ebed3279f0 100644 --- a/library/ecdh.c +++ b/library/ecdh.c @@ -12,7 +12,7 @@ * RFC 4492 */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ECDH_C) diff --git a/library/ecdsa.c b/library/ecdsa.c index 2f7a996a7e..cf9af34185 100644 --- a/library/ecdsa.c +++ b/library/ecdsa.c @@ -11,7 +11,7 @@ * SEC1 https://www.secg.org/sec1-v2.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ECDSA_C) diff --git a/library/ecjpake.c b/library/ecjpake.c index cdf5d7ea46..f973f185ca 100644 --- a/library/ecjpake.c +++ b/library/ecjpake.c @@ -10,7 +10,7 @@ * available to members of the Thread Group http://threadgroup.org/ */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ECJPAKE_C) diff --git a/library/ecp.c b/library/ecp.c index 427059bb53..b6e4457389 100644 --- a/library/ecp.c +++ b/library/ecp.c @@ -29,7 +29,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" /** * \brief Function level alternative implementation. diff --git a/library/ecp_curves.c b/library/ecp_curves.c index c3cd33f47a..b0a07bd6a7 100644 --- a/library/ecp_curves.c +++ b/library/ecp_curves.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if !defined(MBEDTLS_ECP_WITH_MPI_UINT) diff --git a/library/ecp_curves_new.c b/library/ecp_curves_new.c index 035b23a1b4..cebef02000 100644 --- a/library/ecp_curves_new.c +++ b/library/ecp_curves_new.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ECP_WITH_MPI_UINT) diff --git a/library/ecp_invasive.h b/library/ecp_invasive.h index ff9f9ecf1d..7be07c64f1 100644 --- a/library/ecp_invasive.h +++ b/library/ecp_invasive.h @@ -14,7 +14,7 @@ #ifndef MBEDTLS_ECP_INVASIVE_H #define MBEDTLS_ECP_INVASIVE_H -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/bignum.h" #include "bignum_mod.h" #include "mbedtls/ecp.h" diff --git a/library/entropy.c b/library/entropy.c index 6751236ff0..878663703f 100644 --- a/library/entropy.c +++ b/library/entropy.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_ENTROPY_C) diff --git a/library/entropy_poll.c b/library/entropy_poll.c index 611768cd85..1c23079fc1 100644 --- a/library/entropy_poll.c +++ b/library/entropy_poll.c @@ -12,7 +12,7 @@ #endif #endif -#include "common.h" +#include "mbedcrypto_common.h" #include diff --git a/library/error.c b/library/error.c index 6ad7162ab5..91bef64769 100644 --- a/library/error.c +++ b/library/error.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/error.h" diff --git a/library/gcm.c b/library/gcm.c index 5dfac2349c..abbab51ff8 100644 --- a/library/gcm.c +++ b/library/gcm.c @@ -15,7 +15,7 @@ * [MGV] 4.1, pp. 12-13, to enhance speed without using too much memory. */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_GCM_C) diff --git a/library/hkdf.c b/library/hkdf.c index 631ac24e53..8b043593e9 100644 --- a/library/hkdf.c +++ b/library/hkdf.c @@ -4,7 +4,7 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_HKDF_C) diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c index 90174d5d17..6ce44a986b 100644 --- a/library/hmac_drbg.c +++ b/library/hmac_drbg.c @@ -11,7 +11,7 @@ * References below are based on rev. 1 (January 2012). */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_HMAC_DRBG_C) diff --git a/library/lmots.c b/library/lmots.c index c51cb41ece..1b16cd3425 100644 --- a/library/lmots.c +++ b/library/lmots.c @@ -18,7 +18,7 @@ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-208.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_LMS_C) diff --git a/library/lms.c b/library/lms.c index 7f7bec068b..399a6eaa18 100644 --- a/library/lms.c +++ b/library/lms.c @@ -18,7 +18,7 @@ * https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-208.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_LMS_C) diff --git a/library/common.h b/library/mbedcrypto_common.h similarity index 100% rename from library/common.h rename to library/mbedcrypto_common.h diff --git a/library/md.c b/library/md.c index c95846aa04..468defdff5 100644 --- a/library/md.c +++ b/library/md.c @@ -9,7 +9,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" /* * Availability of functions in this module is controlled by two diff --git a/library/md5.c b/library/md5.c index e4a87a2e09..3ba2479013 100644 --- a/library/md5.c +++ b/library/md5.c @@ -10,7 +10,7 @@ * http://www.ietf.org/rfc/rfc1321.txt */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_MD5_C) diff --git a/library/md_psa.h b/library/md_psa.h index 028ba2409c..391a65a51a 100644 --- a/library/md_psa.h +++ b/library/md_psa.h @@ -10,7 +10,7 @@ #ifndef MBEDTLS_MD_PSA_H #define MBEDTLS_MD_PSA_H -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/md.h" #include "psa/crypto.h" diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c index 79b0a8b8fa..97bc68397a 100644 --- a/library/memory_buffer_alloc.c +++ b/library/memory_buffer_alloc.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #include "mbedtls/memory_buffer_alloc.h" diff --git a/library/mps_reader.c b/library/mps_reader.c index 27d0c04c10..33292ad7ce 100644 --- a/library/mps_reader.c +++ b/library/mps_reader.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/mps_trace.c b/library/mps_trace.c index 69f6e5a0f9..f34b896eb8 100644 --- a/library/mps_trace.c +++ b/library/mps_trace.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/mps_trace.h b/library/mps_trace.h index b456b2ffdd..b0e5dd5187 100644 --- a/library/mps_trace.h +++ b/library/mps_trace.h @@ -12,7 +12,7 @@ #ifndef MBEDTLS_MPS_MBEDTLS_MPS_TRACE_H #define MBEDTLS_MPS_MBEDTLS_MPS_TRACE_H -#include "common.h" +#include "mbedcrypto_common.h" #include "mps_common.h" #include "mps_trace.h" diff --git a/library/net_sockets.c b/library/net_sockets.c index ef89a88ef0..4e13e0c402 100644 --- a/library/net_sockets.c +++ b/library/net_sockets.c @@ -15,7 +15,7 @@ #define _XOPEN_SOURCE 600 /* sockaddr_storage */ #endif -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_NET_C) diff --git a/library/nist_kw.c b/library/nist_kw.c index 8faafe43f1..37b51e4c9b 100644 --- a/library/nist_kw.c +++ b/library/nist_kw.c @@ -15,7 +15,7 @@ * the wrapping and unwrapping operation than the definition in NIST SP 800-38F. */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_NIST_KW_C) diff --git a/library/oid.c b/library/oid.c index 45fbf8e340..a910f4bc00 100644 --- a/library/oid.c +++ b/library/oid.c @@ -7,7 +7,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_OID_C) diff --git a/library/padlock.c b/library/padlock.c index 1f006910c2..a1e6e7d133 100644 --- a/library/padlock.c +++ b/library/padlock.c @@ -11,7 +11,7 @@ * programming_guide.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PADLOCK_C) diff --git a/library/pem.c b/library/pem.c index 0207601456..e2af1d6a94 100644 --- a/library/pem.c +++ b/library/pem.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PEM_PARSE_C) || defined(MBEDTLS_PEM_WRITE_C) diff --git a/library/pk.c b/library/pk.c index 3fe51ea34f..def9462183 100644 --- a/library/pk.c +++ b/library/pk.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PK_C) #include "mbedtls/pk.h" diff --git a/library/pk_ecc.c b/library/pk_ecc.c index 86218fffc8..b79ad33a09 100644 --- a/library/pk_ecc.c +++ b/library/pk_ecc.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/pk.h" #include "mbedtls/error.h" diff --git a/library/pk_wrap.c b/library/pk_wrap.c index 612ccc66cd..1a15f273bd 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/platform_util.h" diff --git a/library/pkcs12.c b/library/pkcs12.c index a3467b9820..b34647713c 100644 --- a/library/pkcs12.c +++ b/library/pkcs12.c @@ -11,7 +11,7 @@ * ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-12/pkcs-12v1-1.asn */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PKCS12_C) diff --git a/library/pkcs5.c b/library/pkcs5.c index c6c53054b6..3e03c419bd 100644 --- a/library/pkcs5.c +++ b/library/pkcs5.c @@ -15,7 +15,7 @@ * http://tools.ietf.org/html/rfc6070 (Test vectors) */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PKCS5_C) diff --git a/library/pkcs7.c b/library/pkcs7.c index 3aac662ba6..db2785750a 100644 --- a/library/pkcs7.c +++ b/library/pkcs7.c @@ -2,7 +2,7 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/build_info.h" #if defined(MBEDTLS_PKCS7_C) diff --git a/library/pkparse.c b/library/pkparse.c index 4f6ee13986..7c99004e16 100644 --- a/library/pkparse.c +++ b/library/pkparse.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PK_PARSE_C) diff --git a/library/pkwrite.c b/library/pkwrite.c index 2a698448be..b142a3fdfb 100644 --- a/library/pkwrite.c +++ b/library/pkwrite.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PK_WRITE_C) diff --git a/library/platform.c b/library/platform.c index f8109c73f3..2a723a651b 100644 --- a/library/platform.c +++ b/library/platform.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PLATFORM_C) diff --git a/library/platform_util.c b/library/platform_util.c index 2d9c731d91..385bc0e4d7 100644 --- a/library/platform_util.c +++ b/library/platform_util.c @@ -20,7 +20,7 @@ #define _GNU_SOURCE #endif -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/platform_util.h" #include "mbedtls/platform.h" diff --git a/library/poly1305.c b/library/poly1305.c index c9ebe9e1da..2bd1cfb16d 100644 --- a/library/poly1305.c +++ b/library/poly1305.c @@ -6,7 +6,7 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_POLY1305_C) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 68895738ea..4248804412 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "psa_crypto_core_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_aead.c b/library/psa_crypto_aead.c index a201985b4f..ee51b6066c 100644 --- a/library/psa_crypto_aead.c +++ b/library/psa_crypto_aead.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_cipher.c b/library/psa_crypto_cipher.c index 3216c94898..348f288ab3 100644 --- a/library/psa_crypto_cipher.c +++ b/library/psa_crypto_cipher.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_client.c b/library/psa_crypto_client.c index 72f671d63d..5b154b3ab9 100644 --- a/library/psa_crypto_client.c +++ b/library/psa_crypto_client.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "psa/crypto.h" #if defined(MBEDTLS_PSA_CRYPTO_CLIENT) diff --git a/library/psa_crypto_driver_wrappers.h b/library/psa_crypto_driver_wrappers.h index 2d566f5f84..d610a76162 100644 --- a/library/psa_crypto_driver_wrappers.h +++ b/library/psa_crypto_driver_wrappers.h @@ -9,7 +9,7 @@ /* BEGIN-common headers */ -#include "common.h" +#include "mbedcrypto_common.h" #include "psa_crypto_aead.h" #include "psa_crypto_cipher.h" #include "psa_crypto_core.h" diff --git a/library/psa_crypto_driver_wrappers_no_static.c b/library/psa_crypto_driver_wrappers_no_static.c index bc65e2c7f9..84862c64e3 100644 --- a/library/psa_crypto_driver_wrappers_no_static.c +++ b/library/psa_crypto_driver_wrappers_no_static.c @@ -9,7 +9,7 @@ /* BEGIN-common headers */ -#include "common.h" +#include "mbedcrypto_common.h" #include "psa_crypto_aead.h" #include "psa_crypto_cipher.h" #include "psa_crypto_core.h" diff --git a/library/psa_crypto_ecp.c b/library/psa_crypto_ecp.c index 317554bfb4..96f1e476f9 100644 --- a/library/psa_crypto_ecp.c +++ b/library/psa_crypto_ecp.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO) diff --git a/library/psa_crypto_ffdh.c b/library/psa_crypto_ffdh.c index ae38f6d7c6..987a6af38d 100644 --- a/library/psa_crypto_ffdh.c +++ b/library/psa_crypto_ffdh.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_hash.c b/library/psa_crypto_hash.c index 5c025b3355..23e43454e2 100644 --- a/library/psa_crypto_hash.c +++ b/library/psa_crypto_hash.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO) diff --git a/library/psa_crypto_invasive.h b/library/psa_crypto_invasive.h index 51c90c64a4..ccc6560d4b 100644 --- a/library/psa_crypto_invasive.h +++ b/library/psa_crypto_invasive.h @@ -26,7 +26,7 @@ #include "psa/build_info.h" #include "psa/crypto.h" -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/entropy.h" diff --git a/library/psa_crypto_mac.c b/library/psa_crypto_mac.c index 8fe6218118..6fd724a391 100644 --- a/library/psa_crypto_mac.c +++ b/library/psa_crypto_mac.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_pake.c b/library/psa_crypto_pake.c index 9ac2e8c486..48034555c7 100644 --- a/library/psa_crypto_pake.c +++ b/library/psa_crypto_pake.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_rsa.c b/library/psa_crypto_rsa.c index 20540d3561..59219bab5f 100644 --- a/library/psa_crypto_rsa.c +++ b/library/psa_crypto_rsa.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) || defined(MCUBOOT_USE_PSA_CRYPTO) diff --git a/library/psa_crypto_se.c b/library/psa_crypto_se.c index 7a36a4f3a5..5e627ae4d7 100644 --- a/library/psa_crypto_se.c +++ b/library/psa_crypto_se.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_SE_C) diff --git a/library/psa_crypto_slot_management.c b/library/psa_crypto_slot_management.c index 9850d8c750..6db1491c29 100644 --- a/library/psa_crypto_slot_management.c +++ b/library/psa_crypto_slot_management.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_C) diff --git a/library/psa_crypto_storage.c b/library/psa_crypto_storage.c index 7d1317b45a..f7fee92d1e 100644 --- a/library/psa_crypto_storage.c +++ b/library/psa_crypto_storage.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C) diff --git a/library/psa_its_file.c b/library/psa_its_file.c index 9567137483..9e96925cb2 100644 --- a/library/psa_its_file.c +++ b/library/psa_its_file.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_PSA_ITS_FILE_C) diff --git a/library/psa_util.c b/library/psa_util.c index 679d00ea9b..87a3877a8c 100644 --- a/library/psa_util.c +++ b/library/psa_util.c @@ -6,7 +6,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" /* This is needed for MBEDTLS_ERR_XXX macros */ #include diff --git a/library/ripemd160.c b/library/ripemd160.c index b4fc3cdba1..35fe15a2b4 100644 --- a/library/ripemd160.c +++ b/library/ripemd160.c @@ -11,7 +11,7 @@ * http://ehash.iaik.tugraz.at/wiki/RIPEMD-160 */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_RIPEMD160_C) diff --git a/library/rsa.c b/library/rsa.c index 557faaf363..d39c491942 100644 --- a/library/rsa.c +++ b/library/rsa.c @@ -23,7 +23,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_RSA_C) diff --git a/library/rsa_alt_helpers.c b/library/rsa_alt_helpers.c index 5c265a9921..542fcaaac8 100644 --- a/library/rsa_alt_helpers.c +++ b/library/rsa_alt_helpers.c @@ -6,7 +6,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_RSA_C) diff --git a/library/sha1.c b/library/sha1.c index dfbe481f39..a9bd6745f0 100644 --- a/library/sha1.c +++ b/library/sha1.c @@ -10,7 +10,7 @@ * http://www.itl.nist.gov/fipspubs/fip180-1.htm */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SHA1_C) diff --git a/library/sha256.c b/library/sha256.c index 159acccaeb..4b641fe14b 100644 --- a/library/sha256.c +++ b/library/sha256.c @@ -48,7 +48,7 @@ #define _GNU_SOURCE #endif -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SHA256_C) || defined(MBEDTLS_SHA224_C) diff --git a/library/sha3.c b/library/sha3.c index 57385595f5..a1e74d1954 100644 --- a/library/sha3.c +++ b/library/sha3.c @@ -10,7 +10,7 @@ * https://nvlpubs.nist.gov/nistpubs/fips/nist.fips.202.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SHA3_C) diff --git a/library/sha512.c b/library/sha512.c index 6dcea8da5d..12b5c5b37b 100644 --- a/library/sha512.c +++ b/library/sha512.c @@ -26,7 +26,7 @@ #define MBEDTLS_ENABLE_ARM_SHA3_EXTENSIONS_COMPILER_FLAG #endif -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SHA512_C) || defined(MBEDTLS_SHA384_C) diff --git a/library/ssl_cache.c b/library/ssl_cache.c index 772cb8fdfe..a28f85e577 100644 --- a/library/ssl_cache.c +++ b/library/ssl_cache.c @@ -9,7 +9,7 @@ * to store and retrieve the session information. */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_CACHE_C) diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c index 23619a26c8..c5535fbbb5 100644 --- a/library/ssl_ciphersuites.c +++ b/library/ssl_ciphersuites.c @@ -7,7 +7,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_TLS_C) diff --git a/library/ssl_client.c b/library/ssl_client.c index 345e608938..3ba5b3cb3f 100644 --- a/library/ssl_client.c +++ b/library/ssl_client.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_PROTO_TLS1_3) || defined(MBEDTLS_SSL_PROTO_TLS1_2) diff --git a/library/ssl_client.h b/library/ssl_client.h index 05ee7e4cc3..6f45a8c1b4 100644 --- a/library/ssl_client.h +++ b/library/ssl_client.h @@ -8,7 +8,7 @@ #ifndef MBEDTLS_SSL_CLIENT_H #define MBEDTLS_SSL_CLIENT_H -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_TLS_C) #include "ssl_misc.h" diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c index acc9e8c080..f0ba42a0b0 100644 --- a/library/ssl_cookie.c +++ b/library/ssl_cookie.c @@ -9,7 +9,7 @@ * to store and retrieve the session information. */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_COOKIE_C) diff --git a/library/ssl_debug_helpers.h b/library/ssl_debug_helpers.h index 4889e77e04..22803d5910 100644 --- a/library/ssl_debug_helpers.h +++ b/library/ssl_debug_helpers.h @@ -11,7 +11,7 @@ #ifndef MBEDTLS_SSL_DEBUG_HELPERS_H #define MBEDTLS_SSL_DEBUG_HELPERS_H -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_DEBUG_C) diff --git a/library/ssl_debug_helpers_generated.c b/library/ssl_debug_helpers_generated.c index 734c417b8b..0079556be8 100644 --- a/library/ssl_debug_helpers_generated.c +++ b/library/ssl_debug_helpers_generated.c @@ -11,7 +11,7 @@ * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_DEBUG_C) @@ -248,4 +248,3 @@ const char *mbedtls_ssl_key_export_type_str( mbedtls_ssl_key_export_type in ) #endif /* MBEDTLS_DEBUG_C */ /* End of automatically generated file. */ - diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 98668798a8..7f8ecfa3d2 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -47,7 +47,7 @@ #include "ssl_ciphersuites_internal.h" #include "x509_internal.h" #include "pk_internal.h" -#include "common.h" +#include "mbedcrypto_common.h" /* Shorthand for restartable ECC */ #if defined(MBEDTLS_ECP_RESTARTABLE) && \ diff --git a/library/ssl_msg.c b/library/ssl_msg.c index ef722d7bdc..953367f28d 100644 --- a/library/ssl_msg.c +++ b/library/ssl_msg.c @@ -10,7 +10,7 @@ * http://www.ietf.org/rfc/rfc4346.txt */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_TLS_C) diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c index bfb656cf62..957844a39f 100644 --- a/library/ssl_ticket.c +++ b/library/ssl_ticket.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_TICKET_C) diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 06be992af9..28a5662b86 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -9,7 +9,7 @@ * http://www.ietf.org/rfc/rfc4346.txt */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_TLS_C) diff --git a/library/ssl_tls12_client.c b/library/ssl_tls12_client.c index fa0319d4b3..4922aba70d 100644 --- a/library/ssl_tls12_client.c +++ b/library/ssl_tls12_client.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_PROTO_TLS1_2) diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c index 03722ac33c..d0bd92e628 100644 --- a/library/ssl_tls12_server.c +++ b/library/ssl_tls12_server.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_PROTO_TLS1_2) diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index b63b5e63c5..8668574acb 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index b6d09788ba..1407b039e2 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_TLS_C) && defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/ssl_tls13_invasive.h b/library/ssl_tls13_invasive.h index b4506f71c7..1dc615639b 100644 --- a/library/ssl_tls13_invasive.h +++ b/library/ssl_tls13_invasive.h @@ -6,7 +6,7 @@ #ifndef MBEDTLS_SSL_TLS13_INVASIVE_H #define MBEDTLS_SSL_TLS13_INVASIVE_H -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c index 739414ea2f..fddc5277c9 100644 --- a/library/ssl_tls13_keys.c +++ b/library/ssl_tls13_keys.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c index 693edc7b0b..b560c85e92 100644 --- a/library/ssl_tls13_server.c +++ b/library/ssl_tls13_server.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_PROTO_TLS1_3) diff --git a/library/threading.c b/library/threading.c index 85db243f21..938b01f12f 100644 --- a/library/threading.c +++ b/library/threading.c @@ -13,7 +13,7 @@ #define _POSIX_C_SOURCE 200112L #endif -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_THREADING_C) diff --git a/library/timing.c b/library/timing.c index 58f1c1ec2e..581f0c8a47 100644 --- a/library/timing.c +++ b/library/timing.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_TIMING_C) diff --git a/library/version.c b/library/version.c index 04397332bb..473ed0dbe8 100644 --- a/library/version.c +++ b/library/version.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_VERSION_C) diff --git a/library/version_features.c b/library/version_features.c index f542d9808f..15e53272ef 100644 --- a/library/version_features.c +++ b/library/version_features.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_VERSION_C) diff --git a/library/x509.c b/library/x509.c index f97fb44589..bac87cd299 100644 --- a/library/x509.c +++ b/library/x509.c @@ -15,7 +15,7 @@ * http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_USE_C) diff --git a/library/x509_create.c b/library/x509_create.c index 839b5df226..2f8a3da81a 100644 --- a/library/x509_create.c +++ b/library/x509_create.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CREATE_C) diff --git a/library/x509_crl.c b/library/x509_crl.c index 7901992e20..794be4baea 100644 --- a/library/x509_crl.c +++ b/library/x509_crl.c @@ -15,7 +15,7 @@ * http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CRL_PARSE_C) diff --git a/library/x509_crt.c b/library/x509_crt.c index 53cdcf0266..b08cb85965 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c @@ -17,7 +17,7 @@ * [SIRO] https://cabforum.org/wp-content/uploads/Chunghwatelecom201503cabforumV4.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CRT_PARSE_C) diff --git a/library/x509_csr.c b/library/x509_csr.c index 813d64466c..f3e1ead26d 100644 --- a/library/x509_csr.c +++ b/library/x509_csr.c @@ -15,7 +15,7 @@ * http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CSR_PARSE_C) diff --git a/library/x509write.c b/library/x509write.c index 4704900d38..3dda7baa7d 100644 --- a/library/x509write.c +++ b/library/x509write.c @@ -4,7 +4,7 @@ * Copyright The Mbed TLS Contributors * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CSR_WRITE_C) || defined(MBEDTLS_X509_CRT_WRITE_C) #include "mbedtls/x509_crt.h" diff --git a/library/x509write_crt.c b/library/x509write_crt.c index 56f23c9fab..d6a244456a 100644 --- a/library/x509write_crt.c +++ b/library/x509write_crt.c @@ -11,7 +11,7 @@ * - attributes: PKCS#9 v2.0 aka RFC 2985 */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CRT_WRITE_C) diff --git a/library/x509write_csr.c b/library/x509write_csr.c index 0d6f6bb1d3..225baea557 100644 --- a/library/x509write_csr.c +++ b/library/x509write_csr.c @@ -10,7 +10,7 @@ * - attributes: PKCS#9 v2.0 aka RFC 2985 */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_X509_CSR_WRITE_C) diff --git a/programs/test/metatest.c b/programs/test/metatest.c index d876e9a87d..5e774b9f3d 100644 --- a/programs/test/metatest.c +++ b/programs/test/metatest.c @@ -34,7 +34,7 @@ #include "test/threading_helpers.h" #include "test/macros.h" #include "test/memory.h" -#include "common.h" +#include "mbedcrypto_common.h" #include #include diff --git a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja index d3b7d6fb31..09f0772f57 100644 --- a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja +++ b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.h.jinja @@ -9,7 +9,7 @@ /* BEGIN-common headers */ -#include "common.h" +#include "mbedcrypto_common.h" #include "psa_crypto_aead.h" #include "psa_crypto_cipher.h" #include "psa_crypto_core.h" diff --git a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers_no_static.c.jinja b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers_no_static.c.jinja index f612cf0b21..184c5cb2b3 100644 --- a/scripts/data_files/driver_templates/psa_crypto_driver_wrappers_no_static.c.jinja +++ b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers_no_static.c.jinja @@ -9,7 +9,7 @@ /* BEGIN-common headers */ -#include "common.h" +#include "mbedcrypto_common.h" #include "psa_crypto_aead.h" #include "psa_crypto_cipher.h" #include "psa_crypto_core.h" diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt index 781e72a919..6200d8e9e0 100644 --- a/scripts/data_files/error.fmt +++ b/scripts/data_files/error.fmt @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/error.h" diff --git a/scripts/data_files/version_features.fmt b/scripts/data_files/version_features.fmt index d820d4d1a7..578ea23227 100644 --- a/scripts/data_files/version_features.fmt +++ b/scripts/data_files/version_features.fmt @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_VERSION_C) diff --git a/scripts/generate_ssl_debug_helpers.py b/scripts/generate_ssl_debug_helpers.py index 600d16096e..2ba2a3edd9 100755 --- a/scripts/generate_ssl_debug_helpers.py +++ b/scripts/generate_ssl_debug_helpers.py @@ -350,7 +350,7 @@ def __str__(self): * */ -#include "common.h" +#include "mbedcrypto_common.h" #if defined(MBEDTLS_DEBUG_C) diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h index a73e06fca8..8044fd68e2 100644 --- a/tests/include/test/macros.h +++ b/tests/include/test/macros.h @@ -21,7 +21,7 @@ #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) #include "mbedtls/memory_buffer_alloc.h" #endif -#include "common.h" +#include "mbedcrypto_common.h" /** * \brief This macro tests the expression passed to it as a test step or diff --git a/tests/src/certs.c b/tests/src/certs.c index 879f08882c..cae498b61f 100644 --- a/tests/src/certs.c +++ b/tests/src/certs.c @@ -5,7 +5,7 @@ * SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later */ -#include "common.h" +#include "mbedcrypto_common.h" #include diff --git a/tests/suites/test_suite_common.function b/tests/suites/test_suite_common.function index 8626a0ba4c..668257ef2a 100644 --- a/tests/suites/test_suite_common.function +++ b/tests/suites/test_suite_common.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "common.h" +#include "mbedcrypto_common.h" static void fill_arrays(unsigned char *a, unsigned char *b, diff --git a/tests/suites/test_suite_pkcs12.function b/tests/suites/test_suite_pkcs12.function index 2a5a5bae88..11ac837611 100644 --- a/tests/suites/test_suite_pkcs12.function +++ b/tests/suites/test_suite_pkcs12.function @@ -1,6 +1,6 @@ /* BEGIN_HEADER */ #include "mbedtls/pkcs12.h" -#include "common.h" +#include "mbedcrypto_common.h" typedef enum { USE_NULL_INPUT = 0, diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function index 2e513ea45c..207665cdea 100644 --- a/tests/suites/test_suite_psa_crypto.function +++ b/tests/suites/test_suite_psa_crypto.function @@ -4,7 +4,7 @@ #include "mbedtls/asn1.h" #include "mbedtls/asn1write.h" #include "mbedtls/oid.h" -#include "common.h" +#include "mbedcrypto_common.h" #include "mbedtls/psa_util.h" diff --git a/tests/suites/test_suite_psa_crypto_memory.function b/tests/suites/test_suite_psa_crypto_memory.function index 55c00921b2..4b7e84bade 100644 --- a/tests/suites/test_suite_psa_crypto_memory.function +++ b/tests/suites/test_suite_psa_crypto_memory.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ #include -#include "common.h" +#include "mbedcrypto_common.h" #include "psa/crypto.h" From 716eeea8dd5609fc04987c76c715c8b583d70dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frank=20Audun=20Kvamtr=C3=B8?= Date: Wed, 22 Jan 2025 14:20:18 +0100 Subject: [PATCH 3/3] [nrf noup] Move headers found in Oberon PSA core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Oberon PSA core has some replacement headers but it also uses headers from the library folder. Since the headers and the C files in this folder perform inclusion with double quotes this can create issues since the Oberon PSA core may use headrs from this repo that it shouldn't. This moves the headers that the Oberon PSA core replaces with to another folder so that they don't accidentaly included from the Oberon PSA core. Note that mbedcrypto_common.h is not moved Signed-off-by: Georgios Vasilakis Signed-off-by: Frank Audun Kvamtrø --- {library => include/library}/bignum_mod.h | 0 {library => include/library}/check_crypto_config.h | 0 {library => include/library}/constant_time_impl.h | 0 {library => include/library}/constant_time_internal.h | 0 {library => include/library}/entropy_poll.h | 0 {library => include/library}/md_psa.h | 0 {library => include/library}/psa_crypto_core.h | 0 {library => include/library}/psa_crypto_core_common.h | 0 {library => include/library}/psa_crypto_driver_wrappers.h | 0 .../library}/psa_crypto_driver_wrappers_no_static.h | 0 {library => include/library}/psa_crypto_invasive.h | 0 {library => include/library}/psa_crypto_its.h | 0 {library => include/library}/psa_crypto_random_impl.h | 0 {library => include/library}/psa_crypto_se.h | 0 {library => include/library}/psa_crypto_slot_management.h | 0 {library => include/library}/psa_crypto_storage.h | 0 {library => include/library}/psa_util_internal.h | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename {library => include/library}/bignum_mod.h (100%) rename {library => include/library}/check_crypto_config.h (100%) rename {library => include/library}/constant_time_impl.h (100%) rename {library => include/library}/constant_time_internal.h (100%) rename {library => include/library}/entropy_poll.h (100%) rename {library => include/library}/md_psa.h (100%) rename {library => include/library}/psa_crypto_core.h (100%) rename {library => include/library}/psa_crypto_core_common.h (100%) rename {library => include/library}/psa_crypto_driver_wrappers.h (100%) rename {library => include/library}/psa_crypto_driver_wrappers_no_static.h (100%) rename {library => include/library}/psa_crypto_invasive.h (100%) rename {library => include/library}/psa_crypto_its.h (100%) rename {library => include/library}/psa_crypto_random_impl.h (100%) rename {library => include/library}/psa_crypto_se.h (100%) rename {library => include/library}/psa_crypto_slot_management.h (100%) rename {library => include/library}/psa_crypto_storage.h (100%) rename {library => include/library}/psa_util_internal.h (100%) diff --git a/library/bignum_mod.h b/include/library/bignum_mod.h similarity index 100% rename from library/bignum_mod.h rename to include/library/bignum_mod.h diff --git a/library/check_crypto_config.h b/include/library/check_crypto_config.h similarity index 100% rename from library/check_crypto_config.h rename to include/library/check_crypto_config.h diff --git a/library/constant_time_impl.h b/include/library/constant_time_impl.h similarity index 100% rename from library/constant_time_impl.h rename to include/library/constant_time_impl.h diff --git a/library/constant_time_internal.h b/include/library/constant_time_internal.h similarity index 100% rename from library/constant_time_internal.h rename to include/library/constant_time_internal.h diff --git a/library/entropy_poll.h b/include/library/entropy_poll.h similarity index 100% rename from library/entropy_poll.h rename to include/library/entropy_poll.h diff --git a/library/md_psa.h b/include/library/md_psa.h similarity index 100% rename from library/md_psa.h rename to include/library/md_psa.h diff --git a/library/psa_crypto_core.h b/include/library/psa_crypto_core.h similarity index 100% rename from library/psa_crypto_core.h rename to include/library/psa_crypto_core.h diff --git a/library/psa_crypto_core_common.h b/include/library/psa_crypto_core_common.h similarity index 100% rename from library/psa_crypto_core_common.h rename to include/library/psa_crypto_core_common.h diff --git a/library/psa_crypto_driver_wrappers.h b/include/library/psa_crypto_driver_wrappers.h similarity index 100% rename from library/psa_crypto_driver_wrappers.h rename to include/library/psa_crypto_driver_wrappers.h diff --git a/library/psa_crypto_driver_wrappers_no_static.h b/include/library/psa_crypto_driver_wrappers_no_static.h similarity index 100% rename from library/psa_crypto_driver_wrappers_no_static.h rename to include/library/psa_crypto_driver_wrappers_no_static.h diff --git a/library/psa_crypto_invasive.h b/include/library/psa_crypto_invasive.h similarity index 100% rename from library/psa_crypto_invasive.h rename to include/library/psa_crypto_invasive.h diff --git a/library/psa_crypto_its.h b/include/library/psa_crypto_its.h similarity index 100% rename from library/psa_crypto_its.h rename to include/library/psa_crypto_its.h diff --git a/library/psa_crypto_random_impl.h b/include/library/psa_crypto_random_impl.h similarity index 100% rename from library/psa_crypto_random_impl.h rename to include/library/psa_crypto_random_impl.h diff --git a/library/psa_crypto_se.h b/include/library/psa_crypto_se.h similarity index 100% rename from library/psa_crypto_se.h rename to include/library/psa_crypto_se.h diff --git a/library/psa_crypto_slot_management.h b/include/library/psa_crypto_slot_management.h similarity index 100% rename from library/psa_crypto_slot_management.h rename to include/library/psa_crypto_slot_management.h diff --git a/library/psa_crypto_storage.h b/include/library/psa_crypto_storage.h similarity index 100% rename from library/psa_crypto_storage.h rename to include/library/psa_crypto_storage.h diff --git a/library/psa_util_internal.h b/include/library/psa_util_internal.h similarity index 100% rename from library/psa_util_internal.h rename to include/library/psa_util_internal.h