diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-04-21 18:17:15 +0400 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-04-21 18:17:15 +0400 |
commit | b8b6a13a569fc6a5ad097502cdc87a121a27f3c6 (patch) | |
tree | 1074ac53e550a8415c66648b761ec4d63c13ac10 /fips/fips_test_suite.c | |
parent | 7608978861ccef4823d7fbc4598879b104597121 (diff) |
Add continuous RNG test to entropy source. Entropy callbacks now need
to specify a "block length".
Diffstat (limited to 'fips/fips_test_suite.c')
-rw-r--r-- | fips/fips_test_suite.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fips/fips_test_suite.c b/fips/fips_test_suite.c index 64452bae3c..8192eb2cc8 100644 --- a/fips/fips_test_suite.c +++ b/fips/fips_test_suite.c @@ -847,7 +847,6 @@ int main(int argc,char **argv) int do_drbg_stick = 0; int no_exit = 0; - fips_algtest_init_nofips(); FIPS_post_set_callback(post_cb); @@ -910,6 +909,8 @@ int main(int argc,char **argv) do_rng_stick = 1; no_exit = 1; printf("RNG test with stuck continuous test...\n"); + } else if (!strcmp(argv[1], "drbgentstick")) { + do_entropy_stick(); } else if (!strcmp(argv[1], "drbgstick")) { do_drbg_stick = 1; no_exit = 1; @@ -919,6 +920,7 @@ int main(int argc,char **argv) exit(1); } if (!no_exit) { + fips_algtest_init_nofips(); if (!FIPS_mode_set(1)) { printf("Power-up self test failed\n"); exit(1); @@ -928,6 +930,8 @@ int main(int argc,char **argv) } } + fips_algtest_init_nofips(); + /* Non-Approved cryptographic operation */ printf("1. Non-Approved cryptographic operation test...\n"); |