mirror of
https://github.com/mirror/wget.git
synced 2026-08-19 09:23:27 +08:00
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:
@@ -27,45 +27,56 @@ 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";
|
||||
print CRLN "1122";
|
||||
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/tmpserver2.crt";
|
||||
my $serverkey = "certs/tmpserver2.key";
|
||||
my $servercsr = "$cdir/certs/tmpserver.csr";
|
||||
my $servercrt = "$cdir/tmpserver2.crt";
|
||||
my $serverkey = "$cdir/tmpserver2.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".
|
||||
@@ -114,7 +125,7 @@ if ($sslsock->run() != 0)
|
||||
}
|
||||
|
||||
# Revoke the certificate
|
||||
my $crlfile = "$cdir/certs/servercrl.pem";
|
||||
my $crlfile = "$cdir/servercrl.pem";
|
||||
my $revokecmd = "openssl ca -config $caconf -revoke $servercrt &&
|
||||
openssl ca -config $caconf -gencrl -keyfile $cakey ".
|
||||
"-cert $cacrt -out $crlfile";
|
||||
@@ -127,7 +138,7 @@ unless(-e $crlfile)
|
||||
}
|
||||
|
||||
# To read a CRL file use the following command:
|
||||
# openssl crl -text -in certs/root.crl.pem
|
||||
# openssl crl -text -in $srcdir/certs/root.crl.pem
|
||||
|
||||
# Retry the test with CRL. Expect Failure.
|
||||
$port = 23443;
|
||||
|
||||
Reference in New Issue
Block a user