[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5c33a6ba65e4ae4ddac34e3372c962dd49fb6e43 (commit)
      from  86cd42fbd3752dec442780867434e828f9a1a749 (commit)


- Log -----------------------------------------------------------------
commit 5c33a6ba65e4ae4ddac34e3372c962dd49fb6e43
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 5 14:14:09 2020 +0100

    util/wrap.pl: do not look at EXE_SHELL
    
    Acting on EXE_SHELL was a bit over the top, especially in light of
    instructions like this (from NOTES.VALGRIND):
    
        EXE_SHELL="`/bin/pwd`/util/wrap.pl valgrind --error-exitcode=1 --leak-check=full -q"
    
    Fixes #11255
    
    Reviewed-by: Nicola Tuveri <nic.tuv at gmail.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/11258)

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

Summary of changes:
 util/wrap.pl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/util/wrap.pl b/util/wrap.pl
index 1c3b4e7c29..4c3d4713f1 100755
--- a/util/wrap.pl
+++ b/util/wrap.pl
@@ -19,11 +19,7 @@ $ENV{OPENSSL_MODULES} = $std_providers
 my $use_system = 0;
 my @cmd;
 
-if (($ENV{EXE_SHELL} // '') ne '') {
-    # We don't know what $ENV{EXE_SHELL} contains, so we must use the one
-    # string form to ensure that exec invokes a shell as needed.
-    @cmd = ( join(' ', $ENV{EXE_SHELL}, @ARGV) );
-} elsif (-x $unix_shlib_wrap) {
+if (-x $unix_shlib_wrap) {
     @cmd = ( $unix_shlib_wrap, @ARGV );
 } else {
     # Hope for the best