Skip to content

Commit fcf3eac

Browse files
committed
Rename common.h to mbedtls_common.h
-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ø <[email protected]>
1 parent 4952e13 commit fcf3eac

File tree

142 files changed

+141
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+141
-144
lines changed

3rdparty/everest/library/Hacl_Curve25519_joined.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#define _DEFAULT_SOURCE
2929
#endif
3030

31-
#include "common.h"
31+
#include "mbedcrypto_common.h"
3232

3333
#if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED)
3434

@@ -47,4 +47,3 @@
4747
#include "kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c"
4848

4949
#endif /* defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) */
50-

3rdparty/everest/library/everest.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* This file is part of Mbed TLS (https://tls.mbed.org).
2020
*/
2121

22-
#include "common.h"
22+
#include "mbedcrypto_common.h"
2323

2424
#include <string.h>
2525

@@ -99,4 +99,3 @@ int mbedtls_everest_calc_secret( mbedtls_ecdh_context_everest *ctx, size_t *olen
9999
}
100100

101101
#endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */
102-

3rdparty/everest/library/x25519.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* This file is part of Mbed TLS (https://tls.mbed.org)
2020
*/
2121

22-
#include "common.h"
22+
#include "mbedcrypto_common.h"
2323

2424
#if defined(MBEDTLS_ECDH_C) && defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED)
2525

library/aes.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
1212
*/
1313

14-
#include "common.h"
14+
#include "mbedcrypto_common.h"
1515

1616
#if defined(MBEDTLS_AES_C)
1717

library/aesce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#endif /* defined(__clang__) && (__clang_major__ >= 4) */
4040

4141
#include <string.h>
42-
#include "common.h"
42+
#include "mbedcrypto_common.h"
4343

4444
#if defined(MBEDTLS_AESCE_C)
4545

library/aesce.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#define MBEDTLS_AESCE_H
1616

1717
#include "mbedtls/build_info.h"
18-
#include "common.h"
18+
#include "mbedcrypto_common.h"
1919

2020
#include "mbedtls/aes.h"
2121

library/aesni.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* [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
1111
*/
1212

13-
#include "common.h"
13+
#include "mbedcrypto_common.h"
1414

1515
#if defined(MBEDTLS_AESNI_C)
1616

library/aria.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* [2] https://tools.ietf.org/html/rfc5794
1212
*/
1313

14-
#include "common.h"
14+
#include "mbedcrypto_common.h"
1515

1616
#if defined(MBEDTLS_ARIA_C)
1717

library/asn1parse.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
66
*/
77

8-
#include "common.h"
8+
#include "mbedcrypto_common.h"
99

1010
#if defined(MBEDTLS_ASN1_PARSE_C) || defined(MBEDTLS_X509_CREATE_C) || \
1111
defined(MBEDTLS_PSA_UTIL_HAVE_ECDSA)

library/asn1write.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
66
*/
77

8-
#include "common.h"
8+
#include "mbedcrypto_common.h"
99

1010
#if defined(MBEDTLS_ASN1_WRITE_C) || defined(MBEDTLS_X509_USE_C) || \
1111
defined(MBEDTLS_PSA_UTIL_HAVE_ECDSA)

0 commit comments

Comments
 (0)