moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

polarssl: Additional removal

Browse Source 
Follow up to 6357a19f.

Reviewed-by: Daniel Stenberg
Closes #5004
This commit is contained in:
Steve Holme 2020-02-29 12:52:55 +00:00
parent 5b46790f11
commit a2ad278756
No known key found for this signature in database
GPG Key ID: 4059CB85CA7E8F19
3 changed files with 2 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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 # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -297,7 +297,7 @@ if(WIN32)
endif() endif()
# check SSL libraries # check SSL libraries
# TODO support GNUTLS, POLARSSL, CYASSL # TODO support GnuTLS and WolfSSL
if(APPLE) if(APPLE)
option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF) option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF)

3
lib/curl_config.h.cmake
View File

@ -939,9 +939,6 @@ ${SIZEOF_TIME_T_CODE}
/* if GnuTLS is enabled */ /* if GnuTLS is enabled */
#cmakedefine USE_GNUTLS 1 #cmakedefine USE_GNUTLS 1
/* if PolarSSL is enabled */
#cmakedefine USE_POLARSSL 1
/* if Secure Transport is enabled */ /* if Secure Transport is enabled */
#cmakedefine USE_SECTRANSP 1 #cmakedefine USE_SECTRANSP 1

63
src/tool_metalink.c
View File

@ -54,13 +54,6 @@
# define SHA256_CTX void * # define SHA256_CTX void *
# define HAVE_NSS_CONTEXT # define HAVE_NSS_CONTEXT
static NSSInitContext *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) && \ #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \
(__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \ (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \
(defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ (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); 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) #elif defined(USE_WIN32_CRYPTO)
static void win32_crypto_final(struct win32_crypto_hash *ctx, static void win32_crypto_final(struct win32_crypto_hash *ctx,