mirror of
https://github.com/git/git
synced 2024-06-30 22:54:27 +00:00
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+
This commit is contained in:
commit
889c94d2a0
6
Makefile
6
Makefile
|
@ -3216,6 +3216,12 @@ $(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
|
||||||
|
EXCEPT_HDRS += sha256/openssl.h
|
||||||
|
endif
|
||||||
ifndef NETTLE_SHA256
|
ifndef NETTLE_SHA256
|
||||||
EXCEPT_HDRS += sha256/nettle.h
|
EXCEPT_HDRS += sha256/nettle.h
|
||||||
endif
|
endif
|
||||||
|
|
18
hash-ll.h
18
hash-ll.h
|
@ -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 */
|
||||||
|
@ -17,7 +21,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
|
||||||
|
@ -41,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
|
||||||
|
@ -63,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
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 */
|
49
sha256/openssl.h
Normal file
49
sha256/openssl.h
Normal 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 */
|
Loading…
Reference in New Issue
Block a user