From: Matt Caswell Date: Tue, 2 Oct 2018 12:44:17 +0000 (+0100) Subject: Fix the drbgtest with randomized ordering X-Git-Tag: openssl-3.0.0-alpha1~3078 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b39bc9bcf2c8a0eb1047529feb91ed00c8c6ff7;p=oweals%2Fopenssl.git Fix the drbgtest with randomized ordering In drbgtest, test_set_defaults changes the default DRBGs. This works fine when tests are run in the normal order. However if OPENSSL_TEST_RAND_ORDER is defined then it may fail (dependent on the ordering). This environment variable is defined for one of the Travis tests, so this issue was causing intermittent travis test failures. [extended tests] Reviewed-by: Matthias St. Pierre Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/7338) --- diff --git a/test/drbgtest.c b/test/drbgtest.c index 4e0c76fc49..f2054a8ac5 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c @@ -1049,7 +1049,17 @@ static int test_set_defaults(void) && TEST_true(RAND_DRBG_uninstantiate(master)) && TEST_int_eq(master->type, NID_aes_256_ctr) && TEST_int_eq(master->flags, - RAND_DRBG_FLAG_MASTER|RAND_DRBG_FLAG_CTR_NO_DF); + RAND_DRBG_FLAG_MASTER|RAND_DRBG_FLAG_CTR_NO_DF) + + /* Reset back to the standard defaults */ + && TEST_true(RAND_DRBG_set_defaults(RAND_DRBG_TYPE, + RAND_DRBG_FLAGS + | RAND_DRBG_FLAG_MASTER + | RAND_DRBG_FLAG_PUBLIC + | RAND_DRBG_FLAG_PRIVATE)) + && TEST_true(RAND_DRBG_uninstantiate(master)) + && TEST_true(RAND_DRBG_uninstantiate(public)) + && TEST_true(RAND_DRBG_uninstantiate(private)); } int setup_tests(void)