From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 5 Apr 2022 14:43:45 +0000 (+0200)
Subject: test_fipsinstall: Fallback to config(FIPSKEY) for the FIPSKEY
X-Git-Tag: openssl-3.2.0-alpha1~2780
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffc22e038e92d5dd956362fa48babd03cff202d1;p=thirdparty%2Fopenssl.git

test_fipsinstall: Fallback to config(FIPSKEY) for the FIPSKEY

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18048)
---

diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t
index d99974e4674..79b45af7957 100644
--- a/test/recipes/03-test_fipsinstall.t
+++ b/test/recipes/03-test_fipsinstall.t
@@ -27,7 +27,7 @@ plan skip_all => "Test only supported in a fips build" if disabled("fips");
 plan tests => 29;
 
 my $infile = bldtop_file('providers', platform->dso('fips'));
-my $fipskey = $ENV{FIPSKEY} // '00';
+my $fipskey = $ENV{FIPSKEY} // config('FIPSKEY') // '00';
 
 # Read in a text $infile and replace the regular expression in $srch with the
 # value in $repl and output to a new file $outfile.