Merge upstream test driver changes locally

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
diff --git a/tests/include/test/drivers/aead.h b/tests/include/test/drivers/aead.h
index 23f32c0..e1058af 100644
--- a/tests/include/test/drivers/aead.h
+++ b/tests/include/test/drivers/aead.h
@@ -67,34 +67,34 @@
     const uint8_t *ciphertext, size_t ciphertext_length,
     uint8_t *plaintext, size_t plaintext_size, size_t *plaintext_length );
 
-psa_status_t test_transparent_aead_encrypt_setup(
+psa_status_t mbedtls_test_transparent_aead_encrypt_setup(
     psa_aead_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg );
 
-psa_status_t test_transparent_aead_decrypt_setup(
+psa_status_t mbedtls_test_transparent_aead_decrypt_setup(
     psa_aead_operation_t *operation,
     const psa_key_attributes_t *attributes,
     const uint8_t *key_buffer, size_t key_buffer_size,
     psa_algorithm_t alg );
 
-psa_status_t test_transparent_aead_set_nonce(
+psa_status_t mbedtls_test_transparent_aead_set_nonce(
     psa_aead_operation_t *operation,
     const uint8_t *nonce,
     size_t nonce_length );
 
-psa_status_t test_transparent_aead_set_lengths(
+psa_status_t mbedtls_test_transparent_aead_set_lengths(
     psa_aead_operation_t *operation,
     size_t ad_length,
     size_t plaintext_length );
 
-psa_status_t test_transparent_aead_update_ad(
+psa_status_t mbedtls_test_transparent_aead_update_ad(
     psa_aead_operation_t *operation,
     const uint8_t *input,
     size_t input_length );
 
-psa_status_t test_transparent_aead_update(
+psa_status_t mbedtls_test_transparent_aead_update(
    psa_aead_operation_t *operation,
    const uint8_t *input,
    size_t input_length,
@@ -102,7 +102,7 @@
    size_t output_size,
    size_t *output_length );
 
-psa_status_t test_transparent_aead_finish(
+psa_status_t mbedtls_test_transparent_aead_finish(
    psa_aead_operation_t *operation,
    uint8_t *ciphertext,
    size_t ciphertext_size,
@@ -111,7 +111,7 @@
    size_t tag_size,
    size_t *tag_length );
 
-psa_status_t test_transparent_aead_verify(
+psa_status_t mbedtls_test_transparent_aead_verify(
    psa_aead_operation_t *operation,
    uint8_t *plaintext,
    size_t plaintext_size,
@@ -119,7 +119,7 @@
    const uint8_t *tag,
    size_t tag_length );
 
-psa_status_t test_transparent_aead_abort(
+psa_status_t mbedtls_test_transparent_aead_abort(
    psa_aead_operation_t *operation );
 
 #endif /* PSA_CRYPTO_DRIVER_TEST */