summaryrefslogtreecommitdiffstats
path: root/test/recipes/90-test_sslapi.t
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2020-06-29 04:20:41 +0200
committerShane Lontis <shane.lontis@oracle.com>2020-06-29 04:20:41 +0200
commit31214258309251aff297da67a60a6b60bf4ef27e (patch)
treeaee548533bd6a7fe25c3c6ebf06b46287dfccb6c /test/recipes/90-test_sslapi.t
parentINSTALL.md and NOTES.VALGRIND: Further cleanup of references and code/symbol ... (diff)
downloadopenssl-31214258309251aff297da67a60a6b60bf4ef27e.tar.xz
openssl-31214258309251aff297da67a60a6b60bf4ef27e.zip
Add --fips-key configuration parameter to fipsinstall application.
Change default FIPS HMAC KEY from all-zero's Use default FIPSKEY if not given on command line. Make all -macopt in fipsinstall optional Make all tests, except fipsinstall, use the default -macopt and -mac_name flags. Define and use FIPSDIR variable on VMS/MMS. Also use SRCDIR/BLDDIR in SRCTOP/BLDTOP. Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/12235)
Diffstat (limited to '')
-rw-r--r--test/recipes/90-test_sslapi.t3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/recipes/90-test_sslapi.t b/test/recipes/90-test_sslapi.t
index e25ca0ba3e..c32221b9f6 100644
--- a/test/recipes/90-test_sslapi.t
+++ b/test/recipes/90-test_sslapi.t
@@ -40,8 +40,7 @@ unless ($no_fips) {
ok(run(app(['openssl', 'fipsinstall',
'-out', bldtop_file('providers', 'fipsmodule.cnf'),
'-module', bldtop_file('providers', platform->dso('fips')),
- '-provider_name', 'fips', '-mac_name', 'HMAC',
- '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
+ '-provider_name', 'fips',
'-section_name', 'fips_sect'])),
"fipsinstall");