mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid SHA-1 functions deprecated in OpenSSL 3+

Browse Source 
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>
This commit is contained in:
Eric Wong 2023-08-01 02:54:54 +00:00 committed by Junio C Hamano
parent 3e440ea0ab
commit bda9c12073
3 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -3215,6 +3215,9 @@ $(SP_OBJ): %.sp: %.c %.o
sparse: $(SP_OBJ) sparse: $(SP_OBJ)
EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/% EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
ifndef OPENSSL_SHA1
EXCEPT_HDRS += sha1/openssl.h
endif
ifndef OPENSSL_SHA256 ifndef OPENSSL_SHA256
EXCEPT_HDRS += sha256/openssl.h EXCEPT_HDRS += sha256/openssl.h
endif endif

12
hash-ll.h
View File

@ -4,7 +4,11 @@
#if defined(SHA1_APPLE) #if defined(SHA1_APPLE)
#include <CommonCrypto/CommonDigest.h> #include <CommonCrypto/CommonDigest.h>
#elif defined(SHA1_OPENSSL) #elif defined(SHA1_OPENSSL)
#include <openssl/sha.h> # include <openssl/sha.h>
# if defined(OPENSSL_API_LEVEL) && OPENSSL_API_LEVEL >= 3
# define SHA1_NEEDS_CLONE_HELPER
# include "sha1/openssl.h"
# endif
#elif defined(SHA1_DC) #elif defined(SHA1_DC)
#include "sha1dc_git.h" #include "sha1dc_git.h"
#else /* SHA1_BLK */ #else /* SHA1_BLK */
@ -45,6 +49,10 @@
#define git_SHA1_Update platform_SHA1_Update #define git_SHA1_Update platform_SHA1_Update
#define git_SHA1_Final platform_SHA1_Final #define git_SHA1_Final platform_SHA1_Final
#ifdef platform_SHA1_Clone
#define git_SHA1_Clone platform_SHA1_Clone
#endif
#ifndef platform_SHA256_CTX #ifndef platform_SHA256_CTX
#define platform_SHA256_CTX SHA256_CTX #define platform_SHA256_CTX SHA256_CTX
#define platform_SHA256_Init SHA256_Init #define platform_SHA256_Init SHA256_Init
@ -67,10 +75,12 @@
#define git_SHA1_Update git_SHA1_Update_Chunked #define git_SHA1_Update git_SHA1_Update_Chunked
#endif #endif
#ifndef SHA1_NEEDS_CLONE_HELPER
static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src) static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src)
{ {
memcpy(dst, src, sizeof(*dst)); memcpy(dst, src, sizeof(*dst));
} }
#endif
#ifndef SHA256_NEEDS_CLONE_HELPER #ifndef SHA256_NEEDS_CLONE_HELPER
static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src) static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src)

49
sha1/openssl.h Normal file
View File

@ -0,0 +1,49 @@
/* wrappers for the EVP API of OpenSSL 3+ */
#ifndef SHA1_OPENSSL_H
#define SHA1_OPENSSL_H
#include <openssl/evp.h>
struct openssl_SHA1_CTX {
EVP_MD_CTX *ectx;
};
typedef struct openssl_SHA1_CTX openssl_SHA1_CTX;
static inline void openssl_SHA1_Init(struct openssl_SHA1_CTX *ctx)
{
const EVP_MD *type = EVP_sha1();
ctx->ectx = EVP_MD_CTX_new();
if (!ctx->ectx)
die("EVP_MD_CTX_new: out of memory");
EVP_DigestInit_ex(ctx->ectx, type, NULL);
}
static inline void openssl_SHA1_Update(struct openssl_SHA1_CTX *ctx,
const void *data,
size_t len)
{
EVP_DigestUpdate(ctx->ectx, data, len);
}
static inline void openssl_SHA1_Final(unsigned char *digest,
struct openssl_SHA1_CTX *ctx)
{
EVP_DigestFinal_ex(ctx->ectx, digest, NULL);
EVP_MD_CTX_free(ctx->ectx);
}
static inline void openssl_SHA1_Clone(struct openssl_SHA1_CTX *dst,
const struct openssl_SHA1_CTX *src)
{
EVP_MD_CTX_copy_ex(dst->ectx, src->ectx);
}
#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 /* SHA1_OPENSSL_H */