diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-08-10 02:18:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-10 02:18:15 +0300 |
| commit | 889c94d2a0f4041c8237044db1d7ffd0190a2e0f (patch) | |
| tree | c4f0e1a013df679d987fa4f20e1bbe530b0df016 /Makefile | |
| parent | a82fb66fed250e16d3010c75404503bea3f0ab61 (diff) | |
| parent | bda9c12073e786e2ffa2c3ec479c7fe098d49999 (diff) | |
Merge branch 'ew/hash-with-openssl-evp'
Adjust to OpenSSL 3+, which deprecates its SHA-1 functions based on
its traditional API, by using its EVP API instead.
* ew/hash-with-openssl-evp:
avoid SHA-1 functions deprecated in OpenSSL 3+
sha256: avoid functions deprecated in OpenSSL 3+
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -3216,6 +3216,12 @@ $(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 ifndef NETTLE_SHA256 EXCEPT_HDRS += sha256/nettle.h endif |