aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests/runtests.pl18
1 files changed, 3 insertions, 15 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 66ab405f5..5a1d1b6cd 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -257,7 +257,6 @@ my $has_sslpinning; # built with a TLS backend that supports pinning
my $has_shared = "unknown"; # built shared
my $resolver; # name of the resolver backend (for human presentation)
-my $ssllib; # name of the SSL library we use (for human presentation)
my $has_textaware; # set if running on a system that has a text mode concept
# on files. Windows for example
@@ -2688,55 +2687,45 @@ sub checksystem {
# Win32-style path.
$pwd = pathhelp::sys_native_current_path();
}
- if ($libcurl =~ /winssl/i) {
+ if ($libcurl =~ /(winssl|schannel)/i) {
$has_winssl=1;
$has_sslpinning=1;
- $ssllib="WinSSL";
}
elsif ($libcurl =~ /openssl/i) {
$has_openssl=1;
$has_sslpinning=1;
- $ssllib="OpenSSL";
}
elsif ($libcurl =~ /gnutls/i) {
$has_gnutls=1;
$has_sslpinning=1;
- $ssllib="GnuTLS";
}
elsif ($libcurl =~ /nss/i) {
$has_nss=1;
$has_sslpinning=1;
- $ssllib="NSS";
}
elsif ($libcurl =~ /(yassl|wolfssl)/i) {
$has_yassl=1;
$has_sslpinning=1;
- $ssllib="yassl";
}
elsif ($libcurl =~ /polarssl/i) {
$has_polarssl=1;
$has_sslpinning=1;
- $ssllib="polarssl";
}
elsif ($libcurl =~ /securetransport/i) {
$has_darwinssl=1;
$has_sslpinning=1;
- $ssllib="DarwinSSL";
}
elsif ($libcurl =~ /BoringSSL/i) {
$has_boringssl=1;
$has_sslpinning=1;
- $ssllib="BoringSSL";
}
elsif ($libcurl =~ /libressl/i) {
$has_libressl=1;
$has_sslpinning=1;
- $ssllib="libressl";
}
elsif ($libcurl =~ /mbedTLS/i) {
$has_mbedtls=1;
$has_sslpinning=1;
- $ssllib="mbedTLS";
}
if ($libcurl =~ /ares/i) {
$has_cares=1;
@@ -2744,7 +2733,6 @@ sub checksystem {
}
if ($libcurl =~ /mesalink/i) {
$has_mesalink=1;
- $ssllib="MesaLink";
}
}
elsif($_ =~ /^Protocols: (.*)/i) {
@@ -3279,7 +3267,7 @@ sub singletest {
next;
}
}
- elsif($1 eq "WinSSL") {
+ elsif(($1 eq "WinSSL") || ($1 eq "Schannel")) {
if($has_winssl) {
next;
}
@@ -3452,7 +3440,7 @@ sub singletest {
next;
}
}
- elsif($1 eq "WinSSL") {
+ elsif(($1 eq "WinSSL") || ($1 eq "Schannel")) {
if(!$has_winssl) {
next;
}