diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2020-02-29 12:52:55 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2020-03-01 00:28:46 +0000 |
| commit | a2ad278756d8b5d8bb5d9b3ca19b8cc242e31685 (patch) | |
| tree | 044f38e31d1e08a9a48c06d8e5fb7a92c04f4ef5 | |
| parent | 5b46790f11ff85bfed3fd5d2563bb3a07b14611b (diff) | |
| download | curl-a2ad278756d8b5d8bb5d9b3ca19b8cc242e31685.tar.gz | |
polarssl: Additional removal
Follow up to 6357a19f.
Reviewed-by: Daniel Stenberg
Closes #5004
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | lib/curl_config.h.cmake | 3 | ||||
| -rw-r--r-- | 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, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2020, 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 @@ -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, |