From d26d7445b835d333e9351b42154141102a573993 Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Sat, 11 Feb 2023 17:14:54 +0000 Subject: [PATCH] Restore guards on a couple of tests These tests check for failures, but can only fail where SIZE_MAX exceeds some limit (UINT_MAX or UINT32_MAX) and do not fail in this way otherwise - so guards are needed. Signed-off-by: Dave Rodgman --- tests/suites/test_suite_pk.function | 2 ++ tests/suites/test_suite_psa_crypto.function | 2 ++ 2 files changed, 4 insertions(+) diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function index bafd87afc..a99b6c03b 100644 --- a/tests/suites/test_suite_pk.function +++ b/tests/suites/test_suite_pk.function @@ -1139,10 +1139,12 @@ void pk_rsa_alt() TEST_ASSERT(strcmp(mbedtls_pk_get_name(&alt), "RSA-alt") == 0); /* Test signature */ +#if SIZE_MAX > UINT_MAX TEST_ASSERT(mbedtls_pk_sign(&alt, MBEDTLS_MD_NONE, hash, SIZE_MAX, sig, sizeof(sig), &sig_len, mbedtls_test_rnd_std_rand, NULL) == MBEDTLS_ERR_PK_BAD_INPUT_DATA); +#endif /* SIZE_MAX > UINT_MAX */ TEST_ASSERT(mbedtls_pk_sign(&alt, MBEDTLS_MD_NONE, hash, sizeof(hash), sig, sizeof(sig), &sig_len, mbedtls_test_rnd_std_rand, NULL) diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function index 0a7744fd2..55e310638 100644 --- a/tests/suites/test_suite_psa_crypto.function +++ b/tests/suites/test_suite_psa_crypto.function @@ -5844,6 +5844,7 @@ void aead_multipart_state_test(int key_type_arg, data_t *key_data, psa_aead_abort(&operation); /* Test for generating nonce after calling set lengths with SIZE_MAX ad_data length */ +#if SIZE_MAX > UINT32_MAX PSA_ASSERT(psa_aead_encrypt_setup(&operation, key, alg)); if (operation.alg == PSA_ALG_CCM || operation.alg == PSA_ALG_GCM) { @@ -5863,6 +5864,7 @@ void aead_multipart_state_test(int key_type_arg, data_t *key_data, } psa_aead_abort(&operation); +#endif /* Test for calling set lengths with a UINT32_MAX ad_data length, after generating nonce */