summaryrefslogtreecommitdiffstats
path: root/sha1/openssl.h
diff options
context:
space:
mode:
authorTaylor Blau <me@ttaylorr.com>2024-09-26 17:22:44 +0200
committerJunio C Hamano <gitster@pobox.com>2024-09-27 20:27:47 +0200
commit4c61a1d040b2b0ce4fa88d89e3169f6e766d4134 (patch)
treedfd73107fbb83e40dc8034adc6d9f63aa3259d14 /sha1/openssl.h
parentpack-objects: use finalize_object_file() to rename pack/idx/etc (diff)
downloadgit-4c61a1d040b2b0ce4fa88d89e3169f6e766d4134.tar.xz
git-4c61a1d040b2b0ce4fa88d89e3169f6e766d4134.zip
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>
Diffstat (limited to 'sha1/openssl.h')
-rw-r--r--sha1/openssl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sha1/openssl.h b/sha1/openssl.h
index 006c1f4ba5..1038af47da 100644
--- a/sha1/openssl.h
+++ b/sha1/openssl.h
@@ -40,10 +40,12 @@ static inline void openssl_SHA1_Clone(struct openssl_SHA1_CTX *dst,
EVP_MD_CTX_copy_ex(dst->ectx, src->ectx);
}
+#ifndef platform_SHA_CTX
#define platform_SHA_CTX openssl_SHA1_CTX
#define platform_SHA1_Init openssl_SHA1_Init
#define platform_SHA1_Clone openssl_SHA1_Clone
#define platform_SHA1_Update openssl_SHA1_Update
#define platform_SHA1_Final openssl_SHA1_Final
+#endif
#endif /* SHA1_OPENSSL_H */