commit 40f0ec246ea68195e74ffe20c3d8f4c700f732d2
author Paul Elliott <paul.elliott@arm.com> Mon Dec 11 17:40:54 2023 +0000
committer Paul Elliott <paul.elliott@arm.com> Mon Dec 18 14:49:34 2023 +0000
tree c74b1dc22f3f67d3ac70baa08a16f851d92c66bb
parent 20a95bc09a540918da70d4e96d8a615cea934692

Remove requirement for SHA512 from ctr_drbg test

Set the entropy len prior to doing the test to ensure the outcome is the
same regardless of whether SHA512 or SHA256 is used.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

tests/suites/test_suite_ctr_drbg.data

diff --git a/tests/suites/test_suite_ctr_drbg.data b/tests/suites/test_suite_ctr_drbg.data
index b519da8..f314ac6 100644
--- a/tests/suites/test_suite_ctr_drbg.data
+++ b/tests/suites/test_suite_ctr_drbg.data
@@ -1097,11 +1097,11 @@
 ctr_drbg_special_behaviours:
 
 CTR_DRBG Threads: no reseed
-depends_on:!MBEDTLS_CTR_DRBG_USE_128_BIT_KEY:!MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH:!MBEDTLS_ENTROPY_FORCE_SHA256:MBEDTLS_SHA512_C
+depends_on:!MBEDTLS_CTR_DRBG_USE_128_BIT_KEY:!MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
 ctr_drbg_threads:"1fafa98bc83d95e10f2d5ed339a553e1":0:5
 
 CTR_DRBG Threads: reseed
-depends_on:!MBEDTLS_CTR_DRBG_USE_128_BIT_KEY:!MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH:!MBEDTLS_ENTROPY_FORCE_SHA256:MBEDTLS_SHA512_C
+depends_on:!MBEDTLS_CTR_DRBG_USE_128_BIT_KEY:!MBEDTLS_AES_ONLY_128_BIT_KEY_LENGTH
 ctr_drbg_threads:"B10A961F2EA39927B4C48AEDDD299026":1:5
 
 CTR_DRBG self test

tests/suites/test_suite_ctr_drbg.function

diff --git a/tests/suites/test_suite_ctr_drbg.function b/tests/suites/test_suite_ctr_drbg.function
index a5a85a0..504f28a 100644
--- a/tests/suites/test_suite_ctr_drbg.function
+++ b/tests/suites/test_suite_ctr_drbg.function
@@ -353,6 +353,9 @@
 
     const size_t n_random_calls = thread_count * thread_random_reps + 1;
 
+    /* Based on the size of MBEDTLS_CTR_DRBG_ENTROPY_LEN for SHA512. */
+    const size_t entropy_len = 48;
+
     TEST_CALLOC(threads, sizeof(pthread_t) * thread_count);
     memset(out, 0, sizeof(out));
 
@@ -361,14 +364,18 @@
 
     test_offset_idx = 0;
 
+    /* Need to do this, otherwise if we are forced into using SHA256 for
+     * whaever reason, output will differ. */
+    mbedtls_ctr_drbg_set_entropy_len(&ctx, entropy_len);
+
     if (reseed == 0) {
         mbedtls_ctr_drbg_set_prediction_resistance(&ctx, MBEDTLS_CTR_DRBG_PR_OFF);
         mbedtls_ctr_drbg_set_reseed_interval(&ctx, n_random_calls + 1);
 
-        TEST_CALLOC(entropy, MBEDTLS_CTR_DRBG_ENTROPY_LEN + MBEDTLS_CTR_DRBG_ENTROPY_NONCE_LEN);
-        test_max_idx = MBEDTLS_CTR_DRBG_ENTROPY_LEN + MBEDTLS_CTR_DRBG_ENTROPY_NONCE_LEN;
+        TEST_CALLOC(entropy, entropy_len + MBEDTLS_CTR_DRBG_ENTROPY_NONCE_LEN);
+        test_max_idx = entropy_len + MBEDTLS_CTR_DRBG_ENTROPY_NONCE_LEN;
     } else {
-        const size_t entropy_size = ((n_random_calls + 1) * MBEDTLS_CTR_DRBG_ENTROPY_LEN)
+        const size_t entropy_size = ((n_random_calls + 1) * entropy_len)
                                     + MBEDTLS_CTR_DRBG_ENTROPY_NONCE_LEN;
 
         mbedtls_ctr_drbg_set_prediction_resistance(&ctx, MBEDTLS_CTR_DRBG_PR_ON);