[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4034c38b25b44773660f7427acfcdbbb56f47907 (commit)
       via  ac33c5a477568127ad99b1260a8978477de50e36 (commit)
      from  917c343ef8495ccb32cfc2fe7e42c57914e40061 (commit)


- Log -----------------------------------------------------------------
commit 4034c38b25b44773660f7427acfcdbbb56f47907
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 15:16:41 2016 +0100

    Fix test/recipes/80-test_ca.t to work on VMS
    
    VMS uses a variant of openssl.cnf named openssl-vms.cnf.
    
    There's a Perl on VMS mystery where a open pipe will not SIGPIPE when
    the child process exits, which means that a loop sending "y\n" to it
    will never stop.  Adding a counter helps fix this (set to 10, we know
    that none of the CA.pl commands will require more).
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit ac33c5a477568127ad99b1260a8978477de50e36
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Jan 13 15:13:02 2016 +0100

    VMS will downcase all command parameters unless they're quoted
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 apps/CA.pl.in             | 2 +-
 test/recipes/80-test_ca.t | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/CA.pl.in b/apps/CA.pl.in
index a814ebf..23e116a 100644
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -164,7 +164,7 @@ if ($WHAT eq '-newcert' ) {
     my @files = @ARGV ? @ARGV : ( $NEWCERT );
     my $file;
     foreach $file (@files) {
-        my $status = run("$VERIFY -CAfile ${CATOP}/$CACERT $file");
+        my $status = run("$VERIFY \"-CAfile\" ${CATOP}/$CACERT $file");
         $RET = $status if $status != 0;
     }
 } elsif ($WHAT eq '-crl' ) {
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index ff6eb65..b00e303 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -13,7 +13,8 @@ setup("test_ca");
 my $perl = $^X;
 $ENV{OPENSSL} = cmdstr(app(["openssl"]));
 my $CA_pl = top_file("apps", "CA.pl");
-my $std_openssl_cnf = top_file("apps", "openssl.cnf");
+my $std_openssl_cnf = $^O eq "VMS"
+    ? top_file("apps", "openssl-vms.cnf") : top_file("apps", "openssl.cnf");
 
 ($perl) = quotify($perl) unless $^O eq "VMS"; # never quotify a command on VMS. Ever!
 
@@ -46,9 +47,10 @@ unlink "newcert.pem", "newreq.pem";
 
 
 sub yes {
+    my $cntr = 10;
     open(PIPE, "|-", join(" ", at _));
     local $SIG{PIPE} = "IGNORE";
-    1 while print PIPE "y\n";
+    1 while $cntr-- > 0 && print PIPE "y\n";
     close PIPE;
     return 0;
 }