QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-04 05:29:39 +00:00
Code Issues Projects Releases Wiki Activity

test/drbgtest.c: Fix error check test

Browse Source 
The condition in test_error_checks() was inverted, so it succeeded
as long as error_check() failed. Incidently, error_check() contained
several bugs that assured it always failed, thus giving overall drbg
test success.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/11195)
This commit is contained in:
Vitezslav Cizek 2020-02-27 15:37:43 +01:00 committed by Dr. Matthias St. Pierre
parent dcb71e1c21
commit 11a6d6fd70
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
test/drbgtest.c
View File

@ -427,7 +427,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
/* Test detection of too large personalisation string */ /* Test detection of too large personalisation string */
if (!init(drbg, td, &t) if (!init(drbg, td, &t)
|| RAND_DRBG_instantiate(drbg, td->pers, max_perslen(drbg) + 1) > 0) || !TEST_false(RAND_DRBG_instantiate(drbg, td->pers, max_perslen(drbg) + 1)))
goto err; goto err;
/* /*
@ -436,7 +436,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
/* Test entropy source failure detection: i.e. returns no data */ /* Test entropy source failure detection: i.e. returns no data */
t.entropylen = 0; t.entropylen = 0;
if (TEST_int_le(RAND_DRBG_instantiate(drbg, td->pers, td->perslen), 0)) if (!TEST_false(RAND_DRBG_instantiate(drbg, td->pers, td->perslen)))
goto err; goto err;
/* Try to generate output from uninstantiated DRBG */ /* Try to generate output from uninstantiated DRBG */
@ -446,16 +446,18 @@ static int error_check(DRBG_SELFTEST_DATA *td)
goto err; goto err;
/* Test insufficient entropy */ /* Test insufficient entropy */
if (!init(drbg, td, &t))
goto err;
t.entropylen = min_entropylen(drbg) - 1; t.entropylen = min_entropylen(drbg) - 1;
if (!init(drbg, td, &t) if (!TEST_false(RAND_DRBG_instantiate(drbg, td->pers, td->perslen))
|| RAND_DRBG_instantiate(drbg, td->pers, td->perslen) > 0
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
/* Test too much entropy */ /* Test too much entropy */
if (!init(drbg, td, &t))
goto err;
t.entropylen = max_entropylen(drbg) + 1; t.entropylen = max_entropylen(drbg) + 1;
if (!init(drbg, td, &t) if (!TEST_false(RAND_DRBG_instantiate(drbg, td->pers, td->perslen))
|| RAND_DRBG_instantiate(drbg, td->pers, td->perslen) > 0
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
@ -465,18 +467,20 @@ static int error_check(DRBG_SELFTEST_DATA *td)
/* Test too small nonce */ /* Test too small nonce */
if (min_noncelen(drbg) != 0) { if (min_noncelen(drbg) != 0) {
if (!init(drbg, td, &t))
goto err;
t.noncelen = min_noncelen(drbg) - 1; t.noncelen = min_noncelen(drbg) - 1;
if (!init(drbg, td, &t) if (!TEST_false(RAND_DRBG_instantiate(drbg, td->pers, td->perslen))
|| RAND_DRBG_instantiate(drbg, td->pers, td->perslen) > 0
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
} }
/* Test too large nonce */ /* Test too large nonce */
if (max_noncelen(drbg) != 0) { if (max_noncelen(drbg) != 0) {
if (!init(drbg, td, &t))
goto err;
t.noncelen = max_noncelen(drbg) + 1; t.noncelen = max_noncelen(drbg) + 1;
if (!init(drbg, td, &t) if (!TEST_false(RAND_DRBG_instantiate(drbg, td->pers, td->perslen))
|| RAND_DRBG_instantiate(drbg, td->pers, td->perslen) > 0
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
} }
@ -502,7 +506,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
* failure. * failure.
*/ */
t.entropylen = 0; t.entropylen = 0;
if (TEST_false(RAND_DRBG_generate(drbg, buff, td->exlen, 1, if (!TEST_false(RAND_DRBG_generate(drbg, buff, td->exlen, 1,
td->adin, td->adinlen)) td->adin, td->adinlen))
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
@ -511,7 +515,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
if (!instantiate(drbg, td, &t)) if (!instantiate(drbg, td, &t))
goto err; goto err;
reseed_counter_tmp = reseed_counter(drbg); reseed_counter_tmp = reseed_counter(drbg);
set_reseed_counter(drbg, reseed_requests(drbg)); set_reseed_counter(drbg, reseed_requests(drbg) + 1);
/* Generate output and check entropy has been requested for reseed */ /* Generate output and check entropy has been requested for reseed */
t.entropycnt = 0; t.entropycnt = 0;
@ -536,7 +540,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
if (!instantiate(drbg, td, &t)) if (!instantiate(drbg, td, &t))
goto err; goto err;
reseed_counter_tmp = reseed_counter(drbg); reseed_counter_tmp = reseed_counter(drbg);
set_reseed_counter(drbg, reseed_requests(drbg)); set_reseed_counter(drbg, reseed_requests(drbg) + 1);
/* Generate output and check entropy has been requested for reseed */ /* Generate output and check entropy has been requested for reseed */
t.entropycnt = 0; t.entropycnt = 0;
@ -553,12 +557,12 @@ static int error_check(DRBG_SELFTEST_DATA *td)
/* Test explicit reseed with too large additional input */ /* Test explicit reseed with too large additional input */
if (!instantiate(drbg, td, &t) if (!instantiate(drbg, td, &t)
|| RAND_DRBG_reseed(drbg, td->adin, max_adinlen(drbg) + 1, 0) > 0) || !TEST_false(RAND_DRBG_reseed(drbg, td->adin, max_adinlen(drbg) + 1, 0)))
goto err; goto err;
/* Test explicit reseed with entropy source failure */ /* Test explicit reseed with entropy source failure */
t.entropylen = 0; t.entropylen = 0;
if (!TEST_int_le(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0), 0) if (!TEST_false(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0))
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
@ -566,7 +570,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
if (!instantiate(drbg, td, &t)) if (!instantiate(drbg, td, &t))
goto err; goto err;
t.entropylen = max_entropylen(drbg) + 1; t.entropylen = max_entropylen(drbg) + 1;
if (!TEST_int_le(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0), 0) if (!TEST_false(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0))
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
@ -574,7 +578,7 @@ static int error_check(DRBG_SELFTEST_DATA *td)
if (!instantiate(drbg, td, &t)) if (!instantiate(drbg, td, &t))
goto err; goto err;
t.entropylen = min_entropylen(drbg) - 1; t.entropylen = min_entropylen(drbg) - 1;
if (!TEST_int_le(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0), 0) if (!TEST_false(RAND_DRBG_reseed(drbg, td->adin, td->adinlen, 0))
|| !uninstantiate(drbg)) || !uninstantiate(drbg))
goto err; goto err;
@ -611,7 +615,7 @@ static int test_error_checks(int i)
if (crngt_skip()) if (crngt_skip())
return TEST_skip("CRNGT cannot be disabled"); return TEST_skip("CRNGT cannot be disabled");
if (error_check(td)) if (!error_check(td))
goto err; goto err;
rv = 1; rv = 1;