From d307f6359725ce686b396690c8f7cb6d610aedeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Mon, 3 May 2021 10:12:06 +0200 Subject: [PATCH] Rename verify_output_xxx() to verify_xxx() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Manuel Pégourié-Gonnard --- include/psa/crypto.h | 6 +++--- include/psa/crypto_values.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/psa/crypto.h b/include/psa/crypto.h index f9e051e021..fdab2b14ec 100644 --- a/include/psa/crypto.h +++ b/include/psa/crypto.h @@ -3696,7 +3696,7 @@ psa_status_t psa_key_derivation_output_key( * It is implementation-dependent whether a failure to initialize * results in this error code. */ -psa_status_t psa_key_derivation_verify_output_bytes( +psa_status_t psa_key_derivation_verify_bytes( psa_key_derivation_operation_t *operation, const uint8_t *expected_output, size_t output_length); @@ -3713,7 +3713,7 @@ psa_status_t psa_key_derivation_verify_output_bytes( * The operation's capacity decreases by the number of bytes read. * * This is functionally equivalent to exporting the key and calling - * psa_key_derivation_verify_output_bytes() on the result, except that it + * psa_key_derivation_verify_bytes() on the result, except that it * works even if the key cannot be exported. * * If this function returns an error status other than @@ -3757,7 +3757,7 @@ psa_status_t psa_key_derivation_verify_output_bytes( * It is implementation-dependent whether a failure to initialize * results in this error code. */ -psa_status_t psa_key_derivation_verify_output_key( +psa_status_t psa_key_derivation_verify_key( psa_key_derivation_operation_t *operation, psa_key_id_t expected); diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h index 4bc4c1a5e3..7c3ca2c6ad 100644 --- a/include/psa/crypto_values.h +++ b/include/psa/crypto_values.h @@ -2206,8 +2206,8 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key ) * psa_key_derivation_input_key() at the step * #PSA_KEY_DERIVATION_INPUT_SECRET of #PSA_KEY_DERIVATION_INPUT_PASSWORD * depending on the algorithm, and allows the use of - * psa_key_derivation_verify_output_bytes() or - * psa_key_derivation_verify_output_key() at the end of the operation. + * psa_key_derivation_verify_bytes() or + * psa_key_derivation_verify_key() at the end of the operation. */ #define PSA_KEY_USAGE_PASSWORD_HASH_AND_VERIFY ((psa_key_usage_t)0x00008000) @@ -2215,7 +2215,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key ) * hash will be compared. * * This flag allows key to be used as the \c key argument of - * psa_key_derivation_verify_output_key(). + * psa_key_derivation_verify_key(). */ #define PSA_KEY_USAGE_PASSWORD_HASH_VERIFIER ((psa_key_usage_t)0x00010000) @@ -2236,7 +2236,7 @@ static inline int mbedtls_svc_key_id_is_null( mbedtls_svc_key_id_t key ) * key_derivation_input_bytes()). In this case, the derivation operation * may not be used to derive keys: the operation will only allow * psa_key_derivation_output_bytes() or - * psa_key_derivation_verify_output_xxx() but not + * psa_key_derivation_verify_xxx() but not * psa_key_derivation_output_key(). */ #define PSA_KEY_DERIVATION_INPUT_SECRET ((psa_key_derivation_step_t)0x0101)