diff options
| author | Matt Caswell <matt@openssl.org> | 2018-10-02 13:44:17 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-10-03 16:41:33 +0100 |
| commit | 1b39bc9bcf2c8a0eb1047529feb91ed00c8c6ff7 (patch) | |
| tree | e4ef6b79b5ba02ccc7d6110ab650a0aba10c5871 /test | |
| parent | a21f4cec14664d8fc5f52dc42ab7119b696521a5 (diff) | |
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 <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/7338)
Diffstat (limited to 'test')
| -rw-r--r-- | test/drbgtest.c | 12 |
1 files changed, 11 insertions, 1 deletions
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) |