Fix path and VPATH issues of new https/TLS tests

* tests/SSLTest.pm: Use $srcdir in read-only files,
  (_setup_server): Remove unneeded path fixation code
* tests/Test-https-*.px: Use $srcdir for read-only files,
  use $cdir for writable files
* tests/certs/interca.conf: Adjust paths
* tests/certs/rootca.conf: Adjust paths
This commit is contained in:
Tim Rühsen
2017-05-09 15:21:23 +02:00
parent 466afc62b0
commit b5c2d083ea
11 changed files with 217 additions and 118 deletions

View File

@@ -27,44 +27,55 @@ unless ($ossl =~ m/OpenSSL 1/)
exit 77;
}
my $cdir = $ENV{'PWD'};
my $srcdir;
if (@ARGV) {
$srcdir = shift @ARGV;
} elsif (defined $ENV{srcdir}) {
$srcdir = $ENV{srcdir};
}
$srcdir = Cwd::abs_path("$srcdir");
my $cdir = $ENV{'PWD'};
# HOSTALIASES env variable allows us to create hosts file alias.
my $testhostname = "WgetTestingServer";
$ENV{'HOSTALIASES'} = "$cdir/certs/wgethosts";
$ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts";
my $addr = gethostbyname($testhostname) or
my $addr = gethostbyname($testhostname);
unless ($addr)
{
warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n";
exit 77;
}
unless (inet_ntoa($addr) =~ "127.0.0.1")
{
warn "Failed to resolve $testhostname";
warn "Failed to resolve $$addr, using $srcdir/certs/wgethosts\n";
exit 77;
}
# Create certindex
open CERTID, ">", "$cdir/certs/certindex" or
warn "Cannot overwrite file $cdir/certs/certindex";
open CERTID, ">", "$cdir/certindex" or
warn "Cannot overwrite file $cdir/certindex";
close CERTID;
# Create certserial
open CERTSN, ">", "$cdir/certs/certserial" or
warn "Cannot overwrite file $cdir/certs/certserial";
open CERTSN, ">", "$cdir/certserial" or
warn "Cannot overwrite file $cdir/certserial";
print CERTSN "1122";
close CERTSN;
# Create crlnumber
open CRLN, ">", "$cdir/certs/crlnumber" or
warn "Cannot overwrite file $cdir/certs/crlnumber";
open CRLN, ">", "$cdir/crlnumber" or
warn "Cannot overwrite file $cdir/crlnumber";
close CRLN;
my $caconf = "$cdir/certs/rootca.conf";
my $cacrt = "$cdir/certs/test-ca-cert.pem";
my $cakey = "$cdir/certs/test-ca-key.pem";
my $caconf = "$srcdir/certs/rootca.conf";
my $cacrt = "$srcdir/certs/test-ca-cert.pem";
my $cakey = "$srcdir/certs/test-ca-key.pem";
# Prepare server certificate
my $servercrt = "certs/tmpserver1.crt";
my $serverkey = "certs/tmpserver1.key";
my $servercsr = "$cdir/certs/tmpserver.csr";
my $servercrt = "$cdir/tmpserver1.crt";
my $serverkey = "$cdir/tmpserver1.key";
my $servercsr = "$cdir/tmpserver.csr";
my $serversubj = "/C=US/ST=CA/L=Server Mystery Spot/O=Serv/CN=".
"$testhostname/emailAddress=servertester";
my $servercmd = "openssl genrsa -out $serverkey 4096 && openssl req -new".
@@ -84,9 +95,9 @@ unless(-e $servercrt && -e $serverkey && $servercheck == 1)
}
# Prepare client certificate
my $clientcert = "$cdir/certs/client.crt";
my $clientkey = "$cdir/certs/client.key";
my $clientcsr = "$cdir/certs/client.csr";
my $clientcert = "$cdir/client.crt";
my $clientkey = "$cdir/client.key";
my $clientcsr = "$cdir/client.csr";
my $clientsubj = "/C=US/ST=CA/L=Client Mystery Spot/O=Client/CN=".
"Client Tester/emailAddress=clienttester";
my $clientcertcmd = "openssl genrsa -out $clientkey 4096 &&".