summaryrefslogtreecommitdiff
path: root/tests/runtests.pl
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-08-07 17:11:52 +0200
committerDaniel Stenberg <daniel@haxx.se>2020-08-08 00:19:21 +0200
commit2429f45a9782eb56771c57688f85af79e8e383cc (patch)
treee0c8d86099094f9cad3ef444f6f5aed2b28d9bd1 /tests/runtests.pl
parent265717d27117a722b2b3ccc5f38de722c3a79070 (diff)
downloadcurl-2429f45a9782eb56771c57688f85af79e8e383cc.tar.gz
TLS naming: fix more Winssl and Darwinssl leftovers
The CMake option is now called CMAKE_USE_SCHANNEL The winbuild flag is USE_SCHANNEL The CI jobs and build scripts only use the new names and the new name options Tests now require 'Schannel' (when necessary) Closes #5795
Diffstat (limited to 'tests/runtests.pl')
-rwxr-xr-xtests/runtests.pl14
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 203301400..a409bcc75 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -268,8 +268,8 @@ my $has_openssl; # built with a lib using an OpenSSL-like API
my $has_gnutls; # built with GnuTLS
my $has_nss; # built with NSS
my $has_wolfssl; # built with wolfSSL
-my $has_winssl; # built with WinSSL (Secure Channel aka Schannel)
-my $has_darwinssl; # built with DarwinSSL (Secure Transport)
+my $has_schannel; # built with Schannel
+my $has_sectransp; # built with Secure Transport
my $has_boringssl; # built with BoringSSL
my $has_libressl; # built with libressl
my $has_mbedtls; # built with mbedTLS
@@ -2788,7 +2788,6 @@ sub setupfeatures {
$feature{"alt-svc"} = $has_altsvc;
$feature{"brotli"} = $has_brotli;
$feature{"crypto"} = $has_crypto;
- $feature{"DarwinSSL"} = $has_darwinssl; # alias
$feature{"debug"} = $debug_build;
$feature{"getrlimit"} = $has_getrlimit;
$feature{"GnuTLS"} = $has_gnutls;
@@ -2810,8 +2809,8 @@ sub setupfeatures {
$feature{"NTLM_WB"} = $has_ntlm_wb;
$feature{"OpenSSL"} = $has_openssl || $has_libressl || $has_boringssl;
$feature{"PSL"} = $has_psl;
- $feature{"Schannel"} = $has_winssl; # alias
- $feature{"sectransp"} = $has_darwinssl;
+ $feature{"Schannel"} = $has_schannel;
+ $feature{"sectransp"} = $has_sectransp;
$feature{"SPNEGO"} = $has_spnego;
$feature{"SSL"} = $has_ssl;
$feature{"SSLpinning"} = $has_sslpinning;
@@ -2822,7 +2821,6 @@ sub setupfeatures {
$feature{"unittest"} = $debug_build;
$feature{"unix-sockets"} = $has_unix;
$feature{"win32"} = $has_win32;
- $feature{"WinSSL"} = $has_winssl;
$feature{"zstd"} = $has_zstd;
# make each protocol an enabled "feature"
@@ -2907,7 +2905,7 @@ sub checksystem {
$has_mingw = 1 if ($curl =~ /-pc-mingw32/);
}
if ($libcurl =~ /(winssl|schannel)/i) {
- $has_winssl=1;
+ $has_schannel=1;
$has_sslpinning=1;
}
elsif ($libcurl =~ /openssl/i) {
@@ -2927,7 +2925,7 @@ sub checksystem {
$has_sslpinning=1;
}
elsif ($libcurl =~ /securetransport/i) {
- $has_darwinssl=1;
+ $has_sectransp=1;
$has_sslpinning=1;
}
elsif ($libcurl =~ /BoringSSL/i) {