avoid SHA-1 functions deprecated in OpenSSL 3+
OpenSSL 3+ deprecates the SHA1_Init, SHA1_Update, and SHA1_Final functions, leading to errors when building with `DEVELOPER=1'. Use the newer EVP_* API with OpenSSL 3+ (only) despite being more error-prone and less efficient due to heap allocations. Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Wong committed
Aug 1, 2023 at 02:54 UTC
bda9c12073e786e2ffa2c3ec479c7fe098d49999
3 files changed
+63
-1
Makefile
+3
@@ -3215,6 +3215,9 @@ $(SP_OBJ): %.sp: %.c %.o
3215
sparse: $(SP_OBJ)
3216
3217
EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
3218
+ifndef OPENSSL_SHA1
3219
+ EXCEPT_HDRS += sha1/openssl.h
3220
+endif
3221
ifndef OPENSSL_SHA256
3222
EXCEPT_HDRS += sha256/openssl.h
3223
endif
hash-ll.h
+11
-1
@@ -4,7 +4,11 @@
4
#if defined(SHA1_APPLE)
5
#include <CommonCrypto/CommonDigest.h>
6
#elif defined(SHA1_OPENSSL)
7
-#include <openssl/sha.h>
7
+# include <openssl/sha.h>
8
+# if defined(OPENSSL_API_LEVEL) && OPENSSL_API_LEVEL >= 3
9
+# define SHA1_NEEDS_CLONE_HELPER
10
+# include "sha1/openssl.h"
11
+# endif
12
#elif defined(SHA1_DC)
13
#include "sha1dc_git.h"
14
#else /* SHA1_BLK */
@@ -45,6 +49,10 @@
49
#define git_SHA1_Update platform_SHA1_Update
50
#define git_SHA1_Final platform_SHA1_Final
51
52
+#ifdef platform_SHA1_Clone
53
+#define git_SHA1_Clone platform_SHA1_Clone
54
+#endif
55
+
56
#ifndef platform_SHA256_CTX
57
#define platform_SHA256_CTX SHA256_CTX
58
#define platform_SHA256_Init SHA256_Init
@@ -67,10 +75,12 @@
75
#define git_SHA1_Update git_SHA1_Update_Chunked
76
#endif
77
78
+#ifndef SHA1_NEEDS_CLONE_HELPER
79
static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src)
80
{
81
memcpy(dst, src, sizeof(*dst));
82
}
83
+#endif
84
85
#ifndef SHA256_NEEDS_CLONE_HELPER
86
static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src)
sha1/openssl.h
new
+49
@@ -0,0 +1,49 @@
1
+/* wrappers for the EVP API of OpenSSL 3+ */
2
+#ifndef SHA1_OPENSSL_H
3
+#define SHA1_OPENSSL_H
4
+#include <openssl/evp.h>
5
+
6
+struct openssl_SHA1_CTX {
7
+ EVP_MD_CTX *ectx;
8
+};
9
+
10
+typedef struct openssl_SHA1_CTX openssl_SHA1_CTX;
11
+
12
+static inline void openssl_SHA1_Init(struct openssl_SHA1_CTX *ctx)
13
+{
14
+ const EVP_MD *type = EVP_sha1();
15
+
16
+ ctx->ectx = EVP_MD_CTX_new();
17
+ if (!ctx->ectx)
18
+ die("EVP_MD_CTX_new: out of memory");
19
+
20
+ EVP_DigestInit_ex(ctx->ectx, type, NULL);
21
+}
22
+
23
+static inline void openssl_SHA1_Update(struct openssl_SHA1_CTX *ctx,
24
+ const void *data,
25
+ size_t len)
26
+{
27
+ EVP_DigestUpdate(ctx->ectx, data, len);
28
+}
29
+
30
+static inline void openssl_SHA1_Final(unsigned char *digest,
31
+ struct openssl_SHA1_CTX *ctx)
32
+{
33
+ EVP_DigestFinal_ex(ctx->ectx, digest, NULL);
34
+ EVP_MD_CTX_free(ctx->ectx);
35
+}
36
+
37
+static inline void openssl_SHA1_Clone(struct openssl_SHA1_CTX *dst,
38
+ const struct openssl_SHA1_CTX *src)
39
+{
40
+ EVP_MD_CTX_copy_ex(dst->ectx, src->ectx);
41
+}
42
+
43
+#define platform_SHA_CTX openssl_SHA1_CTX
44
+#define platform_SHA1_Init openssl_SHA1_Init
45
+#define platform_SHA1_Clone openssl_SHA1_Clone
46
+#define platform_SHA1_Update openssl_SHA1_Update
47
+#define platform_SHA1_Final openssl_SHA1_Final
48
+
49
+#endif /* SHA1_OPENSSL_H */