From: Rich Salz <rsalz@akamai.com>
Date: Tue, 23 Jun 2020 00:49:51 +0000 (-0400)
Subject: Use defaults FIPSKEY if not given on command line
X-Git-Tag: openssl-3.0.0-alpha5~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3b243d15bdbd4191a8c615f3654d00e1194d17c;p=thirdparty%2Fopenssl.git

Use defaults FIPSKEY if not given on command line

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/12311)
---

diff --git a/apps/fipsinstall.c b/apps/fipsinstall.c
index e76e615bc6d..fde82ef8a7f 100644
--- a/apps/fipsinstall.c
+++ b/apps/fipsinstall.c
@@ -357,6 +357,7 @@ opthelp:
     /* Use the default FIPS HMAC digest and key if not specified. */
     if (!gotdigest && !sk_OPENSSL_STRING_push(opts, "digest:SHA256"))
         goto end;
+    /* Use the default FIPS HMAC key if not specified. */
     if (!gotkey && !sk_OPENSSL_STRING_push(opts, "hexkey:" FIPS_KEY_STRING))
         goto end;