Do not use generic header names

krish2718 · frkv · commit b41e899e7302 · 2024-09-27T10:58:32.000+02:00
Zephyr has a global list of include directories that is applicable for
all modules unless specifically excluded by using "targets", and using a
generic named header can cause issues if there are duplicate headers
files and depending on the inclusion order.

So, rename the header with module prefix to avoid naming collision.

Signed-off-by: Chaitanya Tata &lt;Chaitanya.Tata@nordicsemi.no&gt;
diff --git 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 "oberon_psa_common.h"
 
 #if defined(MBEDTLS_BIGNUM_C)
 #include "mbedtls/bignum.h"
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 "oberon_psa_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
@@ -10,7 +10,7 @@
 
 #include <stddef.h>
 
-#include "common.h"
+#include "oberon_psa_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
@@ -11,7 +11,7 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #if defined(MBEDTLS_BIGNUM_C)
 #include "mbedtls/bignum.h"
diff --git 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 "oberon_psa_common.h"
 
 #include "mbedtls/md.h"
 #include "psa/crypto.h"
diff --git a/library/oberon_psa_common.h b/library/oberon_psa_common.h
diff --git 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 "oberon_psa_common.h"
 
 #if defined(MBEDTLS_PLATFORM_C)
 
diff --git a/library/platform_util.c b/library/platform_util.c
@@ -20,7 +20,7 @@
 #define _GNU_SOURCE
 #endif
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #include "mbedtls/platform_util.h"
 #include "mbedtls/platform.h"
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
@@ -10,7 +10,7 @@
  * NOTICE: This file has been modified by Oberon microsystems AG.
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 #include "psa_crypto_core_common.h"
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
diff --git 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 "oberon_psa_common.h"
 #include "psa/crypto.h"
 
 #if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c
@@ -22,7 +22,7 @@
  * NOTICE: This file has been modified by Oberon microsystems AG.
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 #include "psa/crypto.h"
 #include "psa_crypto_core.h"
 #include "psa_crypto_driver_wrappers.h"
diff --git 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 "oberon_psa_common.h"
 
 #include "mbedtls/entropy.h"
 
diff --git 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 "oberon_psa_common.h"
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 
diff --git 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 "oberon_psa_common.h"
 
 #if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
 
diff --git 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 "oberon_psa_common.h"
 
 #if defined(MBEDTLS_PSA_ITS_FILE_C)
 
diff --git a/library/threading.c b/library/threading.c
@@ -13,7 +13,7 @@
 #define _POSIX_C_SOURCE 200112L
 #endif
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #if defined(MBEDTLS_THREADING_C)
 
diff --git a/oberon/platforms/demo/library/psa_crypto_driver_wrappers.c b/oberon/platforms/demo/library/psa_crypto_driver_wrappers.c
@@ -22,7 +22,7 @@
  * NOTICE: This file has been modified by Oberon microsystems AG.
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 #include "psa/crypto.h"
 #include "psa_crypto_core.h"
 #include "psa_crypto_driver_wrappers.h"
diff --git a/oberon/platforms/nordic_nrf/library/psa_crypto_driver_wrappers.c b/oberon/platforms/nordic_nrf/library/psa_crypto_driver_wrappers.c
@@ -22,7 +22,7 @@
  * NOTICE: This file has been modified by Oberon microsystems AG.
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 #include "psa/crypto.h"
 #include "psa_crypto_core.h"
 #include "psa_crypto_driver_wrappers.h"
diff --git a/programs/ssl/library/md.c b/programs/ssl/library/md.c
@@ -9,7 +9,7 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 /*
  * Availability of functions in this module is controlled by two
diff --git a/programs/ssl/library/psa_util.c b/programs/ssl/library/psa_util.c
@@ -6,7 +6,7 @@
  *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 /* This is needed for MBEDTLS_ERR_XXX macros */
 #include <mbedtls/error.h>
diff --git a/tests/generated/test_suite_psa_crypto.c b/tests/generated/test_suite_psa_crypto.c
@@ -167,7 +167,7 @@ static int restore_output(FILE *out_stream, int dup_fd)
 #include "mbedtls/asn1.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/oid.h"
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #include "mbedtls/psa_util.h"
 
diff --git a/tests/generated/test_suite_psa_crypto.pbkdf2.c b/tests/generated/test_suite_psa_crypto.pbkdf2.c
@@ -167,7 +167,7 @@ static int restore_output(FILE *out_stream, int dup_fd)
 #include "mbedtls/asn1.h"
 #include "mbedtls/asn1write.h"
 #include "mbedtls/oid.h"
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #include "mbedtls/psa_util.h"
 
diff --git a/tests/generated/test_suite_psa_crypto_memory.c b/tests/generated/test_suite_psa_crypto_memory.c
@@ -165,7 +165,7 @@ static int restore_output(FILE *out_stream, int dup_fd)
 #line 2 "tests/suites/test_suite_psa_crypto_memory.function"
 #include <stdint.h>
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #include "psa/crypto.h"
 
diff --git 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 "oberon_psa_common.h"
 
 /**
  * \brief   This macro tests the expression passed to it as a test step or
diff --git a/tests/src/asn1parse_min.c b/tests/src/asn1parse_min.c
@@ -21,7 +21,7 @@
  * NOTICE: This file has been modified by Oberon microsystems AG.
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #if defined(MBEDTLS_ASN1_PARSE_C)
 
diff --git a/tests/src/asn1write_min.c b/tests/src/asn1write_min.c
@@ -21,7 +21,7 @@
  * NOTICE: This file has been modified by Oberon microsystems AG.
  */
 
-#include "common.h"
+#include "oberon_psa_common.h"
 
 #if defined(MBEDTLS_ASN1_WRITE_C)
 
