mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
3e440ea0ab
commit
bda9c12073
49
sha1/openssl.h
Normal file
49
sha1/openssl.h
Normal 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 */
|
||||
Reference in New Issue
Block a user