yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename verify_output_xxx() to verify_xxx()

Browse source 
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2021-05-03 10:12:06 +02:00
parent 3d72267db5
commit d307f63597
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/psa/crypto.h
View file

@ -3696,7 +3696,7 @@ psa_status_t psa_key_derivation_output_key(
* It is implementation-dependent whether a failure to initialize * It is implementation-dependent whether a failure to initialize
* results in this error code. * 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, psa_key_derivation_operation_t *operation,
const uint8_t *expected_output, const uint8_t *expected_output,
size_t output_length); 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. * The operation's capacity decreases by the number of bytes read.
* *
* This is functionally equivalent to exporting the key and calling * 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. * works even if the key cannot be exported.
* *
* If this function returns an error status other than * 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 * It is implementation-dependent whether a failure to initialize
* results in this error code. * 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_derivation_operation_t *operation,
psa_key_id_t expected); psa_key_id_t expected);

8
include/psa/crypto_values.h
View file

@ -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_key() at the step
* #PSA_KEY_DERIVATION_INPUT_SECRET of #PSA_KEY_DERIVATION_INPUT_PASSWORD * #PSA_KEY_DERIVATION_INPUT_SECRET of #PSA_KEY_DERIVATION_INPUT_PASSWORD
* depending on the algorithm, and allows the use of * depending on the algorithm, and allows the use of
* psa_key_derivation_verify_output_bytes() or * psa_key_derivation_verify_bytes() or
* psa_key_derivation_verify_output_key() at the end of the operation. * psa_key_derivation_verify_key() at the end of the operation.
*/ */
#define PSA_KEY_USAGE_PASSWORD_HASH_AND_VERIFY ((psa_key_usage_t)0x00008000) #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. * hash will be compared.
* *
* This flag allows key to be used as the \c key argument of * 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) #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 * key_derivation_input_bytes()). In this case, the derivation operation
* may not be used to derive keys: the operation will only allow * may not be used to derive keys: the operation will only allow
* psa_key_derivation_output_bytes() or * 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(). * psa_key_derivation_output_key().
*/ */
#define PSA_KEY_DERIVATION_INPUT_SECRET ((psa_key_derivation_step_t)0x0101) #define PSA_KEY_DERIVATION_INPUT_SECRET ((psa_key_derivation_step_t)0x0101)