[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  a515c8256e22eb8427a43ea4f709794ce2c36414 (commit)
      from  fd6d0c5ac4bc685b4021824fa56fcec245f08884 (commit)


- Log -----------------------------------------------------------------
commit a515c8256e22eb8427a43ea4f709794ce2c36414
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jun 16 06:48:12 2021 +0200

    Fix exit code for VMS in util/wrap.pl and test/run_tests.pl
    
    The exit code for VMS is a bit tricky, and while perl translates the
    VMS status code from a typical C program to posix terms, it doesn't
    automatically translate its exit code into the typical C program VMS
    status code.  Perl scripts are recommended to do so explicitly.
    
    Therefore, we make util/wrap.pl and test/run_tests.pl simulate the
    typical C program VMS status code for all non-zero exit codes, except
    we give them all the error severity (according to the VMS C library
    reference manual, exit codes 2 and above are treated as success...).
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15787)

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

Summary of changes:
 test/run_tests.pl | 23 +++++++++++++++++------
 util/wrap.pl      | 16 +++++++++++++++-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/test/run_tests.pl b/test/run_tests.pl
index 0ed97b2ca9..4899356a6e 100644
--- a/test/run_tests.pl
+++ b/test/run_tests.pl
@@ -314,12 +314,23 @@ $ret =
     $harness->runtests(map { [ abs2rel($_, rel2abs(curdir())), basename($_) ] }
                        sort { reorder($a) cmp reorder($b) } keys %tests);
 
-# $ret->has_errors may be any number, not just 0 or 1.  On VMS, numbers
-# from 2 and on are used as is as VMS statuses, which has severity encoded
-# in the lower 3 bits.  0 and 1, on the other hand, generate SUCCESS and
-# FAILURE, so for currect reporting on all platforms, we make sure the only
-# exit codes are 0 and 1.  Double-bang is the trick to do so.
-exit !!$ret->has_errors if (ref($ret) eq "TAP::Parser::Aggregator");
+# If this is a TAP::Parser::Aggregator, $ret->has_errors is the count of
+# tests that failed.  We don't bother with that exact number, just exit
+# with an appropriate exit code when it isn't zero.
+if (ref($ret) eq "TAP::Parser::Aggregator") {
+    exit 0 unless $ret->has_errors;
+    exit 1 unless $^O eq 'VMS';
+    # On VMS, perl converts an exit 1 to SS$_ABORT (%SYSTEM-F-ABORT), which
+    # is a bit harsh.  As per perl recommendations, we explicitly use the
+    # same VMS status code as typical C programs would for exit(1), except
+    # we set the error severity rather than success.
+    # Ref: https://perldoc.perl.org/perlport#exit
+    #      https://perldoc.perl.org/perlvms#$?
+    exit  0x35a000              # C facility code
+        + 8                     # 1 << 3 (to make space for the 3 severity bits)
+        + 2                     # severity: E(rror)
+        + 0x10000000;           # bit 28 set => the shell stays silent
+}
 
 # If this isn't a TAP::Parser::Aggregator, it's the pre-TAP test harness,
 # which simply dies at the end if any test failed, so we don't need to bother
diff --git a/util/wrap.pl b/util/wrap.pl
index 69be06d302..1ca09bfdf4 100755
--- a/util/wrap.pl
+++ b/util/wrap.pl
@@ -46,4 +46,18 @@ die "wrap.pl: Failed to execute '", join(' ', @cmd), "': $!\n"
 exit(($? & 255) | 128) if ($? & 255) != 0;
 
 # When not a signal, just shift down the subprocess exit code and use that.
-exit($? >> 8);
+my $exitcode = $? >> 8;
+
+# For VMS, perl recommendations is to emulate what the C library exit() does
+# for all non-zero exit codes, except we set the error severity rather than
+# success.
+# Ref: https://perldoc.perl.org/perlport#exit
+#      https://perldoc.perl.org/perlvms#$?
+if ($^O eq 'VMS' && $exitcode != 0) {
+    $exitcode =
+        0x35a000                # C facility code
+        + ($exitcode * 8)       # shift up to make space for the 3 severity bits
+        + 2                     # Severity: E(rror)
+        + 0x10000000;           # bit 28 set => the shell stays silent
+}
+exit($exitcode);