From 2b5dbf46c0e98835b4022484bff2b7a7d252af0b Mon Sep 17 00:00:00 2001
From: Anton Matkin <anton.matkin@arm.com>
Date: Tue, 17 Jun 2025 01:18:22 +0200
Subject: [PATCH] Modifications done by executing the script for each private
 header (in the tf-psa-crypto section)

Signed-off-by: Anton Matkin <anton.matkin@arm.com>
---
 tests/include/test/bignum_helpers.h                   | 2 +-
 tests/include/test/drivers/cipher.h                   | 2 +-
 tests/include/test/drivers/test_driver.h              | 2 +-
 tests/include/test/helpers.h                          | 2 +-
 tests/include/test/psa_crypto_helpers.h               | 2 +-
 tests/src/bignum_helpers.c                            | 2 +-
 tests/src/drivers/test_driver_asymmetric_encryption.c | 2 +-
 tests/src/drivers/test_driver_cipher.c                | 4 ++--
 tests/src/drivers/test_driver_key_management.c        | 2 +-
 tests/src/drivers/test_driver_signature.c             | 4 ++--
 tests/src/fake_external_rng_for_test.c                | 2 +-
 tests/src/psa_crypto_helpers.c                        | 4 ++--
 tests/src/psa_exercise_key.c                          | 2 +-
 tests/src/random.c                                    | 2 +-
 14 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/include/test/bignum_helpers.h b/tests/include/test/bignum_helpers.h
index a5e49cbe5..bc94a2a88 100644
--- a/tests/include/test/bignum_helpers.h
+++ b/tests/include/test/bignum_helpers.h
@@ -17,7 +17,7 @@
 
 #if defined(MBEDTLS_BIGNUM_C)
 
-#include <mbedtls/bignum.h>
+#include <mbedtls/private/bignum.h>
 #include <bignum_mod.h>
 
 /** Allocate and populate a core MPI from a test case argument.
diff --git a/tests/include/test/drivers/cipher.h b/tests/include/test/drivers/cipher.h
index 38c75aba7..2df1dc777 100644
--- a/tests/include/test/drivers/cipher.h
+++ b/tests/include/test/drivers/cipher.h
@@ -16,7 +16,7 @@
 #include <psa/crypto_driver_common.h>
 #include <psa/crypto.h>
 
-#include "mbedtls/cipher.h"
+#include "mbedtls/private/cipher.h"
 
 typedef struct {
     /* If non-null, on success, copy this to the output. */
diff --git a/tests/include/test/drivers/test_driver.h b/tests/include/test/drivers/test_driver.h
index 74605d6b8..c2e30054d 100644
--- a/tests/include/test/drivers/test_driver.h
+++ b/tests/include/test/drivers/test_driver.h
@@ -19,7 +19,7 @@
 #define PSA_CRYPTO_TEST_DRIVER_LOCATION 0x7fffff
 
 #include "test/drivers/aead.h"
-#include "test/drivers/cipher.h"
+#include "test/drivers/private/cipher.h"
 #include "test/drivers/hash.h"
 #include "test/drivers/mac.h"
 #include "test/drivers/key_management.h"
diff --git a/tests/include/test/helpers.h b/tests/include/test/helpers.h
index aff84748f..6776d4f18 100644
--- a/tests/include/test/helpers.h
+++ b/tests/include/test/helpers.h
@@ -51,7 +51,7 @@
 #include <stdint.h>
 
 #if defined(MBEDTLS_BIGNUM_C)
-#include "mbedtls/bignum.h"
+#include "mbedtls/private/bignum.h"
 #endif
 
 /** The type of test case arguments that contain binary data. */
diff --git a/tests/include/test/psa_crypto_helpers.h b/tests/include/test/psa_crypto_helpers.h
index 9b7dbd57a..70f3d356b 100644
--- a/tests/include/test/psa_crypto_helpers.h
+++ b/tests/include/test/psa_crypto_helpers.h
@@ -17,7 +17,7 @@
 #endif
 
 #include <psa/crypto.h>
-#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/private/ctr_drbg.h>
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
 /** Initialize the PSA Crypto subsystem. */
diff --git a/tests/src/bignum_helpers.c b/tests/src/bignum_helpers.c
index 913f5e387..db725326a 100644
--- a/tests/src/bignum_helpers.c
+++ b/tests/src/bignum_helpers.c
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <mbedtls/bignum.h>
+#include <mbedtls/private/bignum.h>
 #include <bignum_core.h>
 #include <bignum_mod.h>
 #include <bignum_mod_raw.h>
diff --git a/tests/src/drivers/test_driver_asymmetric_encryption.c b/tests/src/drivers/test_driver_asymmetric_encryption.c
index 6fdbe43ae..6689036a7 100644
--- a/tests/src/drivers/test_driver_asymmetric_encryption.c
+++ b/tests/src/drivers/test_driver_asymmetric_encryption.c
@@ -9,7 +9,7 @@
 
 #if defined(PSA_CRYPTO_DRIVER_TEST)
 #include "psa/crypto.h"
