@matheusbsbs / matheus-bagliano / commits / 4c61a1d040

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>

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