[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnurl] 190/282: polarssl: Additional removal
From: |
gnunet |
Subject: |
[gnurl] 190/282: polarssl: Additional removal |
Date: |
Wed, 01 Apr 2020 14:30:55 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit a2ad278756d8b5d8bb5d9b3ca19b8cc242e31685
Author: Steve Holme <address@hidden>
AuthorDate: Sat Feb 29 12:52:55 2020 +0000
polarssl: Additional removal
Follow up to 6357a19f.
Reviewed-by: Daniel Stenberg
Closes #5004
---
CMakeLists.txt | 4 ++--
lib/curl_config.h.cmake | 3 ---
src/tool_metalink.c | 63 -------------------------------------------------
3 files changed, 2 insertions(+), 68 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 432837c5a..b13616fc7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+# Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -297,7 +297,7 @@ if(WIN32)
endif()
# check SSL libraries
-# TODO support GNUTLS, POLARSSL, CYASSL
+# TODO support GnuTLS and WolfSSL
if(APPLE)
option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF)
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 1f6c3154f..fda0926b5 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -939,9 +939,6 @@ ${SIZEOF_TIME_T_CODE}
/* if GnuTLS is enabled */
#cmakedefine USE_GNUTLS 1
-/* if PolarSSL is enabled */
-#cmakedefine USE_POLARSSL 1
-
/* if Secure Transport is enabled */
#cmakedefine USE_SECTRANSP 1
diff --git a/src/tool_metalink.c b/src/tool_metalink.c
index 7acbb7a07..f87f686f1 100644
--- a/src/tool_metalink.c
+++ b/src/tool_metalink.c
@@ -54,13 +54,6 @@
# define SHA256_CTX void *
# define HAVE_NSS_CONTEXT
static NSSInitContext *nss_context;
-#elif defined(USE_POLARSSL)
-# include <polarssl/md5.h>
-# include <polarssl/sha1.h>
-# include <polarssl/sha256.h>
-# define MD5_CTX md5_context
-# define SHA_CTX sha1_context
-# define SHA256_CTX sha256_context
#elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
(__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \
(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \
@@ -325,62 +318,6 @@ static void SHA256_Final(unsigned char digest[32],
SHA256_CTX *pctx)
nss_hash_final(pctx, digest, 32);
}
-#elif defined(USE_POLARSSL)
-
-static int MD5_Init(MD5_CTX *ctx)
-{
- md5_starts(ctx);
- return 1;
-}
-
-static void MD5_Update(MD5_CTX *ctx,
- const unsigned char *input,
- unsigned int inputLen)
-{
- md5_update(ctx, input, inputLen);
-}
-
-static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx)
-{
- md5_finish(ctx, digest);
-}
-
-static int SHA1_Init(SHA_CTX *ctx)
-{
- sha1_starts(ctx);
- return 1;
-}
-
-static void SHA1_Update(SHA_CTX *ctx,
- const unsigned char *input,
- unsigned int inputLen)
-{
- sha1_update(ctx, input, inputLen);
-}
-
-static void SHA1_Final(unsigned char digest[20], SHA_CTX *ctx)
-{
- sha1_finish(ctx, digest);
-}
-
-static int SHA256_Init(SHA256_CTX *ctx)
-{
- sha256_starts(ctx, 0); /* 0 = sha256 */
- return 1;
-}
-
-static void SHA256_Update(SHA256_CTX *ctx,
- const unsigned char *input,
- unsigned int inputLen)
-{
- sha256_update(ctx, input, inputLen);
-}
-
-static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx)
-{
- sha256_finish(ctx, digest);
-}
-
#elif defined(USE_WIN32_CRYPTO)
static void win32_crypto_final(struct win32_crypto_hash *ctx,
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [gnurl] 183/282: TODO: curl --proxycommand, (continued)
- [gnurl] 183/282: TODO: curl --proxycommand, gnunet, 2020/04/01
- [gnurl] 179/282: ci/tests: align Azure Pipeline job names with each other, gnunet, 2020/04/01
- [gnurl] 182/282: smtp: overwriting 'from' leaks memory, gnunet, 2020/04/01
- [gnurl] 186/282: md4: Use non-deprecated functions in mbedTLS >= 2.7.0, gnunet, 2020/04/01
- [gnurl] 180/282: ci/tests: Increase timeouts of Windows builds due to new tests, gnunet, 2020/04/01
- [gnurl] 184/282: pause: force-drain the transfer on unpause, gnunet, 2020/04/01
- [gnurl] 181/282: CIfuzz: switch off 'dry_run' mode, gnunet, 2020/04/01
- [gnurl] 178/282: ci/tests: Add Windows builds via Azure Pipelines using Docker, gnunet, 2020/04/01
- [gnurl] 191/282: runtests: fix output to command log, gnunet, 2020/04/01
- [gnurl] 187/282: md5: Use pointer notation for array parameters in GnuTLS implementation, gnunet, 2020/04/01
- [gnurl] 190/282: polarssl: Additional removal,
gnunet <=
- [gnurl] 170/282: http2: make pausing/unpausing set/clear local stream window, gnunet, 2020/04/01
- [gnurl] 168/282: tests: Automatically deduce the tool name from the test case for unit tests, gnunet, 2020/04/01
- [gnurl] 185/282: ci/tests: Send test results to Azure DevOps for reporting, gnunet, 2020/04/01
- [gnurl] 189/282: docs: fix typo on CURLINFO_RETRY_AFTER - alwaus -> always, gnunet, 2020/04/01
- [gnurl] 194/282: ci/tests: Make sure that the AZURE_ACCESS_TOKEN is available, gnunet, 2020/04/01
- [gnurl] 197/282: configure.ac: Disable metalink support if an incompatible SSL/TLS specified, gnunet, 2020/04/01
- [gnurl] 196/282: ci/tests: Update Azure DevOps pipeline job display names, gnunet, 2020/04/01
- [gnurl] 195/282: ci/tests: Fix typo in previous commit 597cf2, gnunet, 2020/04/01
- [gnurl] 202/282: altsvc: both h3 backends now speak h3-27, gnunet, 2020/04/01
- [gnurl] 198/282: unit1651: Fixed conversion compilation warning, gnunet, 2020/04/01