[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  c99eaf2135c9c3ff5a00dccd00d332c0c5351776 (commit)
       via  d615c80a4fe12a983380106bd3b4c6b34bf8d982 (commit)
      from  ed1306451f702aae629ccc39d826a96836b3b069 (commit)


- Log -----------------------------------------------------------------
commit c99eaf2135c9c3ff5a00dccd00d332c0c5351776
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 16 23:34:32 2018 +0100

    test_ssl_old: avoid empty strings for flags
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5396)
    
    (cherry picked from commit 62930b2ecf6ce308fd2ae9ee3e34ace8ba698aac)

commit d615c80a4fe12a983380106bd3b4c6b34bf8d982
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 16 23:28:31 2018 +0100

    OpenSSL::Test::quotify: put quotes around empty arguments
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5396)
    
    (cherry picked from commit 5845f7de8165f35829e49acd41f6a2fc3698f221)

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

Summary of changes:
 test/recipes/80-test_ssl_old.t | 3 ++-
 util/perl/OpenSSL/Test.pm      | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 97ef821..bafb796 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -476,7 +476,8 @@ sub testssl {
                     note "*****SKIPPING $protocol $cipher";
                     ok(1);
                 } else {
-                    ok(run(test([@ssltest, @exkeys, "-cipher", $cipher, $flag])),
+                    ok(run(test([@ssltest, @exkeys, "-cipher", $cipher,
+                                 $flag || ()])),
                        "Testing $cipher");
                }
 	    }
diff --git a/util/perl/OpenSSL/Test.pm b/util/perl/OpenSSL/Test.pm
index f8805a6..eacbd68 100644
--- a/util/perl/OpenSSL/Test.pm
+++ b/util/perl/OpenSSL/Test.pm
@@ -667,12 +667,13 @@ I<This must never ever be done on VMS.>
 sub quotify {
     # Unix setup (default if nothing else is mentioned)
     my $arg_formatter =
-	sub { $_ = shift; /\s|[\{\}\\\$\[\]\*\?\|\&:;<>]/ ? "'$_'" : $_ };
+	sub { $_ = shift;
+	      ($_ eq '' || /\s|[\{\}\\\$\[\]\*\?\|\&:;<>]/) ? "'$_'" : $_ };
 
     if ( $^O eq "VMS") {	# VMS setup
 	$arg_formatter = sub {
 	    $_ = shift;
-	    if (/\s|["[:upper:]]/) {
+	    if ($_ eq '' || /\s|["[:upper:]]/) {
 		s/"/""/g;
 		'"'.$_.'"';
 	    } else {
@@ -682,7 +683,7 @@ sub quotify {
     } elsif ( $^O eq "MSWin32") { # MSWin setup
 	$arg_formatter = sub {
 	    $_ = shift;
-	    if (/\s|["\|\&\*\;<>]/) {
+	    if ($_ eq '' || /\s|["\|\&\*\;<>]/) {
 		s/(["\\])/\\$1/g;
 		'"'.$_.'"';
 	    } else {