From b572e0be59d2e36b015166897467d0b7284746a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 3 Mar 2020 08:38:09 +0100 Subject: Revert "sha256: Added SecureTransport implementation" This reverts commit 4feb38deed33fed14ff7c370a6a9153c661dbb9c (from #4956) That commit broke test 1610 on macos builds without TLS. Closes #5027 --- lib/sha256.c | 70 ------------------------------------------------------------ 1 file changed, 70 deletions(-) (limited to 'lib/sha256.c') diff --git a/lib/sha256.c b/lib/sha256.c index 1ef33148d..97214182b 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -161,76 +161,6 @@ static void SHA256_Final(unsigned char *digest, SHA256_CTX *ctx) #endif } -#elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ - (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \ - (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ - (__IPHONE_OS_VERSION_MAX_ALLOWED >= 20000)) - -#include - -#include "curl_memory.h" - -/* The last #include file should be: */ -#include "memdebug.h" - -typedef CC_SHA256_CTX SHA256_CTX; - -static void SHA256_Init(SHA256_CTX *ctx) -{ - (void) CC_SHA224_Init(ctx); -} - -static void SHA256_Update(SHA256_CTX *ctx, - const unsigned char *data, - unsigned int length) -{ - (void) CC_SHA256_Update(ctx, data, length); -} - -static void SHA256_Final(unsigned char *digest, SHA256_CTX *ctx) -{ - (void) CC_SHA256_Final(digest, ctx); -} - -#elif defined(USE_WIN32_CRYPTO) - -#include - -typedef struct { - HCRYPTPROV hCryptProv; - HCRYPTHASH hHash; -} SHA256_CTX; - -static void SHA256_Init(SHA256_CTX *ctx) -{ - if(CryptAcquireContext(&ctx->hCryptProv, NULL, NULL, - PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) { - CryptCreateHash(ctx->hCryptProv, CALG_SHA_256, 0, 0, &ctx->hHash); - } -} - -static void SHA256_Update(SHA256_CTX *ctx, - const unsigned char *data, - unsigned int length) -{ - CryptHashData(ctx->hHash, (unsigned char *) data, length, 0); -} - -static void SHA256_Final(unsigned char *digest, SHA256_CTX *ctx) -{ - unsigned long length; - - CryptGetHashParam(ctx->hHash, HP_HASHVAL, NULL, &length, 0); - if(length == SHA256_DIGEST_LENGTH) - CryptGetHashParam(ctx->hHash, HP_HASHVAL, digest, &length, 0); - - if(ctx->hHash) - CryptDestroyHash(ctx->hHash); - - if(ctx->hCryptProv) - CryptReleaseContext(ctx->hCryptProv, 0); -} - #else /* When no other crypto library is available we use this code segment */ -- cgit v1.2.3