summaryrefslogtreecommitdiffstats
path: root/fips/dsa
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-03-25 17:36:46 +0100
committerDr. Stephen Henson <steve@openssl.org>2011-03-25 17:36:46 +0100
commitcd22dfbf0109ae42f650c0d0b1d0e956fe9a1574 (patch)
treea3f3ca931c8dfd6b86d5e5666a6c35575817ca1e /fips/dsa
parentDisable cmac tests by default so the old algorithm test vectors work. (diff)
downloadopenssl-cd22dfbf0109ae42f650c0d0b1d0e956fe9a1574.tar.xz
openssl-cd22dfbf0109ae42f650c0d0b1d0e956fe9a1574.zip
Have all algorithm test programs call fips_algtest_init() at startup:
this will perform all standalone operations such as setting error callbacks, entering FIPS mode etc.
Diffstat (limited to 'fips/dsa')
-rw-r--r--fips/dsa/fips_dsatest.c4
-rw-r--r--fips/dsa/fips_dssvs.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/fips/dsa/fips_dsatest.c b/fips/dsa/fips_dsatest.c
index 678e089a42..c5dd088fe5 100644
--- a/fips/dsa/fips_dsatest.c
+++ b/fips/dsa/fips_dsatest.c
@@ -156,9 +156,7 @@ int main(int argc, char **argv)
BN_GENCB_set(&cb, dsa_cb, stderr);
FIPS_md_ctx_init(&mctx);
- fips_set_error_print();
- if(!FIPS_mode_set(1))
- EXIT(1);
+ fips_algtest_init();
fprintf(stderr,"test generation of DSA parameters\n");
diff --git a/fips/dsa/fips_dssvs.c b/fips/dsa/fips_dssvs.c
index ff97808ee2..c5a5805071 100644
--- a/fips/dsa/fips_dssvs.c
+++ b/fips/dsa/fips_dssvs.c
@@ -626,9 +626,7 @@ int main(int argc,char **argv)
fprintf(stderr,"%s [prime|pqg|pqgver|keypair|keyver|siggen|sigver]\n",argv[0]);
exit(1);
}
- fips_set_error_print();
- if(!FIPS_mode_set(1))
- exit(1);
+ fips_algtest_init();
if(!strcmp(argv[1],"prime"))
primes(in, out);
else if(!strcmp(argv[1],"pqg"))