undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bc/nettle-sha256'

Browse Source 
Support for libnettle as SHA256 implementation has been added.

* bc/nettle-sha256:
  sha256: add support for Nettle
This commit is contained in:
Junio C Hamano 2022-07-18 13:31:57 -07:00
commit 4af2138417
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -182,6 +182,8 @@ include shared.mak
#
# Define BLK_SHA256 to use the built-in SHA-256 routines.
#
# Define NETTLE_SHA256 to use the SHA-256 routines in libnettle.
#
# Define GCRYPT_SHA256 to use the SHA-256 routines in libgcrypt.
#
# Define OPENSSL_SHA256 to use the SHA-256 routines in OpenSSL.
@ -1848,6 +1850,10 @@ ifdef OPENSSL_SHA256
EXTLIBS += $(LIB_4_CRYPTO)
BASIC_CFLAGS += -DSHA256_OPENSSL
else
ifdef NETTLE_SHA256
BASIC_CFLAGS += -DSHA256_NETTLE
EXTLIBS += -lnettle
else
ifdef GCRYPT_SHA256
BASIC_CFLAGS += -DSHA256_GCRYPT
EXTLIBS += -lgcrypt
@ -1856,6 +1862,7 @@ else
BASIC_CFLAGS += -DSHA256_BLK
endif
endif
endif
ifdef SHA1_MAX_BLOCK_SIZE
LIB_OBJS += compat/sha1-chunked.o
@ -3094,6 +3101,9 @@ $(SP_OBJ): %.sp: %.c %.o
sparse: $(SP_OBJ)
EXCEPT_HDRS := $(GENERATED_H) unicode-width.h compat/% xdiff/%
ifndef NETTLE_SHA256
EXCEPT_HDRS += sha256/nettle.h
endif
ifndef GCRYPT_SHA256
EXCEPT_HDRS += sha256/gcrypt.h
endif

4
hash.h
View File

@ -16,7 +16,9 @@
#include "block-sha1/sha1.h"
#endif
#if defined(SHA256_GCRYPT)
#if defined(SHA256_NETTLE)
#include "sha256/nettle.h"
#elif defined(SHA256_GCRYPT)
#define SHA256_NEEDS_CLONE_HELPER
#include "sha256/gcrypt.h"
#elif defined(SHA256_OPENSSL)

31
sha256/nettle.h Normal file
View File

@ -0,0 +1,31 @@
#ifndef SHA256_NETTLE_H
#define SHA256_NETTLE_H
#include <nettle/sha2.h>
typedef struct sha256_ctx nettle_SHA256_CTX;
static inline void nettle_SHA256_Init(nettle_SHA256_CTX *ctx)
{
sha256_init(ctx);
}
static inline void nettle_SHA256_Update(nettle_SHA256_CTX *ctx,
const void *data,
size_t len)
{
sha256_update(ctx, len, data);
}
static inline void nettle_SHA256_Final(unsigned char *digest,
nettle_SHA256_CTX *ctx)
{
sha256_digest(ctx, SHA256_DIGEST_SIZE, digest);
}
#define platform_SHA256_CTX nettle_SHA256_CTX
#define platform_SHA256_Init nettle_SHA256_Init
#define platform_SHA256_Update nettle_SHA256_Update
#define platform_SHA256_Final nettle_SHA256_Final
#endif