Skip to content

Commit bda9c12

Browse files
Eric Wonggitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 3e440ea commit bda9c12

File tree

3 files changed

+63
-1
lines changed

3 files changed

+63
-1
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3215,6 +3215,9 @@ $(SP_OBJ): %.sp: %.c %.o
32153215
sparse: $(SP_OBJ)
32163216

32173217
EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
3218+
ifndef OPENSSL_SHA1
3219+
EXCEPT_HDRS += sha1/openssl.h
3220+
endif
32183221
ifndef OPENSSL_SHA256
32193222
EXCEPT_HDRS += sha256/openssl.h
32203223
endif

hash-ll.h

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@
44
#if defined(SHA1_APPLE)
55
#include <CommonCrypto/CommonDigest.h>
66
#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
812
#elif defined(SHA1_DC)
913
#include "sha1dc_git.h"
1014
#else /* SHA1_BLK */
@@ -45,6 +49,10 @@
4549
#define git_SHA1_Update platform_SHA1_Update
4650
#define git_SHA1_Final platform_SHA1_Final
4751

52+
#ifdef platform_SHA1_Clone
53+
#define git_SHA1_Clone platform_SHA1_Clone
54+
#endif
55+
4856
#ifndef platform_SHA256_CTX
4957
#define platform_SHA256_CTX SHA256_CTX
5058
#define platform_SHA256_Init SHA256_Init
@@ -67,10 +75,12 @@
6775
#define git_SHA1_Update git_SHA1_Update_Chunked
6876
#endif
6977

78+
#ifndef SHA1_NEEDS_CLONE_HELPER
7079
static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src)
7180
{
7281
memcpy(dst, src, sizeof(*dst));
7382
}
83+
#endif
7484

7585
#ifndef SHA256_NEEDS_CLONE_HELPER
7686
static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src)

sha1/openssl.h

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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 */

0 commit comments

Comments
 (0)