Merge pull request #10309 from bensze01/rename-tf-psa-crypto-common.h
Rename tf-psa-crypto/core/common.h
diff --git a/framework b/framework
index 893ad9e..df3307f 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 893ad9e8450a8e7459679d952abd5d6df26c41c4
+Subproject commit df3307f2b4fe512def60886024f7be8fd1523ccd
diff --git a/library/ssl_misc.h b/library/ssl_misc.h
index a462a07..a308711 100644
--- a/library/ssl_misc.h
+++ b/library/ssl_misc.h
@@ -10,7 +10,7 @@
#ifndef MBEDTLS_SSL_MISC_H
#define MBEDTLS_SSL_MISC_H
-#include "common.h"
+#include "tf_psa_crypto_common.h"
#include "mbedtls/build_info.h"
#include "mbedtls/error.h"
diff --git a/library/x509_internal.h b/library/x509_internal.h
index 9360471..8160270 100644
--- a/library/x509_internal.h
+++ b/library/x509_internal.h
@@ -10,7 +10,7 @@
#ifndef MBEDTLS_X509_INTERNAL_H
#define MBEDTLS_X509_INTERNAL_H
-#include "common.h"
+#include "tf_psa_crypto_common.h"
#include "mbedtls/build_info.h"
#include "mbedtls/private_access.h"
diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt
index 14522ec..69bec9f 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 "tf_psa_crypto_common.h"
#include "mbedtls/error.h"
diff --git a/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c b/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
index 71173d2..87ef39a 100644
--- a/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
+++ b/tests/psa-client-server/psasim/src/aut_psa_aead_encrypt_decrypt.c
@@ -12,13 +12,13 @@
* -I$(MBEDTLS_ROOT_PATH)/tf-psa-crypto/drivers/builtin/include
* None of those cover tf-psa-crypto/core, so we rely on the
* “-I$(MBEDTLS_ROOT_PATH)/include” entry plus a parent-relative
- * include "../tf-psa-crypto/core/common.h" in order to pull in common.h here,
+ * include "../tf-psa-crypto/core/tf_psa_crypto_common.h" in order to pull in tf_psa_crypto_common.h here,
* which in turn gets MBEDTLS_ATTRIBUTE_UNTERMINATED_STRING (to silence the
* new GCC-15 unterminated-string-initialization warning).
* See GitHub issue #10223 for the proper long-term fix.
* https://github.com/Mbed-TLS/mbedtls/issues/10223
*/
-#include "../tf-psa-crypto/core/common.h"
+#include "../tf-psa-crypto/core/tf_psa_crypto_common.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c b/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
index 25c0b8a..82bdca5 100644
--- a/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
+++ b/tests/psa-client-server/psasim/src/aut_psa_cipher_encrypt_decrypt.c
@@ -4,7 +4,7 @@
*/
#include "psa/crypto.h"
-#include "../tf-psa-crypto/core/common.h"
+#include "../tf-psa-crypto/core/tf_psa_crypto_common.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/src/certs.c b/tests/src/certs.c
index f7a73bf..c45f062 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 "tf_psa_crypto_common.h"
#include <test/certs.h>
diff --git a/tf-psa-crypto b/tf-psa-crypto
index b1c98eb..a0ff5d6 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit b1c98ebee82c1056cec0f64e24f1b780a5889a0d
+Subproject commit a0ff5d64831aad7d19aa7e02eb8af065e07506f2