freshlybakedca.ke / git
Git fork
fork atom

sha1: do not redefine `platform_SHA_CTX` and friends

Our in-tree SHA-1 wrappers all define platform_SHA_CTX and related
macros to point at the opaque "context" type, init, update, and similar
functions for each specific implementation.

In hash.h, we use these platform_ variables to set up the function
pointers for, e.g., the_hash_algo->init_fn(), etc.

But while these header files have a header-specific macro that prevents
them declaring their structs / functions multiple times, they
unconditionally define the platform variables, making it impossible to
load multiple SHA-1 implementations at once.

As a prerequisite for loading a separate SHA-1 implementation for
non-cryptographic uses, only define the platform_ variables if they have
not already been defined.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Taylor Blau and committed by
Junio C Hamano 4c61a1d0 c177d3dc

+7
+2
block-sha1/sha1.h
··· 16 16 void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, size_t len); 17 17 void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx); 18 18 19 + #ifndef platform_SHA_CTX 19 20 #define platform_SHA_CTX blk_SHA_CTX 20 21 #define platform_SHA1_Init blk_SHA1_Init 21 22 #define platform_SHA1_Update blk_SHA1_Update 22 23 #define platform_SHA1_Final blk_SHA1_Final 24 + #endif
+2
sha1/openssl.h
··· 40 40 EVP_MD_CTX_copy_ex(dst->ectx, src->ectx); 41 41 } 42 42 43 + #ifndef platform_SHA_CTX 43 44 #define platform_SHA_CTX openssl_SHA1_CTX 44 45 #define platform_SHA1_Init openssl_SHA1_Init 45 46 #define platform_SHA1_Clone openssl_SHA1_Clone 46 47 #define platform_SHA1_Update openssl_SHA1_Update 47 48 #define platform_SHA1_Final openssl_SHA1_Final 49 + #endif 48 50 49 51 #endif /* SHA1_OPENSSL_H */
+3
sha1dc_git.h
··· 18 18 void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, unsigned long len); 19 19 20 20 #define platform_SHA_IS_SHA1DC /* used by "test-tool sha1-is-sha1dc" */ 21 + 22 + #ifndef platform_SHA_CTX 21 23 #define platform_SHA_CTX SHA1_CTX 22 24 #define platform_SHA1_Init git_SHA1DCInit 23 25 #define platform_SHA1_Update git_SHA1DCUpdate 24 26 #define platform_SHA1_Final git_SHA1DCFinal 27 + #endif