diff options
| author | Rich Salz <rsalz@akamai.com> | 2020-06-29 12:20:41 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-06-29 12:20:41 +1000 |
| commit | 31214258309251aff297da67a60a6b60bf4ef27e (patch) | |
| tree | aee548533bd6a7fe25c3c6ebf06b46287dfccb6c /providers | |
| parent | 9afbb681ecd433623fb39db2a110ec3351d271c7 (diff) | |
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 'providers')
| -rw-r--r-- | providers/fips/self_test.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c index d58226f81e..a4a3cb5c89 100644 --- a/providers/fips/self_test.c +++ b/providers/fips/self_test.c @@ -11,6 +11,7 @@ #include <openssl/evp.h> #include <openssl/params.h> #include <openssl/crypto.h> +#include <openssl/fipskey.h> #include "e_os.h" /* * We're cheating here. Normally we don't allow RUN_ONCE usage inside the FIPS @@ -35,7 +36,7 @@ static int FIPS_state = FIPS_STATE_INIT; static CRYPTO_RWLOCK *self_test_lock = NULL; -static unsigned char fixed_key[32] = { 0 }; +static unsigned char fixed_key[32] = { FIPS_KEY_ELEMENTS }; static CRYPTO_ONCE fips_self_test_init = CRYPTO_ONCE_STATIC_INIT; DEFINE_RUN_ONCE_STATIC(do_fips_self_test_init) |