From 7d4db631cf7396e71473e690b9bd24d9aee4ff4b Mon Sep 17 00:00:00 2001 From: Kusumit Ghoderao Date: Thu, 7 Dec 2023 16:17:46 +0530 Subject: [PATCH] add depends on for capacity tests and fix code style Signed-off-by: Kusumit Ghoderao --- library/psa_crypto.c | 2 +- tests/suites/test_suite_psa_crypto.data | 20 ++++++++------------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 672a97d1a2..8e6a758343 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -6076,7 +6076,7 @@ static psa_status_t psa_key_derivation_set_maximum_capacity( #if defined(PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128) if (kdf_alg == PSA_ALG_PBKDF2_AES_CMAC_PRF_128) { #if (SIZE_MAX > UINT32_MAX) - operation->capacity = UINT32_MAX * (size_t)PSA_MAC_LENGTH( + operation->capacity = UINT32_MAX * (size_t) PSA_MAC_LENGTH( PSA_KEY_TYPE_AES, 128U, PSA_ALG_CMAC); diff --git a/tests/suites/test_suite_psa_crypto.data b/tests/suites/test_suite_psa_crypto.data index 71f5b8e426..7f9fa3c7fd 100644 --- a/tests/suites/test_suite_psa_crypto.data +++ b/tests/suites/test_suite_psa_crypto.data @@ -6328,28 +6328,24 @@ PSA key derivation: TLS 1.2 ECJPAKE-to-PMS, request too much capacity depends_on:PSA_WANT_ALG_TLS12_ECJPAKE_TO_PMS derive_set_capacity:PSA_ALG_TLS12_ECJPAKE_TO_PMS:PSA_HASH_LENGTH(PSA_ALG_SHA_256) + 1:PSA_ERROR_INVALID_ARGUMENT -# This test case will work correctly on 64-bit machines -PSA key derivation: PBKDF2-HMAC-SHA256, request too much capacity -depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256 -derive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):4294967295UL * PSA_HASH_LENGTH(PSA_ALG_SHA_256) + 1:PSA_ERROR_INVALID_ARGUMENT +#PSA key derivation: PBKDF2-HMAC-SHA256, request too much capacity +#depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256:SIZE_MAX>=0xffffffffffffffff +#derive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):4294967295UL * PSA_HASH_LENGTH(PSA_ALG_SHA_256) + 1:PSA_ERROR_INVALID_ARGUMENT -# This test case will work correctly on 64-bit machines -PSA key derivation: PBKDF2-AES-CMAC-PRF-128, request too much capacity -depends_on:PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES -derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:4294967295UL * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE + 1:PSA_ERROR_INVALID_ARGUMENT +#PSA key derivation: PBKDF2-AES-CMAC-PRF-128, request too much capacity +#depends_on:PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES:SIZE_MAX>=0xffffffffffffffff +#derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:4294967295UL * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE + 1:PSA_ERROR_INVALID_ARGUMENT PSA key derivation: TLS 1.2 PRF, request maximum capacity depends_on:PSA_WANT_ALG_TLS12_PRF:PSA_WANT_ALG_SHA_256 derive_set_capacity:PSA_ALG_TLS12_PRF(PSA_ALG_SHA_256):SIZE_MAX:PSA_SUCCESS -# This test case will work correctly on 64-bit machines PSA key derivation: PBKDF2-HMAC-SHA256, request maximum capacity -depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256 +depends_on:PSA_WANT_ALG_PBKDF2_HMAC:PSA_WANT_ALG_SHA_256:SIZE_MAX>=0xffffffffffffffff derive_set_capacity:PSA_ALG_PBKDF2_HMAC(PSA_ALG_SHA_256):4294967295UL * PSA_HASH_LENGTH(PSA_ALG_SHA_256):PSA_SUCCESS -# This test case will work correctly on 64-bit machines PSA key derivation: PBKDF2-AES-CMAC-PRF-128, request maximum capacity -depends_on:PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES +depends_on:PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128:PSA_WANT_ALG_CMAC:PSA_WANT_KEY_TYPE_AES:SIZE_MAX>=0xffffffffffffffff derive_set_capacity:PSA_ALG_PBKDF2_AES_CMAC_PRF_128:4294967295UL * PSA_BLOCK_CIPHER_BLOCK_MAX_SIZE:PSA_SUCCESS PSA key derivation: over capacity 42: output 42+1