commit 7b7854ed4bccb051b25e397f5db8e4f110eae055
author Ronald Cron <ronald.cron@arm.com> Sat Mar 13 18:19:08 2021 +0100
committer Ronald Cron <ronald.cron@arm.com> Tue Nov 30 14:49:19 2021 +0100
tree 03a76bf0bff204c322245a5a317401d5de360006
parent d54303da7c3efc47a429b3e20845a8e857e7ed81

tests: Rename test driver entry points

Rename test driver entry points to
libtestdriver1_<name of the Mbed TLS entry point>.

This aligns with the renaming of all Mbed TLS APIs
for the test driver library (that will be put in place
in the following commits) to avoid name conflicts
when linking it with the Mbed TLS library.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>

tests/src/drivers/test_driver_signature.c

diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c
index 443b52e..a656287 100644
--- a/tests/src/drivers/test_driver_signature.c
+++ b/tests/src/drivers/test_driver_signature.c
@@ -35,6 +35,7 @@
 
 #include "test/drivers/hash.h"
 #include "test/drivers/signature.h"
+#include "test/drivers/hash.h"
 
 #include "mbedtls/md.h"
 #include "mbedtls/ecdsa.h"
@@ -67,18 +68,18 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PSS) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_rsa_sign_hash(
+            return( libtestdriver1_mbedtls_psa_rsa_sign_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
                         signature, signature_size, signature_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS)
-        return( mbedtls_psa_rsa_sign_hash(
-                    attributes,
-                    key_buffer, key_buffer_size,
-                    alg, hash, hash_length,
-                    signature, signature_size, signature_length ) );
+            return( mbedtls_psa_rsa_sign_hash(
+                        attributes,
+                        key_buffer, key_buffer_size,
+                        alg, hash, hash_length,
+                        signature, signature_size, signature_length ) );
 #endif
         }
         else
@@ -93,7 +94,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_ecdsa_sign_hash(
+            return( libtestdriver1_mbedtls_psa_ecdsa_sign_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
@@ -143,18 +144,18 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_RSA_PSS) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_rsa_verify_hash(
+            return( libtestdriver1_mbedtls_psa_rsa_verify_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
                         signature, signature_length ) );
 #elif defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PKCS1V15_SIGN) || \
       defined(MBEDTLS_PSA_BUILTIN_ALG_RSA_PSS)
-        return( mbedtls_psa_rsa_verify_hash(
-                    attributes,
-                    key_buffer, key_buffer_size,
-                    alg, hash, hash_length,
-                    signature, signature_length ) );
+            return( mbedtls_psa_rsa_verify_hash(
+                        attributes,
+                        key_buffer, key_buffer_size,
+                        alg, hash, hash_length,
+                        signature, signature_length ) );
 #endif
         }
         else
@@ -169,7 +170,7 @@
 #if ( defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA) || \
       defined(MBEDTLS_PSA_ACCEL_ALG_DETERMINISTIC_ECDSA) ) && \
     defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-            return( mbedtls_transparent_test_driver_ecdsa_verify_hash(
+            return( libtestdriver1_mbedtls_psa_ecdsa_verify_hash(
                         attributes,
                         key_buffer, key_buffer_size,
                         alg, hash, hash_length,
@@ -233,7 +234,7 @@
     }
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    status = mbedtls_transparent_test_driver_hash_compute(
+    status = libtestdriver1_mbedtls_psa_hash_compute(
                 PSA_ALG_SIGN_GET_HASH( alg ), input, input_length,
                 hash, sizeof( hash ), &hash_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
@@ -297,7 +298,7 @@
         return( mbedtls_test_driver_signature_verify_hooks.forced_status );
 
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
-    status = mbedtls_transparent_test_driver_hash_compute(
+    status = libtestdriver1_mbedtls_psa_hash_compute(
                 PSA_ALG_SIGN_GET_HASH( alg ), input, input_length,
                 hash, sizeof( hash ), &hash_length );
 #elif defined(MBEDTLS_PSA_BUILTIN_HASH)
@@ -361,9 +362,9 @@
         return( PSA_SUCCESS );
     }
 
-    return sign_hash( attributes, key_buffer, key_buffer_size,
+    return( sign_hash( attributes, key_buffer, key_buffer_size,
                       alg, hash, hash_length,
-                      signature, signature_size, signature_length );
+                      signature, signature_size, signature_length ) );
 }
 
 psa_status_t mbedtls_test_opaque_signature_sign_hash(