From 6883fd248d0e2d1b072cc58b06f450f34d9dc40b Mon Sep 17 00:00:00 2001 From: gabor-mezei-arm Date: Wed, 5 May 2021 14:18:36 +0200 Subject: [PATCH] Rename sign/verify builtin functions called by driver wrapper functions Signed-off-by: gabor-mezei-arm --- library/psa_crypto.c | 8 ++-- library/psa_crypto_core.h | 8 ++-- library/psa_crypto_driver_wrappers.c | 68 ++++++++++++++-------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 519c70aa6b..077b294388 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -2613,7 +2613,7 @@ static psa_status_t psa_verify_internal( mbedtls_svc_key_id_t key, } -psa_status_t psa_sign_message_internal( +psa_status_t psa_sign_message_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, @@ -2661,7 +2661,7 @@ psa_status_t psa_sign_message( mbedtls_svc_key_id_t key, signature, signature_size, signature_length ); } -psa_status_t psa_verify_message_internal( +psa_status_t psa_verify_message_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, @@ -2707,7 +2707,7 @@ psa_status_t psa_verify_message( mbedtls_svc_key_id_t key, signature, signature_length ); } -psa_status_t psa_sign_hash_internal( +psa_status_t psa_sign_hash_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *hash, size_t hash_length, @@ -2778,7 +2778,7 @@ psa_status_t psa_sign_hash( mbedtls_svc_key_id_t key, signature, signature_size, signature_length ); } -psa_status_t psa_verify_hash_internal( +psa_status_t psa_verify_hash_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *hash, size_t hash_length, diff --git a/library/psa_crypto_core.h b/library/psa_crypto_core.h index a742b6dbbc..356d5489e3 100644 --- a/library/psa_crypto_core.h +++ b/library/psa_crypto_core.h @@ -412,7 +412,7 @@ psa_status_t psa_generate_key_internal( const psa_key_attributes_t *attributes, * \retval #PSA_ERROR_CORRUPTION_DETECTED * \retval #PSA_ERROR_INSUFFICIENT_ENTROPY */ -psa_status_t psa_sign_message_internal( +psa_status_t psa_sign_message_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input, size_t input_length, @@ -446,7 +446,7 @@ psa_status_t psa_sign_message_internal( * \retval #PSA_ERROR_INVALID_ARGUMENT * \retval #PSA_ERROR_INSUFFICIENT_MEMORY */ -psa_status_t psa_verify_message_internal( +psa_status_t psa_verify_message_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *input, size_t input_length, @@ -485,7 +485,7 @@ psa_status_t psa_verify_message_internal( * \retval #PSA_ERROR_CORRUPTION_DETECTED * \retval #PSA_ERROR_INSUFFICIENT_ENTROPY */ -psa_status_t psa_sign_hash_internal( +psa_status_t psa_sign_hash_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *hash, size_t hash_length, @@ -520,7 +520,7 @@ psa_status_t psa_sign_hash_internal( * \retval #PSA_ERROR_INVALID_ARGUMENT * \retval #PSA_ERROR_INSUFFICIENT_MEMORY */ -psa_status_t psa_verify_hash_internal( +psa_status_t psa_verify_hash_builtin( const psa_key_attributes_t *attributes, const uint8_t *key_buffer, size_t key_buffer_size, psa_algorithm_t alg, const uint8_t *hash, size_t hash_length, diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c index 5c36daf6f2..0b7bd559f5 100644 --- a/library/psa_crypto_driver_wrappers.c +++ b/library/psa_crypto_driver_wrappers.c @@ -103,15 +103,15 @@ psa_status_t psa_driver_wrapper_sign_message( #endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ /* Fell through, meaning no accelerator supports this operation */ - return( psa_sign_message_internal( attributes, - key_buffer, - key_buffer_size, - alg, - input, - input_length, - signature, - signature_size, - signature_length ) ); + return( psa_sign_message_builtin( attributes, + key_buffer, + key_buffer_size, + alg, + input, + input_length, + signature, + signature_size, + signature_length ) ); /* Add cases for opaque driver here */ #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) @@ -172,14 +172,14 @@ psa_status_t psa_driver_wrapper_verify_message( #endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ - return( psa_verify_message_internal( attributes, - key_buffer, - key_buffer_size, - alg, - input, - input_length, - signature, - signature_length ) ); + return( psa_verify_message_builtin( attributes, + key_buffer, + key_buffer_size, + alg, + input, + input_length, + signature, + signature_length ) ); /* Add cases for opaque driver here */ #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) @@ -255,15 +255,15 @@ psa_status_t psa_driver_wrapper_sign_hash( #endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ /* Fell through, meaning no accelerator supports this operation */ - return( psa_sign_hash_internal( attributes, - key_buffer, - key_buffer_size, - alg, - hash, - hash_length, - signature, - signature_size, - signature_length ) ); + return( psa_sign_hash_builtin( attributes, + key_buffer, + key_buffer_size, + alg, + hash, + hash_length, + signature, + signature_size, + signature_length ) ); /* Add cases for opaque driver here */ #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) @@ -339,14 +339,14 @@ psa_status_t psa_driver_wrapper_verify_hash( #endif /* PSA_CRYPTO_DRIVER_TEST */ #endif /* PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT */ - return( psa_verify_hash_internal( attributes, - key_buffer, - key_buffer_size, - alg, - hash, - hash_length, - signature, - signature_length ) ); + return( psa_verify_hash_builtin( attributes, + key_buffer, + key_buffer_size, + alg, + hash, + hash_length, + signature, + signature_length ) ); /* Add cases for opaque driver here */ #if defined(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT)