From 164e716330a65dc6770cace76110375a20c45dea Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 1 Feb 2018 02:18:37 +0000 Subject: hash: move SHA-1 macros to hash.h Most of the other code dealing with SHA-1 and other hashes is located in hash.h, which is in turn loaded by cache.h. Move the SHA-1 macros to hash.h as well, so we can use them in additional hash-related items in the future. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- cache.h | 25 ------------------------- 1 file changed, 25 deletions(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index d8b975a571..bfde6f757a 100644 --- a/cache.h +++ b/cache.h @@ -16,31 +16,6 @@ #include "sha1-array.h" #include "repository.h" -#ifndef platform_SHA_CTX -/* - * platform's underlying implementation of SHA-1; could be OpenSSL, - * blk_SHA, Apple CommonCrypto, etc... Note that including - * SHA1_HEADER may have already defined platform_SHA_CTX for our - * own implementations like block-sha1 and ppc-sha1, so we list - * the default for OpenSSL compatible SHA-1 implementations here. - */ -#define platform_SHA_CTX SHA_CTX -#define platform_SHA1_Init SHA1_Init -#define platform_SHA1_Update SHA1_Update -#define platform_SHA1_Final SHA1_Final -#endif - -#define git_SHA_CTX platform_SHA_CTX -#define git_SHA1_Init platform_SHA1_Init -#define git_SHA1_Update platform_SHA1_Update -#define git_SHA1_Final platform_SHA1_Final - -#ifdef SHA1_MAX_BLOCK_SIZE -#include "compat/sha1-chunked.h" -#undef git_SHA1_Update -#define git_SHA1_Update git_SHA1_Update_Chunked -#endif - #include typedef struct git_zstream { z_stream z; -- cgit v1.2.3