The branch master has been updated via 62930b2ecf6ce308fd2ae9ee3e34ace8ba698aac (commit) via 5845f7de8165f35829e49acd41f6a2fc3698f221 (commit) from b45497c3371e218867d7ad43da8f99c34a32f635 (commit)
- Log ----------------------------------------------------------------- commit 62930b2ecf6ce308fd2ae9ee3e34ace8ba698aac Author: Richard Levitte <levi...@openssl.org> Date: Fri Feb 16 23:34:32 2018 +0100 test_ssl_old: avoid empty strings for flags Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5396) commit 5845f7de8165f35829e49acd41f6a2fc3698f221 Author: Richard Levitte <levi...@openssl.org> Date: Fri Feb 16 23:28:31 2018 +0100 OpenSSL::Test::quotify: put quotes around empty arguments Reviewed-by: Paul Dale <paul.d...@oracle.com> Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5396) ----------------------------------------------------------------------- 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 543ca96..f89779c 100644 --- a/test/recipes/80-test_ssl_old.t +++ b/test/recipes/80-test_ssl_old.t @@ -450,7 +450,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 e363a48..ad77896 100644 --- a/util/perl/OpenSSL/Test.pm +++ b/util/perl/OpenSSL/Test.pm @@ -760,12 +760,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 { @@ -775,7 +776,7 @@ sub quotify { } elsif ( $^O eq "MSWin32") { # MSWin setup $arg_formatter = sub { $_ = shift; - if (/\s|["\|\&\*\;<>]/) { + if ($_ eq '' || /\s|["\|\&\*\;<>]/) { s/(["\\])/\\$1/g; '"'.$_.'"'; } else { _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits