cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from ARMmbed/dev/dgreen-arm/conversion-warnings

Browse Source 
Fix key parameter in psa_key_derivation to use correct type
This commit is contained in:
Jaeden Amero 2018-07-26 15:04:31 +01:00
commit 4fddbe36fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/psa/crypto.h
View File

@ -2724,7 +2724,7 @@ psa_status_t psa_generator_abort(psa_crypto_generator_t *generator);
* \retval #PSA_ERROR_TAMPERING_DETECTED
*/
psa_status_t psa_key_derivation(psa_crypto_generator_t *generator,
psa_key_type_t key,
psa_key_slot_t key,
psa_algorithm_t alg,
const uint8_t *salt,
size_t salt_length,

2
library/psa_crypto.c
View File

@ -3257,7 +3257,7 @@ static psa_status_t psa_generator_hkdf_setup( psa_hkdf_generator_t *hkdf,
}
psa_status_t psa_key_derivation( psa_crypto_generator_t *generator,
psa_key_type_t key,
psa_key_slot_t key,
psa_algorithm_t alg,
const uint8_t *salt,
size_t salt_length,