diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2018-10-30 10:00:00 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-11-01 10:29:53 +0100 |
| commit | 302d125b42ed39580fad65ad87fa376ddeaba305 (patch) | |
| tree | 2b370d27d781d40af2f04b6b5c524730b83286f1 /tests | |
| parent | 7f4c358541fdadcf29ba20bcdff71c5554e5f69c (diff) | |
| download | curl-302d125b42ed39580fad65ad87fa376ddeaba305.tar.gz | |
axtls: removed
As has been outlined in the DEPRECATE.md document, the axTLS code has
been disabled for 6 months and is hereby removed.
Use a better supported TLS library!
Assisted-by: Daniel Gustafsson
Closes #3194
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/FILEFORMAT | 1 | ||||
| -rwxr-xr-x | tests/runtests.pl | 18 | ||||
| -rw-r--r-- | tests/unit/unit1397.c | 4 |
3 files changed, 2 insertions, 21 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT index 68a7854f4..d2bcc4e00 100644 --- a/tests/FILEFORMAT +++ b/tests/FILEFORMAT @@ -220,7 +220,6 @@ SKIPPED. Features testable here are: -axTLS crypto debug getrlimit diff --git a/tests/runtests.pl b/tests/runtests.pl index 6a644ed0d..421cf2a6b 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -245,7 +245,6 @@ my $has_gnutls; # built with GnuTLS my $has_nss; # built with NSS my $has_yassl; # built with yassl my $has_polarssl; # built with polarssl -my $has_axtls; # built with axTLS my $has_winssl; # built with WinSSL (Secure Channel aka Schannel) my $has_darwinssl; # built with DarwinSSL (Secure Transport) my $has_boringssl; # built with BoringSSL @@ -793,7 +792,6 @@ sub verifyhttp { $flags .= "--verbose "; $flags .= "--globoff "; $flags .= "--unix-socket '$port_or_path' " if $ipvnum eq "unix"; - $flags .= "-1 " if($has_axtls); $flags .= "--insecure " if($proto eq 'https'); $flags .= "\"$proto://$ip:$port/${bonus}verifiedserver\""; @@ -2720,10 +2718,6 @@ sub checksystem { $has_sslpinning=1; $ssllib="polarssl"; } - elsif ($libcurl =~ /axtls/i) { - $has_axtls=1; - $ssllib="axTLS"; - } elsif ($libcurl =~ /securetransport/i) { $has_darwinssl=1; $has_sslpinning=1; @@ -3278,11 +3272,6 @@ sub singletest { next; } } - elsif($1 eq "axTLS") { - if($has_axtls) { - next; - } - } elsif($1 eq "WinSSL") { if($has_winssl) { next; @@ -3456,11 +3445,6 @@ sub singletest { next; } } - elsif($1 eq "axTLS") { - if(!$has_axtls) { - next; - } - } elsif($1 eq "WinSSL") { if(!$has_winssl) { next; @@ -3887,8 +3871,6 @@ sub singletest { } elsif(!$tool) { # run curl, add suitable command line options - $cmd = "-1 ".$cmd if(exists $feature{"SSL"} && ($has_axtls)); - my $inc=""; if((!$cmdhash{'option'}) || ($cmdhash{'option'} !~ /no-include/)) { $inc = " --include"; diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c index 539433ca0..432b90973 100644 --- a/tests/unit/unit1397.c +++ b/tests/unit/unit1397.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -36,7 +36,7 @@ static void unit_stop(void) UNITTEST_START /* only these backends define the tested functions */ -#if defined(USE_OPENSSL) || defined(USE_AXTLS) || defined(USE_GSKIT) +#if defined(USE_OPENSSL) || defined(USE_GSKIT) /* here you start doing things and checking that the results are good */ |