From f3c5c86db79c4f7b095c7c5e7e8b1e0fd8b53085 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 30791d493..845ea69ef 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -2995,7 +2995,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, @@ -3043,7 +3043,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, @@ -3089,7 +3089,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, @@ -3160,7 +3160,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 04af845eb..694f682f3 100644 --- a/library/psa_crypto_core.h +++ b/library/psa_crypto_core.h @@ -392,7 +392,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, @@ -426,7 +426,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, @@ -465,7 +465,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, @@ -500,7 +500,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 86f5de3c6..56c2b9f65 100644 --- a/library/psa_crypto_driver_wrappers.c +++ b/library/psa_crypto_driver_wrappers.c @@ -102,15 +102,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) @@ -171,14 +171,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) @@ -254,15 +254,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) @@ -338,14 +338,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)