[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  4e20d04ee0e7be2061c1e5d2c2c8d714b7923c89 (commit)
      from  9d300aa21b02f13d3429931417f4320350b9f891 (commit)


- Log -----------------------------------------------------------------
commit 4e20d04ee0e7be2061c1e5d2c2c8d714b7923c89
Author: Pauli <pauli at openssl.org>
Date:   Thu Jul 1 12:48:30 2021 +1000

    util: add -fips option to wrap.pl to make using the FIPS provider easier
    
    Without this option, I find I need to figure out which environment variables
    point where which wastes effort.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15966)

-----------------------------------------------------------------------

Summary of changes:
 util/wrap.pl.in | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/util/wrap.pl.in b/util/wrap.pl.in
index 2ac068ce96..b13c34d851 100644
--- a/util/wrap.pl.in
+++ b/util/wrap.pl.in
@@ -24,6 +24,20 @@ my $std_providers = catdir($there, 'providers');
 my $std_openssl_conf = catdir($there, 'apps/openssl.cnf');
 my $unix_shlib_wrap = catfile($there, 'util/shlib_wrap.sh');
 
+if ($ARGV[0] eq '-fips') {
+    $std_openssl_conf = {-
+         use Cwd qw(abs_path);
+
+         "'" . abs_path(catfile($config{sourcedir}, 'test/fips-and-base.cnf')) . "'";
+         -};
+    shift;
+
+    my $std_openssl_conf_include = catdir($there, 'providers');
+    $ENV{OPENSSL_CONF_INCLUDE} = $std_openssl_conf_include
+        if ($ENV{OPENSSL_CONF_INCLUDE} // '') eq ''
+            && -d $std_openssl_conf_include;
+}
+
 $ENV{OPENSSL_ENGINES} = $std_engines
     if ($ENV{OPENSSL_ENGINES} // '') eq '' && -d $std_engines;
 $ENV{OPENSSL_MODULES} = $std_providers