[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  02669b677e6263b3d337ceb526b8b030477fe26b (commit)
       via  0d6c144e8d0c53e8947e3a76225ea33b3e29abc8 (commit)
      from  d1a770414acd34c774248ce8efbe202fd7a44041 (commit)


- Log -----------------------------------------------------------------
commit 02669b677e6263b3d337ceb526b8b030477fe26b
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Apr 29 12:50:33 2021 +0200

    Windows build file: add forgotten quotes on POD->html command line
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15084)

commit 0d6c144e8d0c53e8947e3a76225ea33b3e29abc8
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat May 1 07:29:27 2021 +0200

    OpenSSL::Test: When prefixing command with $^X on Windows, fix it up!
    
    The perl interpreter name itself might contain spaces and need quoting.
    __fixup_prg() does this for us.
    
    Fixes #14256
    
    Co-authored-by: Tomáš Mráz <tomas at openssl.org>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15084)

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

Summary of changes:
 Configurations/windows-makefile.tmpl | 2 +-
 util/perl/OpenSSL/Test.pm            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 4843106de2..014c1eb8d1 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -686,7 +686,7 @@ EOF
           my $pod = $gen0;
           return <<"EOF";
 $args{src}: "$pod"
-	\$(PERL) \$(SRCDIR)/util/mkpod2html.pl -i "$pod" -o \$\@ -t "$title" -r "\$(SRCDIR)/doc"
+	"\$(PERL)" "\$(SRCDIR)/util/mkpod2html.pl" -i "$pod" -o \$\@ -t "$title" -r "\$(SRCDIR)/doc"
 EOF
       } elsif (platform->isdef($args{src})) {
           #
diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm
index 4dc1bad188..55f26cc630 100644
--- a/util/perl/OpenSSL/Test.pm
+++ b/util/perl/OpenSSL/Test.pm
@@ -1232,7 +1232,7 @@ sub __wrap_cmd {
             # In the Windows case, we run perl explicitly.  We might not
             # need it, but that depends on if the user has associated the
             # '.pl' extension with a perl interpreter, so better be safe.
-            @prefix = ( $^X, $std_wrapper );
+            @prefix = ( __fixup_prg($^X), $std_wrapper );
         } else {
             # Otherwise, we assume Unix semantics, and trust that the #!
             # line activates perl for us.