kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sha256: avoid functions deprecated in OpenSSL 3+ 

OpenSSL 3+ deprecates the SHA256_Init, SHA256_Update, and SHA256_Final
functions, leading to errors when building with `DEVELOPER=1'.

Use the newer EVP_* API with OpenSSL 3+ 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>
maint
Eric Wong 2023-08-01 02:54:53 +00:00 committed by Junio C Hamano
parent fb7d80edca
commit 3e440ea0ab
3 changed files with 57 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_SHA256
EXCEPT_HDRS += sha256/openssl.h
endif
ifndef NETTLE_SHA256 ifndef NETTLE_SHA256
EXCEPT_HDRS += sha256/nettle.h EXCEPT_HDRS += sha256/nettle.h
endif endif

6
hash-ll.h
View File

@ -17,7 +17,11 @@
#define SHA256_NEEDS_CLONE_HELPER #define SHA256_NEEDS_CLONE_HELPER
#include "sha256/gcrypt.h" #include "sha256/gcrypt.h"
#elif defined(SHA256_OPENSSL) #elif defined(SHA256_OPENSSL)
#include <openssl/sha.h> # include <openssl/sha.h>
# if defined(OPENSSL_API_LEVEL) && OPENSSL_API_LEVEL >= 3
# define SHA256_NEEDS_CLONE_HELPER
# include "sha256/openssl.h"
# endif
#else #else
#include "sha256/block/sha256.h" #include "sha256/block/sha256.h"
#endif #endif

49
sha256/openssl.h Normal file
View File

@ -0,0 +1,49 @@
/* wrappers for the EVP API of OpenSSL 3+ */
#ifndef SHA256_OPENSSL_H
#define SHA256_OPENSSL_H
#include <openssl/evp.h>

struct openssl_SHA256_CTX {
EVP_MD_CTX *ectx;
};

typedef struct openssl_SHA256_CTX openssl_SHA256_CTX;

static inline void openssl_SHA256_Init(struct openssl_SHA256_CTX *ctx)
{
const EVP_MD *type = EVP_sha256();

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_SHA256_Update(struct openssl_SHA256_CTX *ctx,
const void *data,
size_t len)
{
EVP_DigestUpdate(ctx->ectx, data, len);
}

static inline void openssl_SHA256_Final(unsigned char *digest,
struct openssl_SHA256_CTX *ctx)
{
EVP_DigestFinal_ex(ctx->ectx, digest, NULL);
EVP_MD_CTX_free(ctx->ectx);
}

static inline void openssl_SHA256_Clone(struct openssl_SHA256_CTX *dst,
const struct openssl_SHA256_CTX *src)
{
EVP_MD_CTX_copy_ex(dst->ectx, src->ectx);
}

#define platform_SHA256_CTX openssl_SHA256_CTX
#define platform_SHA256_Init openssl_SHA256_Init
#define platform_SHA256_Clone openssl_SHA256_Clone
#define platform_SHA256_Update openssl_SHA256_Update
#define platform_SHA256_Final openssl_SHA256_Final

#endif /* SHA256_OPENSSL_H */