Last active
October 30, 2018 09:31
-
-
Save danielgustafsson/55727406e302459668119587b8a33758 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index d7ad6caa1..bdd8c3f8b 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -291,7 +291,7 @@ if(WIN32) | |
endif() | |
# check SSL libraries | |
-# TODO support GNUTLS, NSS, POLARSSL, AXTLS, CYASSL | |
+# TODO support GNUTLS, NSS, POLARSSL, CYASSL | |
if(APPLE) | |
option(CMAKE_USE_DARWINSSL "enable Apple OS native SSL/TLS" OFF) | |
diff --git a/docs/libcurl/curl_global_sslset.3 b/docs/libcurl/curl_global_sslset.3 | |
index 48686ab9e..3a469771d 100644 | |
--- a/docs/libcurl/curl_global_sslset.3 | |
+++ b/docs/libcurl/curl_global_sslset.3 | |
@@ -41,7 +41,6 @@ typedef enum { | |
CURLSSLBACKEND_WOLFSSL = 7, | |
CURLSSLBACKEND_SCHANNEL = 8, | |
CURLSSLBACKEND_DARWINSSL = 9, | |
- CURLSSLBACKEND_AXTLS = 10, | |
CURLSSLBACKEND_MBEDTLS = 11 | |
} curl_sslbackend; | |
diff --git a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 | |
index c601e4fcf..7cbab5d88 100644 | |
--- a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 | |
+++ b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 | |
@@ -54,7 +54,7 @@ struct curl_tlssessioninfo { | |
The \fIbackend\fP struct member is one of the defines in the CURLSSLBACKEND_* | |
series: CURLSSLBACKEND_NONE (when built without TLS support), | |
-CURLSSLBACKEND_AXTLS, CURLSSLBACKEND_CYASSL, CURLSSLBACKEND_DARWINSSL, | |
+CURLSSLBACKEND_CYASSL, CURLSSLBACKEND_DARWINSSL, | |
CURLSSLBACKEND_GNUTLS, CURLSSLBACKEND_GSKIT, CURLSSLBACKEND_MBEDTLS, | |
CURLSSLBACKEND_NSS, CURLSSLBACKEND_OPENSSL, CURLSSLBACKEND_POLARSSL or | |
CURLSSLBACKEND_SCHANNEL. (Note that the OpenSSL forks are all reported as just | |
@@ -77,8 +77,6 @@ CURLINFO_TLS_SSL_PTR: SSL * | |
Since 7.48.0 the \fIinternals\fP member can point to these other SSL backends | |
as well: | |
.RS | |
-.IP axTLS | |
-SSL * | |
.IP mbedTLS | |
mbedtls_ssl_context * | |
.IP PolarSSL | |
diff --git a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 | |
index 15e92878d..dfbe2680b 100644 | |
--- a/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 | |
+++ b/docs/libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 | |
@@ -50,7 +50,7 @@ TLSv1.3 | |
The maximum TLS version can be set by using \fIone\fP of the | |
CURL_SSLVERSION_MAX_ macros below. It is also possible to OR \fIone\fP of the | |
CURL_SSLVERSION_ macros with \fIone\fP of the CURL_SSLVERSION_MAX_ macros. | |
-The MAX macros are not supported for SSL backends axTLS or wolfSSL. | |
+The MAX macros are not supported for the wolfSSL backend. | |
.RS | |
.IP CURL_SSLVERSION_MAX_DEFAULT | |
The flag defines the maximum supported TLS version as TLSv1.2, or the default | |
diff --git a/docs/libcurl/opts/CURLOPT_SSLVERSION.3 b/docs/libcurl/opts/CURLOPT_SSLVERSION.3 | |
index 96afa86f1..a69c40551 100644 | |
--- a/docs/libcurl/opts/CURLOPT_SSLVERSION.3 | |
+++ b/docs/libcurl/opts/CURLOPT_SSLVERSION.3 | |
@@ -59,7 +59,7 @@ TLS v1.3 or later (Added in 7.52.0) | |
The maximum TLS version can be set by using \fIone\fP of the | |
CURL_SSLVERSION_MAX_ macros below. It is also possible to OR \fIone\fP of the | |
CURL_SSLVERSION_ macros with \fIone\fP of the CURL_SSLVERSION_MAX_ macros. | |
-The MAX macros are not supported for SSL backends axTLS or wolfSSL. | |
+The MAX macros are not supported for the woflSSL backend. | |
.RS | |
.IP CURL_SSLVERSION_MAX_DEFAULT | |
The flag defines the maximum supported TLS version by libcurl, or the default | |
diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions | |
index a60a7148b..98be5b7f4 100644 | |
--- a/docs/libcurl/symbols-in-versions | |
+++ b/docs/libcurl/symbols-in-versions | |
@@ -700,7 +700,7 @@ CURLSSH_AUTH_KEYBOARD 7.16.1 | |
CURLSSH_AUTH_NONE 7.16.1 | |
CURLSSH_AUTH_PASSWORD 7.16.1 | |
CURLSSH_AUTH_PUBLICKEY 7.16.1 | |
-CURLSSLBACKEND_AXTLS 7.38.0 | |
+CURLSSLBACKEND_AXTLS 7.38.0 - 7.63.0 | |
CURLSSLBACKEND_BORINGSSL 7.49.0 | |
CURLSSLBACKEND_CYASSL 7.34.0 | |
CURLSSLBACKEND_DARWINSSL 7.34.0 | |
diff --git a/include/curl/curl.h b/include/curl/curl.h | |
index 2cd611818..02c6fc1dc 100644 | |
--- a/include/curl/curl.h | |
+++ b/include/curl/curl.h | |
@@ -145,7 +145,7 @@ typedef enum { | |
CURLSSLBACKEND_WOLFSSL = 7, | |
CURLSSLBACKEND_SCHANNEL = 8, | |
CURLSSLBACKEND_DARWINSSL = 9, | |
- CURLSSLBACKEND_AXTLS = 10, | |
+ CURLSSLBACKEND_OBSOLETE5 = 10, /* Was axTLS */ | |
CURLSSLBACKEND_MBEDTLS = 11 | |
} curl_sslbackend; | |
diff --git a/lib/Makefile.netware b/lib/Makefile.netware | |
index fa6beec00..bab311f63 100644 | |
--- a/lib/Makefile.netware | |
+++ b/lib/Makefile.netware | |
@@ -49,11 +49,6 @@ ifndef LIBSSH2_PATH | |
LIBSSH2_PATH = ../../libssh2-1.5.0 | |
endif | |
-# Edit the path below to point to the base of your axTLS package. | |
-ifndef AXTLS_PATH | |
-AXTLS_PATH = ../../axTLS-1.2.7 | |
-endif | |
- | |
# Edit the path below to point to the base of your libidn package. | |
ifndef LIBIDN_PATH | |
LIBIDN_PATH = ../../libidn-1.18 | |
@@ -230,10 +225,6 @@ WITH_SSH2 = 1 | |
WITH_SSL = 1 | |
WITH_ZLIB = 1 | |
endif | |
-ifeq ($(findstring -axtls,$(CFG)),-axtls) | |
-WITH_AXTLS = 1 | |
-WITH_SSL = | |
-else | |
ifeq ($(findstring -ssl,$(CFG)),-ssl) | |
WITH_SSL = 1 | |
ifeq ($(findstring -srp,$(CFG)),-srp) | |
@@ -242,7 +233,6 @@ WITH_SRP = 1 | |
endif | |
endif | |
endif | |
-endif | |
ifeq ($(findstring -zlib,$(CFG)),-zlib) | |
WITH_ZLIB = 1 | |
endif | |
@@ -279,17 +269,6 @@ ifdef WITH_SSL | |
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) | |
IMPORTS += GetProcessSwitchCount RunningProcess | |
INSTDEP += ca-bundle.crt | |
-else | |
-ifdef WITH_AXTLS | |
- INCLUDES += -I$(AXTLS_PATH)/inc | |
- ifdef LINK_STATIC | |
- LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT) | |
- else | |
- MODULES += libaxtls.nlm | |
- IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp | |
- endif | |
- INSTDEP += ca-bundle.crt | |
-endif | |
endif | |
ifdef WITH_ZLIB | |
INCLUDES += -I$(ZLIB_PATH) | |
@@ -671,10 +650,6 @@ endif | |
ifdef WITH_SPNEGO | |
@echo $(DL)#define HAVE_SPNEGO 1$(DL) >> $@ | |
endif | |
-else | |
-ifdef WITH_AXTLS | |
- @echo $(DL)#define USE_AXTLS 1$(DL) >> $@ | |
-endif | |
endif | |
ifdef WITH_SSH2 | |
@echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@ | |
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in | |
index 8b150ed88..870d6b9c0 100644 | |
--- a/packages/OS400/curl.inc.in | |
+++ b/packages/OS400/curl.inc.in | |
@@ -1594,7 +1594,7 @@ | |
d c 8 | |
d CURLSSLBACKEND_DARWINSSL... | |
d c 9 | |
- d CURLSSLBACKEND_AXTLS... | |
+ d CURLSSLBACKEND_OBSOLETE5... | |
d c 10 | |
d CURLSSLBACKEND_MBEDTLS... | |
d c 11 | |
diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp | |
index ba70de317..01d6e35e7 100644 | |
--- a/packages/Symbian/group/libcurl.mmp | |
+++ b/packages/Symbian/group/libcurl.mmp | |
@@ -35,7 +35,7 @@ SOURCE \ | |
socks_sspi.c curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c \ | |
pop3.c smtp.c pingpong.c rtsp.c curl_threads.c warnless.c hmac.c \ | |
vtls/polarssl.c curl_rtmp.c openldap.c curl_gethostname.c gopher.c \ | |
- vtls/axtls.c idn_win32.c vtls/cyassl.c http_proxy.c non-ascii.c \ | |
+ idn_win32.c vtls/cyassl.c http_proxy.c non-ascii.c \ | |
asyn-ares.c asyn-thread.c curl_gssapi.c http_ntlm.c curl_ntlm_wb.c \ | |
curl_ntlm_core.c curl_sasl.c vtls/schannel.c curl_multibyte.c \ | |
vtls/darwinssl.c conncache.c curl_sasl_sspi.c smb.c curl_endian.c \ | |
diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com | |
index 90a83d588..34c4d7c8c 100644 | |
--- a/packages/vms/generate_config_vms_h_curl.com | |
+++ b/packages/vms/generate_config_vms_h_curl.com | |
@@ -325,9 +325,6 @@ $! configure defaults to USE_*, a real configure on VMS chooses different. | |
$write cvh "#ifdef USE_ARES" | |
$write cvh "#undef USE_ARES" | |
$write cvh "#endif" | |
-$write cvh "#ifdef USE_AXTLS" | |
-$write cvh "#undef USE_AXTLS" | |
-$write cvh "#endif" | |
$write cvh "#ifdef USE_CYASSL" | |
$write cvh "#undef USE_CYASSL" | |
$write cvh "#endif" | |
diff --git a/src/Makefile.netware b/src/Makefile.netware | |
index 7f58bcd64..7509c4626 100644 | |
--- a/src/Makefile.netware | |
+++ b/src/Makefile.netware | |
@@ -49,11 +49,6 @@ ifndef LIBSSH2_PATH | |
LIBSSH2_PATH = ../../libssh2-1.5.0 | |
endif | |
-# Edit the path below to point to the base of your axTLS package. | |
-ifndef AXTLS_PATH | |
-AXTLS_PATH = ../../axTLS-1.2.7 | |
-endif | |
- | |
# Edit the path below to point to the base of your libidn package. | |
ifndef LIBIDN_PATH | |
LIBIDN_PATH = ../../libidn-1.18 | |
@@ -239,14 +234,9 @@ WITH_SSH2 = 1 | |
WITH_SSL = 1 | |
WITH_ZLIB = 1 | |
endif | |
-ifeq ($(findstring -axtls,$(CFG)),-axtls) | |
-WITH_AXTLS = 1 | |
-WITH_SSL = | |
-else | |
ifeq ($(findstring -ssl,$(CFG)),-ssl) | |
WITH_SSL = 1 | |
endif | |
-endif | |
ifeq ($(findstring -zlib,$(CFG)),-zlib) | |
WITH_ZLIB = 1 | |
endif | |
@@ -293,16 +283,6 @@ ifdef WITH_SSL | |
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/ssl.$(LIBEXT) | |
LDLIBS += $(OPENSSL_PATH)/out_nw_$(LIBARCH_L)/crypto.$(LIBEXT) | |
IMPORTS += GetProcessSwitchCount RunningProcess | |
-else | |
-ifdef WITH_AXTLS | |
- # INCLUDES += -I$(AXTLS_PATH)/inc | |
- ifdef LINK_STATIC | |
- LDLIBS += $(AXTLS_PATH)/lib/libaxtls.$(LIBEXT) | |
- else | |
- MODULES += libaxtls.nlm | |
- IMPORTS += $(AXTLS_PATH)/lib/libaxtls.imp | |
- endif | |
-endif | |
endif | |
ifdef WITH_ZLIB | |
INCLUDES += -I$(ZLIB_PATH) | |
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 5dce33042..57f86878e 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..4f2f40cc4 100644 | |
--- a/tests/unit/unit1397.c | |
+++ b/tests/unit/unit1397.c | |
@@ -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 */ | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment