wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid unnecessary MSYS2 conversion of some arguments

Browse source 
Fixes #4740

The MSYS2 run-time convert arguments that look like paths when
executing a program unless that application is linked with the MSYS
run-time.  The exact conversion rules are listed here:

    http://www.mingw.org/wiki/Posix_path_conversion

With the built-in configurations (all having names starting with
"mingw"), the openssl application is not linked with the MSYS2
run-time, and therefore, it will receive possibly converted arguments
from the process that executes it.  This conversion is fine for normal
path arguments, but it happens that some arguments to the openssl
application get converted when they shouldn't.  In one case, it's
arguments like '-passin file:something', and in another, it's a file:
URI (what typically happens is that URIs without an authority
component get converted, 'cause the conversion mechanism doesn't
recognise them as URIs).

To avoid conversion where we don't want it, we simply assign
MSYS2_ARG_CONV_EXCL a pattern to avoid specific conversions.  As a
precaution, we only do this where we obviously need it.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4765)
This commit is contained in:
Richard Levitte 2017-11-21 15:09:59 +01:00
parent 281bf2332c
commit f106f40694
2 changed files with 27 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/recipes/04-test_pem.t
View file

@ -88,7 +88,11 @@ SKIP: {
skip "DSA support disabled, skipping...", (scalar keys %dsa_expected) unless !disabled("dsa"); skip "DSA support disabled, skipping...", (scalar keys %dsa_expected) unless !disabled("dsa");
foreach my $input (keys %dsa_expected) { foreach my $input (keys %dsa_expected) {
my @common = ($cmd, "pkey", "-inform", "PEM", "-passin", "file:" . data_file("wellknown"), "-noout", "-text", "-in"); my @common = ($cmd, "pkey", "-inform", "PEM", "-passin", "file:" . data_file("wellknown"), "-noout", "-text", "-in");
my @data = run(app([@common, data_file($input)], stderr => undef), capture => 1); my @data;
{
local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
@data = run(app([@common, data_file($input)], stderr => undef), capture => 1);
}
my @match = grep /68:42:02:16:63:54:16:eb:06:5c:ab:06:72:3b:78:/, @data; my @match = grep /68:42:02:16:63:54:16:eb:06:5c:ab:06:72:3b:78:/, @data;
is((scalar @match > 0 ? 1 : 0), $dsa_expected{$input}); is((scalar @match > 0 ? 1 : 0), $dsa_expected{$input});
} }

74
test/recipes/90-test_store.t
View file

@ -15,32 +15,6 @@ use OpenSSL::Test::Utils;
my $test_name = "test_store"; my $test_name = "test_store";
setup($test_name); setup($test_name);
# The MSYS2 run-time convert arguments that look like paths when executing
# a program unless that application is linked with the MSYS run-time. The
# exact conversion rules are listed here:
#
# http://www.mingw.org/wiki/Posix_path_conversion
#
# With the built-in configurations (all having names starting with "mingw"),
# the openssl application is not linked with the MSYS2 run-time, and therefore,
# it will receive possibly converted arguments from the process that executes
# it. This conversion is fine for normal path arguments, but when those
# arguments are URIs, they sometimes aren't converted right (typically for
# URIs without an authority component, 'cause the conversion mechanism doesn't
# recognise them as URIs) or aren't converted at all (which gives perfectly
# normal absolute paths from the MSYS viewpoint, but don't work for the
# Windows run-time we're linked with).
#
# It's also possible to avoid conversion by defining MSYS2_ARG_CONV_EXCL with
# some suitable pattern ("*" to avoid conversions entirely), but that will
# again give us unconverted paths that don't work with the Windows run-time
# we're linked with.
#
# Checking for both msys perl operating environment and that the target name
# starts with "mingw", we're doing what we can to assure that other configs
# that might link openssl.exe with the MSYS run-time are not disturbed.
my $msys_mingw = ($^O eq 'msys') && (config('target') =~ m|^mingw|);
my @noexist_files = my @noexist_files =
( "test/blahdiblah.pem", ( "test/blahdiblah.pem",
"test/blahdibleh.der" ); "test/blahdibleh.der" );
@ -116,22 +90,22 @@ indir "store_$$" => sub {
foreach (@noexist_files) { foreach (@noexist_files) {
my $file = srctop_file($_); my $file = srctop_file($_);
SKIP: {
ok(!run(app(["openssl", "storeutl", $file])));
ok(!run(app(["openssl", "storeutl", to_abs_file($file)])));
skip "No test of URI form of $file for mingw", 1 if $msys_mingw; ok(!run(app(["openssl", "storeutl", $file])));
ok(!run(app(["openssl", "storeutl", to_abs_file($file)])));
{
local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
ok(!run(app(["openssl", "storeutl", to_abs_file_uri($file)]))); ok(!run(app(["openssl", "storeutl", to_abs_file_uri($file)])));
} }
} }
foreach (@src_files) { foreach (@src_files) {
my $file = srctop_file($_); my $file = srctop_file($_);
SKIP: {
ok(run(app(["openssl", "storeutl", $file])));
ok(run(app(["openssl", "storeutl", to_abs_file($file)])));
skip "No test of URI form of $file for mingw", 4 if $msys_mingw; ok(run(app(["openssl", "storeutl", $file])));
ok(run(app(["openssl", "storeutl", to_abs_file($file)])));
{
local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
ok(run(app(["openssl", "storeutl", to_abs_file_uri($file)]))); ok(run(app(["openssl", "storeutl", to_abs_file_uri($file)])));
ok(run(app(["openssl", "storeutl", ok(run(app(["openssl", "storeutl",
@ -143,13 +117,13 @@ indir "store_$$" => sub {
} }
} }
foreach (@generated_files) { foreach (@generated_files) {
SKIP: { ok(run(app(["openssl", "storeutl", "-passin", "pass:password",
ok(run(app(["openssl", "storeutl", "-passin", "pass:password", $_])));
$_]))); ok(run(app(["openssl", "storeutl", "-passin", "pass:password",
ok(run(app(["openssl", "storeutl", "-passin", "pass:password", to_abs_file($_)])));
to_abs_file($_)])));
skip "No test of URI form of $_ for mingw", 2 if $msys_mingw; {
local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
ok(run(app(["openssl", "storeutl", "-passin", "pass:password", ok(run(app(["openssl", "storeutl", "-passin", "pass:password",
to_abs_file_uri($_)]))); to_abs_file_uri($_)])));
@ -158,26 +132,22 @@ indir "store_$$" => sub {
} }
} }
foreach (values %generated_file_files) { foreach (values %generated_file_files) {
SKIP: { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
skip "No test of $_ for mingw", 1 if $msys_mingw;
ok(run(app(["openssl", "storeutl", $_]))); ok(run(app(["openssl", "storeutl", $_])));
}
} }
foreach (@noexist_file_files) { foreach (@noexist_file_files) {
SKIP: { local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
skip "No test of $_ for mingw", 1 if $msys_mingw;
ok(!run(app(["openssl", "storeutl", $_]))); ok(!run(app(["openssl", "storeutl", $_])));
}
} }
{ {
my $dir = srctop_dir("test", "certs"); my $dir = srctop_dir("test", "certs");
SKIP: {
ok(run(app(["openssl", "storeutl", $dir])));
ok(run(app(["openssl", "storeutl", to_abs_file($dir, 1)])));
skip "No test of URI form of $dir for mingw", 1 if $msys_mingw; ok(run(app(["openssl", "storeutl", $dir])));
ok(run(app(["openssl", "storeutl", to_abs_file($dir, 1)])));
{
local $ENV{MSYS2_ARG_CONV_EXCL} = "file:";
ok(run(app(["openssl", "storeutl", to_abs_file_uri($dir, 1)]))); ok(run(app(["openssl", "storeutl", to_abs_file_uri($dir, 1)])));
} }