[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  16328e9f6cc8bcd5ff5fef09b78374134de1f1e1 (commit)
       via  b2bed3c6e53fd8e439bae6a66860d31ce994bb70 (commit)
      from  bb2d726d75c062513b796d6c76c2a1ea9ff27e24 (commit)


- Log -----------------------------------------------------------------
commit 16328e9f6cc8bcd5ff5fef09b78374134de1f1e1
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jul 1 12:17:40 2020 +0200

    NOTE.WIN: suggest the audetecting configuration variant as well
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12339)

commit b2bed3c6e53fd8e439bae6a66860d31ce994bb70
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jul 1 12:04:24 2020 +0200

    util/perl/OpenSSL/config.pm: move misplaced Windows and VMS entries
    
    OpenSSL::config::guess_system() is supposed to return system triplets.
    However, for Windows and VMS, it returned the final OpenSSL config
    target instead.  We move the entries for them to the table that
    OpenSSL::config::map_guess() uses, so it can properly convert the
    input triplet to an OpenSSL config target.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/12339)

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

Summary of changes:
 NOTES.WIN                   |  3 ++-
 util/perl/OpenSSL/config.pm | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/NOTES.WIN b/NOTES.WIN
index a5792647af..5151107707 100644
--- a/NOTES.WIN
+++ b/NOTES.WIN
@@ -59,7 +59,8 @@
 
  5. From the root of the OpenSSL source directory enter
     perl Configure VC-WIN32    if you want 32-bit OpenSSL or
-    perl Configure VC-WIN64A   if you want 64-bit OpenSSL
+    perl Configure VC-WIN64A   if you want 64-bit OpenSSL or
+    perl Configure             to let Configure figure out the platform
 
  6. nmake
 
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index 46dad98d08..7a37399bca 100755
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -160,18 +160,6 @@ my $guess_patterns = [
     [ 'CYGWIN.*',                   '${MACHINE}-pc-cygwin' ],
     [ 'vxworks.*',                  '${MACHINE}-whatever-vxworks' ],
 
-    # Windows values found by looking at Perl 5's win32/win32.c
-    [ 'Windows NT:.*:amd64',        'VC-WIN64A' ],
-    [ 'Windows NT:.*:ia64',         'VC-WIN64I' ],
-    [ 'Windows NT:.*:x86',          'VC-WIN32' ],
-
-    # VMS values found by observation on existing machinery.  Unfortunately,
-    # the machine part is a bit...  overdone.  It seems, though, that 'Alpha'
-    # exists in that part, making it distinguishable from Itanium.  It will
-    # be interesting to see what we'll get in the upcoming x86_64 port...
-    [ 'OpenVMS:.*?:.*?:.*?:.*Alpha.*', 'vms-alpha' ],
-    [ 'OpenVMS:.*',                 'vms-ia64' ],
-
     [ sub { -d '/usr/apollo' },     'whatever-apollo-whatever' ],
 ];
 
@@ -859,6 +847,20 @@ EOF
             return %config;
         }
       ],
+
+      # Windows values found by looking at Perl 5's win32/win32.c
+      [ 'amd64-.*?-Windows NT',   { target => 'VC-WIN64A' } ],
+      [ 'ia64-.*?-Windows NT',    { target => 'VC-WIN64I' } ],
+      [ 'x86-.*?-Windows NT',     { target => 'VC-WIN32'  } ],
+
+      # VMS values found by observation on existing machinery.
+      # Unfortunately, the machine part is a bit...  overdone.  It seems,
+      # though, that 'Alpha' exists in that part for Alphas, making it
+      # distinguishable from Itanium.  It will be interesting to see what
+      # we'll get in the upcoming x86_64 port...
+      [ '.*Alpha.*?-.*?-OpenVMS', { target => 'vms-alpha' } ],
+      [ '.*?-.*?-OpenVMS',        { target => 'vms-ia64'  } ],
+
     ];
 
 # Map GUESSOS into OpenSSL terminology.