nrfconnect · frkv · Jan 22, 2025 · Jan 22, 2025 · Jan 22, 2025
diff --git 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
@@ -19,7 +19,7 @@
  *  This file is part of Mbed TLS (https://tls.mbed.org).
  */
 
-#include "common.h"
+#include "mbedcrypto_common.h"
 
 #include <string.h>
 
@@ -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
@@ -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/include/library/bignum_mod.h b/include/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/include/library/constant_time_impl.h b/include/library/constant_time_impl.h
@@ -10,7 +10,7 @@
 
 #include <stddef.h>
 
-#include "common.h"
+#include "mbedcrypto_common.h"
 
 #if defined(MBEDTLS_BIGNUM_C)
 #include "mbedtls/bignum.h"

diff --git a/include/library/constant_time_internal.h b/include/library/constant_time_internal.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "common.h"
+#include "mbedcrypto_common.h"
 
 #if defined(MBEDTLS_BIGNUM_C)
 #include "mbedtls/bignum.h"

diff --git a/include/library/md_psa.h b/include/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/include/library/psa_crypto_driver_wrappers.h b/include/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/include/library/psa_crypto_invasive.h b/include/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/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
@@ -39,7 +39,7 @@
 #endif /* defined(__clang__) &&  (__clang_major__ >= 4) */
 
 #include <string.h>
-#include "common.h"
+#include "mbedcrypto_common.h"
 
 #if defined(MBEDTLS_AESCE_C)
 

diff --git 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
@@ -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/include/library/alignment.h → library/alignment.h b/include/library/alignment.h → library/alignment.h
diff --git 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
@@ -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
@@ -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
@@ -7,7 +7,7 @@
 
 #include <limits.h>
 
-#include "common.h"
+#include "mbedcrypto_common.h"
 
 #if defined(MBEDTLS_BASE64_C)
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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.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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
 #include <stdint.h>
 #include <limits.h>
 
-#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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -29,7 +29,7 @@
  *     <http://eprint.iacr.org/2004/342.pdf>
  */
 
-#include "common.h"
+#include "mbedcrypto_common.h"
 
 /**
  * \brief Function level alternative implementation.
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
      *
      */
-    #include "common.h"
+    #include "mbedcrypto_common.h"
     #if defined(MBEDTLS_BIGNUM_C)
@@ Expand Down @@