eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix unused variable warning and other fixes

Browse source 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
This commit is contained in:
Kusumit Ghoderao 2023-12-06 16:20:04 +05:30
parent 911eafda31
commit d3f70d321a
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog.d/fix_kdf_correct_initial_capacity.txt → ChangeLog.d/fix_kdf_incorrect_initial_capacity.txt
View file

@ -1,3 +1,3 @@
Bugfix Bugfix
* Correct initial capacities for key derivation algorithms:TLS12_PRF, * Correct initial capacities for key derivation algorithms:TLS12_PRF,
TLS12_PSK_TO_MS, PBKDF2-HMAC, PBKDF2-CMAC TLS12_PSK_TO_MS, PBKDF2-HMAC, PBKDF2-CMAC

11
library/psa_crypto.c
View file

@ -6076,9 +6076,10 @@ static psa_status_t psa_key_derivation_set_maximum_capacity(
#if defined(PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128) #if defined(PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128)
if (kdf_alg == PSA_ALG_PBKDF2_AES_CMAC_PRF_128) { if (kdf_alg == PSA_ALG_PBKDF2_AES_CMAC_PRF_128) {
#if (SIZE_MAX > UINT32_MAX) #if (SIZE_MAX > UINT32_MAX)
operation->capacity = UINT32_MAX * PSA_MAC_LENGTH(PSA_KEY_TYPE_AES, operation->capacity = UINT32_MAX * (size_t)PSA_MAC_LENGTH(
128U, PSA_KEY_TYPE_AES,
PSA_ALG_CMAC); 128U,
PSA_ALG_CMAC);
#else #else
operation->capacity = SIZE_MAX; operation->capacity = SIZE_MAX;
#endif #endif
@ -6090,6 +6091,9 @@ static psa_status_t psa_key_derivation_set_maximum_capacity(
* invalid or meaningless but it does not affect this function */ * invalid or meaningless but it does not affect this function */
psa_algorithm_t hash_alg = PSA_ALG_GET_HASH(kdf_alg); psa_algorithm_t hash_alg = PSA_ALG_GET_HASH(kdf_alg);
size_t hash_size = PSA_HASH_LENGTH(hash_alg); size_t hash_size = PSA_HASH_LENGTH(hash_alg);
if (hash_size == 0) {
return PSA_ERROR_NOT_SUPPORTED;
}
/* Make sure that hash_alg is a supported hash algorithm. Otherwise /* Make sure that hash_alg is a supported hash algorithm. Otherwise
* we might fail later, which is somewhat unfriendly and potentially * we might fail later, which is somewhat unfriendly and potentially
@ -6138,6 +6142,7 @@ static psa_status_t psa_key_derivation_set_maximum_capacity(
} else } else
#endif /* PSA_WANT_ALG_PBKDF2_HMAC */ #endif /* PSA_WANT_ALG_PBKDF2_HMAC */
{ {
(void) hash_size;
status = PSA_ERROR_NOT_SUPPORTED; status = PSA_ERROR_NOT_SUPPORTED;
} }
return status; return status;