-#include "mbedtls/rsa.h"
+#include "mbedtls/private/rsa.h"
 #include "psa_crypto_rsa.h"
 #include "string.h"
 #include "test/drivers/asymmetric_encryption.h"
diff --git a/tests/src/drivers/test_driver_cipher.c b/tests/src/drivers/test_driver_cipher.c
index 9a9a77c70..ac51fe989 100644
--- a/tests/src/drivers/test_driver_cipher.c
+++ b/tests/src/drivers/test_driver_cipher.c
@@ -12,9 +12,9 @@
 #include "psa/crypto.h"
 #include "psa_crypto_cipher.h"
 #include "psa_crypto_core.h"
-#include "mbedtls/cipher.h"
+#include "mbedtls/private/cipher.h"
 
-#include "test/drivers/cipher.h"
+#include "test/drivers/private/cipher.h"
 
 #include "test/random.h"
 
diff --git a/tests/src/drivers/test_driver_key_management.c b/tests/src/drivers/test_driver_key_management.c
index d2ca157b8..e0434f690 100644
--- a/tests/src/drivers/test_driver_key_management.c
+++ b/tests/src/drivers/test_driver_key_management.c
@@ -14,7 +14,7 @@
 #include "psa_crypto_ecp.h"
 #include "psa_crypto_rsa.h"
 #include "psa_crypto_ffdh.h"
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
 #include "mbedtls/error.h"
 
 #include "test/drivers/key_management.h"
diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c
index a6eef573b..af20a21fe 100644
--- a/tests/src/drivers/test_driver_signature.c
+++ b/tests/src/drivers/test_driver_signature.c
@@ -15,13 +15,13 @@
 #include "psa_crypto_ecp.h"
 #include "psa_crypto_hash.h"
 #include "psa_crypto_rsa.h"
-#include "mbedtls/ecp.h"
+#include "mbedtls/private/ecp.h"
 
 #include "test/drivers/hash.h"
 #include "test/drivers/signature.h"
 #include "test/drivers/hash.h"
 
-#include "mbedtls/ecdsa.h"
+#include "mbedtls/private/ecdsa.h"
 
 #include "test/random.h"
 
diff --git a/tests/src/fake_external_rng_for_test.c b/tests/src/fake_external_rng_for_test.c
index 741927cb3..83976137e 100644
--- a/tests/src/fake_external_rng_for_test.c
+++ b/tests/src/fake_external_rng_for_test.c
@@ -58,7 +58,7 @@ psa_status_t mbedtls_psa_external_get_random(
 #if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) || defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
 
 #include <test/random.h>
-#include <mbedtls/entropy.h>
+#include <mbedtls/private/entropy.h>
 
 static int platform_get_entropy_force_failure;
 static size_t platform_get_entropy_forced_entropy_content = SIZE_MAX;
diff --git a/tests/src/psa_crypto_helpers.c b/tests/src/psa_crypto_helpers.c
index 9de2861e9..c253cef26 100644
--- a/tests/src/psa_crypto_helpers.c
+++ b/tests/src/psa_crypto_helpers.c
@@ -14,7 +14,7 @@
 #include <test/psa_crypto_helpers.h>
 
 #if defined(MBEDTLS_CTR_DRBG_C)
-#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/private/ctr_drbg.h>
 #endif
 
 #if defined(MBEDTLS_PSA_CRYPTO_C)
@@ -249,7 +249,7 @@ exit:
 
 #if defined(MBEDTLS_PSA_INJECT_ENTROPY)
 
-#include <mbedtls/entropy.h>
+#include <mbedtls/private/entropy.h>
 #include <psa_crypto_its.h>
 
 int mbedtls_test_inject_entropy_seed_read(unsigned char *buf, size_t len)
diff --git a/tests/src/psa_exercise_key.c b/tests/src/psa_exercise_key.c
index b8cdd3ced..42e29f40b 100644
--- a/tests/src/psa_exercise_key.c
+++ b/tests/src/psa_exercise_key.c
@@ -25,7 +25,7 @@
 #include <pk_internal.h>
 #endif
 #if defined(MBEDTLS_ECP_C)
-#include <mbedtls/ecp.h>
+#include <mbedtls/private/ecp.h>
 #endif
 #if defined(MBEDTLS_RSA_C)
 #include <rsa_internal.h>
diff --git a/tests/src/random.c b/tests/src/random.c
index d041f36a1..1bcee2fd1 100644
--- a/tests/src/random.c
+++ b/tests/src/random.c
@@ -23,7 +23,7 @@
 #include <test/random.h>
 #include <string.h>
 
-#include <mbedtls/entropy.h>
+#include <mbedtls/private/entropy.h>
 #include <alignment.h>
 
 int mbedtls_test_rnd_std_rand(void *rng_state,