From bda9c12073e786e2ffa2c3ec479c7fe098d49999 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 1 Aug 2023 02:54:54 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 29f6d3b31e..e9197b4acc 100644 --- a/Makefile +++ b/Makefile @@ -3215,6 +3215,9 @@ $(SP_OBJ): %.sp: %.c %.o sparse: $(SP_OBJ) EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/% +ifndef OPENSSL_SHA1 + EXCEPT_HDRS += sha1/openssl.h +endif ifndef OPENSSL_SHA256 EXCEPT_HDRS += sha256/openssl.h endif -- cgit v1.3