From 52d302ed64822347de132e50027aaa35f23b145b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 4 Mar 2020 14:50:11 +0100 Subject: [PATCH] polarssl: remove more references and mentions Assisted-by: Jay Satiro Follow-up to 6357a19ff29dac04 Closes #5036 --- acinclude.m4 | 10 +++++----- docs/INSTALL.md | 1 - docs/INTERNALS.md | 1 - docs/libcurl/curl_global_sslset.3 | 4 ++-- docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 | 14 ++++++-------- docs/libcurl/opts/CURLOPT_CAPATH.3 | 7 +++---- docs/libcurl/symbols-in-versions | 2 +- lib/vtls/schannel.c | 10 ---------- packages/Symbian/group/libcurl.mmp | 2 +- packages/vms/generate_config_vms_h_curl.com | 5 +---- tests/runtests.pl | 5 ----- 11 files changed, 19 insertions(+), 42 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 24dad3914..3ad55c388 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -2174,8 +2174,8 @@ AC_HELP_STRING([--without-ca-bundle], [Don't use a default CA bundle]), AC_ARG_WITH(ca-path, AC_HELP_STRING([--with-ca-path=DIRECTORY], [Path to a directory containing CA certificates stored individually, with \ -their filenames in a hash format. This option can be used with OpenSSL, \ -GnuTLS and PolarSSL backends. Refer to OpenSSL c_rehash for details. \ +their filenames in a hash format. This option can be used with the OpenSSL, \ +GnuTLS and mbedTLS backends. Refer to OpenSSL c_rehash for details. \ (example: /etc/certificates)]) AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), [ @@ -2201,8 +2201,8 @@ AC_HELP_STRING([--without-ca-path], [Don't use a default CA path]), capath="no" elif test "x$want_capath" != "xno" -a "x$want_capath" != "xunset"; then dnl --with-ca-path given - if test "x$OPENSSL_ENABLED" != "x1" -a "x$GNUTLS_ENABLED" != "x1" -a "x$POLARSSL_ENABLED" != "x1"; then - AC_MSG_ERROR([--with-ca-path only works with OpenSSL, GnuTLS or PolarSSL]) + if test "x$OPENSSL_ENABLED" != "x1" -a "x$GNUTLS_ENABLED" != "x1" -a "x$MBEDTLS_ENABLED" != "x1"; then + AC_MSG_ERROR([--with-ca-path only works with OpenSSL, GnuTLS or mbedTLS]) fi capath="$want_capath" ca="no" diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 380f3b38e..63d41421b 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -115,7 +115,6 @@ libressl. - GnuTLS: `--without-ssl --with-gnutls`. - wolfSSL: `--without-ssl --with-wolfssl` - NSS: `--without-ssl --with-nss` - - PolarSSL: `--without-ssl --with-polarssl` - mbedTLS: `--without-ssl --with-mbedtls` - schannel: `--without-ssl --with-schannel` - secure transport: `--without-ssl --with-secure-transport` diff --git a/docs/INTERNALS.md b/docs/INTERNALS.md index 9fb0733bb..add8b417f 100644 --- a/docs/INTERNALS.md +++ b/docs/INTERNALS.md @@ -95,7 +95,6 @@ Dependencies - MIT Kerberos 1.2.4 - GSKit V5R3M0 - NSS 3.14.x - - PolarSSL 1.3.0 - Heimdal ? - nghttp2 1.12.0 diff --git a/docs/libcurl/curl_global_sslset.3 b/docs/libcurl/curl_global_sslset.3 index b3a6967c6..fa2447e6f 100644 --- a/docs/libcurl/curl_global_sslset.3 +++ b/docs/libcurl/curl_global_sslset.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -37,7 +37,7 @@ typedef enum { CURLSSLBACKEND_GNUTLS = 2, CURLSSLBACKEND_NSS = 3, CURLSSLBACKEND_GSKIT = 5, - CURLSSLBACKEND_POLARSSL = 6, + CURLSSLBACKEND_POLARSSL = 6, /* deprecated */ CURLSSLBACKEND_WOLFSSL = 7, CURLSSLBACKEND_SCHANNEL = 8, CURLSSLBACKEND_DARWINSSL = 9, diff --git a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 index 6abebd32f..d68a5bcba 100644 --- a/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 +++ b/docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -54,11 +54,11 @@ 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_WOLFSSL, CURLSSLBACKEND_DARWINSSL, -CURLSSLBACKEND_GNUTLS, CURLSSLBACKEND_GSKIT, CURLSSLBACKEND_MBEDTLS, -CURLSSLBACKEND_NSS, CURLSSLBACKEND_OPENSSL, CURLSSLBACKEND_POLARSSL, -CURLSSLBACKEND_SCHANNEL or CURLSSLBACKEND_MESALINK. (Note that the OpenSSL -forks are all reported as just OpenSSL here.) +CURLSSLBACKEND_WOLFSSL, CURLSSLBACKEND_DARWINSSL, CURLSSLBACKEND_GNUTLS, +CURLSSLBACKEND_GSKIT, CURLSSLBACKEND_MBEDTLS, CURLSSLBACKEND_NSS, +CURLSSLBACKEND_OPENSSL, CURLSSLBACKEND_SCHANNEL or +CURLSSLBACKEND_MESALINK. (Note that the OpenSSL forks are all reported as just +OpenSSL here.) The \fIinternals\fP struct member will point to a TLS library specific pointer for the active ("in use") SSL connection, with the following underlying types: @@ -79,8 +79,6 @@ as well: .RS .IP mbedTLS mbedtls_ssl_context * -.IP PolarSSL -ssl_context * .IP "Secure Channel" CtxtHandle * .IP "Secure Transport" diff --git a/docs/libcurl/opts/CURLOPT_CAPATH.3 b/docs/libcurl/opts/CURLOPT_CAPATH.3 index 183428ffc..b648cc771 100644 --- a/docs/libcurl/opts/CURLOPT_CAPATH.3 +++ b/docs/libcurl/opts/CURLOPT_CAPATH.3 @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -54,9 +54,8 @@ if(curl) { } .fi .SH AVAILABILITY -This option is supported by the OpenSSL, GnuTLS, PolarSSL and mbedTLS -(since 7.56.0) backends. The NSS backend provides the option only for -backward compatibility. +This option is supported by the OpenSSL, GnuTLS and mbedTLS (since 7.56.0) +backends. The NSS backend provides the option only for backward compatibility. .SH RETURN VALUE CURLE_OK if supported; or an error such as: diff --git a/docs/libcurl/symbols-in-versions b/docs/libcurl/symbols-in-versions index 0469d08cf..93930c435 100644 --- a/docs/libcurl/symbols-in-versions +++ b/docs/libcurl/symbols-in-versions @@ -736,7 +736,7 @@ CURLSSLBACKEND_MESALINK 7.62.0 CURLSSLBACKEND_NONE 7.34.0 CURLSSLBACKEND_NSS 7.34.0 CURLSSLBACKEND_OPENSSL 7.34.0 -CURLSSLBACKEND_POLARSSL 7.34.0 +CURLSSLBACKEND_POLARSSL 7.34.0 7.69.0 CURLSSLBACKEND_QSOSSL 7.34.0 - 7.38.1 CURLSSLBACKEND_SCHANNEL 7.34.0 CURLSSLBACKEND_SECURETRANSPORT 7.64.1 diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c index 0818d947a..f665ee340 100644 --- a/lib/vtls/schannel.c +++ b/lib/vtls/schannel.c @@ -27,16 +27,6 @@ * but vtls.c should ever call or use these functions. */ -/* - * Based upon the PolarSSL implementation in polarssl.c and polarssl.h: - * Copyright (C) 2010, 2011, Hoi-Ho Chan, - * - * Based upon the CyaSSL implementation in cyassl.c and cyassl.h: - * Copyright (C) 1998 - 2012, Daniel Stenberg, , et al. - * - * Thanks for code and inspiration! - */ - #include "curl_setup.h" #ifdef USE_SCHANNEL diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index 6e94d8489..3cbea6093 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -34,7 +34,7 @@ SOURCE \ ssh.c vtls/nss.c strcase.c curl_addrinfo.c socks_gssapi.c \ 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 \ + curl_rtmp.c openldap.c curl_gethostname.c gopher.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 \ diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com index 809aaaf98..6c65b24cb 100644 --- a/packages/vms/generate_config_vms_h_curl.com +++ b/packages/vms/generate_config_vms_h_curl.com @@ -17,7 +17,7 @@ $! and the [.lib]config-vms.h file do two different tasks and that the $! filenames are slightly different. $! $! -$! Copyright 2013, John Malmberg +$! Copyright 2013 - 2020, John Malmberg $! $! Permission to use, copy, modify, and/or distribute this software for any $! purpose with or without fee is hereby granted, provided that the above @@ -349,9 +349,6 @@ $write cvh "#endif" $write cvh "#ifdef USE_OPENLDAP" $write cvh "#undef USE_OPENLDAP" $write cvh "#endif" -$write cvh "#ifdef USE_POLARSSL" -$write cvh "#undef USE_POLARSSL" -$write cvh "#endif" $write cvh "#ifdef USE_THREADS_POSIX" $write cvh "#undef USE_THREADS_POSIX" $write cvh "#endif" diff --git a/tests/runtests.pl b/tests/runtests.pl index 50c868390..827fdec50 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -253,7 +253,6 @@ 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_polarssl; # built with polarssl my $has_winssl; # built with WinSSL (Secure Channel aka Schannel) my $has_darwinssl; # built with DarwinSSL (Secure Transport) my $has_boringssl; # built with BoringSSL @@ -2745,10 +2744,6 @@ sub checksystem { $has_wolfssl=1; $has_sslpinning=1; } - elsif ($libcurl =~ /polarssl/i) { - $has_polarssl=1; - $has_sslpinning=1; - } elsif ($libcurl =~ /securetransport/i) { $has_darwinssl=1; $has_sslpinning=1;