[openssl] master update

[beldmit]

The branch master has been updated
       via  4232a9e57f48276974a8891e58db9b06b5db696f (commit)
      from  99501e817cbc4f11cc045dbaa7a81854d4349335 (commit)


- Log -----------------------------------------------------------------
commit 4232a9e57f48276974a8891e58db9b06b5db696f
Author: Richard Levitte <levi...@openssl.org>
Date:   Thu Sep 24 22:00:16 2020 +0200

    Configuration: add initial NonStop values in OpenSSL::config
    
    This makes Configure work it's automatic config detection, at least for
    the simple straightforward cases.
    
    Fixes #12972
    
    Reviewed-by: Dmitry Belyavskiy <beld...@gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/12973)

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

Summary of changes:
 util/perl/OpenSSL/config.pm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index 4409c98df6..c2dbd33bd1 100755
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -160,6 +160,11 @@ my $guess_patterns = [
     [ 'CYGWIN.*',                   '${MACHINE}-pc-cygwin' ],
     [ 'vxworks.*',                  '${MACHINE}-whatever-vxworks' ],
 
+    # Note: there's also NEO and NSR, but they are old and unsupported
+    [ 'NONSTOP_KERNEL:.*:NSE-.*?',  'nse-tandem-nsk${RELEASE}' ],
+    [ 'NONSTOP_KERNEL:.*:NSV-.*?',  'nsv-tandem-nsk${RELEASE}' ],
+    [ 'NONSTOP_KERNEL:.*:NSX-.*?',  'nsx-tandem-nsk${RELEASE}' ],
+
     [ sub { -d '/usr/apollo' },     'whatever-apollo-whatever' ],
 ];
 
@@ -860,6 +865,20 @@ EOF
       [ '.*Alpha.*?-.*?-OpenVMS', { target => 'vms-alpha' } ],
       [ '.*?-.*?-OpenVMS',        { target => 'vms-ia64'  } ],
 
+      # TODO: There are a few more choices among OpenSSL config targets, but
+      # reaching them involves a bit more than just a host tripet.  Select
+      # environment variables could do the job to cover for more granular
+      # build options such as data model (ILP32 or LP64), thread support
+      # model (PUT, SPT or nothing), target execution environment (OSS or
+      # GUARDIAN).  And still, there must be some kind of default when
+      # nothing else is said.
+      #
+      # nsv is a virtual x86 environment, equivalent to nsx, so we enforce
+      # the latter.
+      [ 'nse-tandem-nsk.*',       { target => 'nonstop-nse' } ],
+      [ 'nsv-tandem-nsk.*',       { target => 'nonstop-nsx' } ],
+      [ 'nsx-tandem-nsk.*',       { target => 'nonstop-nsx' } ],
+
     ];
 
 # Map GUESSOS into OpenSSL terminology.