mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'ad/sha1-update-chunked'
Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions
This commit is contained in:
commit
4672123fe5
13
Makefile
13
Makefile
|
@ -142,6 +142,10 @@ all::
|
|||
# Define PPC_SHA1 environment variable when running make to make use of
|
||||
# a bundled SHA1 routine optimized for PowerPC.
|
||||
#
|
||||
# Define SHA1_MAX_BLOCK_SIZE to limit the amount of data that will be hashed
|
||||
# in one call to the platform's SHA1_Update(). e.g. APPLE_COMMON_CRYPTO
|
||||
# wants 'SHA1_MAX_BLOCK_SIZE=1024L*1024L*1024L' defined.
|
||||
#
|
||||
# Define NEEDS_CRYPTO_WITH_SSL if you need -lcrypto when using -lssl (Darwin).
|
||||
#
|
||||
# Define NEEDS_SSL_WITH_CRYPTO if you need -lssl when using -lcrypto (Darwin).
|
||||
|
@ -1338,6 +1342,11 @@ ifdef NO_POSIX_GOODIES
|
|||
BASIC_CFLAGS += -DNO_POSIX_GOODIES
|
||||
endif
|
||||
|
||||
ifdef APPLE_COMMON_CRYPTO
|
||||
# Apple CommonCrypto requires chunking
|
||||
SHA1_MAX_BLOCK_SIZE = 1024L*1024L*1024L
|
||||
endif
|
||||
|
||||
ifdef BLK_SHA1
|
||||
SHA1_HEADER = "block-sha1/sha1.h"
|
||||
LIB_OBJS += block-sha1/sha1.o
|
||||
|
@ -1356,6 +1365,10 @@ endif
|
|||
endif
|
||||
endif
|
||||
|
||||
ifdef SHA1_MAX_BLOCK_SIZE
|
||||
LIB_OBJS += compat/sha1-chunked.o
|
||||
BASIC_CFLAGS += -DSHA1_MAX_BLOCK_SIZE="$(SHA1_MAX_BLOCK_SIZE)"
|
||||
endif
|
||||
ifdef NO_PERL_MAKEMAKER
|
||||
export NO_PERL_MAKEMAKER
|
||||
endif
|
||||
|
|
|
@ -16,7 +16,7 @@ void blk_SHA1_Init(blk_SHA_CTX *ctx);
|
|||
void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len);
|
||||
void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx);
|
||||
|
||||
#define git_SHA_CTX blk_SHA_CTX
|
||||
#define git_SHA1_Init blk_SHA1_Init
|
||||
#define git_SHA1_Update blk_SHA1_Update
|
||||
#define git_SHA1_Final blk_SHA1_Final
|
||||
#define platform_SHA_CTX blk_SHA_CTX
|
||||
#define platform_SHA1_Init blk_SHA1_Init
|
||||
#define platform_SHA1_Update blk_SHA1_Update
|
||||
#define platform_SHA1_Final blk_SHA1_Final
|
||||
|
|
28
cache.h
28
cache.h
|
@ -11,11 +11,29 @@
|
|||
#include "string-list.h"
|
||||
|
||||
#include SHA1_HEADER
|
||||
#ifndef git_SHA_CTX
|
||||
#define git_SHA_CTX SHA_CTX
|
||||
#define git_SHA1_Init SHA1_Init
|
||||
#define git_SHA1_Update SHA1_Update
|
||||
#define git_SHA1_Final SHA1_Final
|
||||
#ifndef platform_SHA_CTX
|
||||
/*
|
||||
* platform's underlying implementation of SHA-1; could be OpenSSL,
|
||||
* blk_SHA, Apple CommonCrypto, etc... Note that including
|
||||
* SHA1_HEADER may have already defined platform_SHA_CTX for our
|
||||
* own implementations like block-sha1 and ppc-sha1, so we list
|
||||
* the default for OpenSSL compatible SHA-1 implementations here.
|
||||
*/
|
||||
#define platform_SHA_CTX SHA_CTX
|
||||
#define platform_SHA1_Init SHA1_Init
|
||||
#define platform_SHA1_Update SHA1_Update
|
||||
#define platform_SHA1_Final SHA1_Final
|
||||
#endif
|
||||
|
||||
#define git_SHA_CTX platform_SHA_CTX
|
||||
#define git_SHA1_Init platform_SHA1_Init
|
||||
#define git_SHA1_Update platform_SHA1_Update
|
||||
#define git_SHA1_Final platform_SHA1_Final
|
||||
|
||||
#ifdef SHA1_MAX_BLOCK_SIZE
|
||||
#include "compat/sha1-chunked.h"
|
||||
#undef git_SHA1_Update
|
||||
#define git_SHA1_Update git_SHA1_Update_Chunked
|
||||
#endif
|
||||
|
||||
#include <zlib.h>
|
||||
|
|
|
@ -16,6 +16,10 @@
|
|||
#undef TYPE_BOOL
|
||||
#endif
|
||||
|
||||
#ifndef SHA1_MAX_BLOCK_SIZE
|
||||
#error Using Apple Common Crypto library requires setting SHA1_MAX_BLOCK_SIZE
|
||||
#endif
|
||||
|
||||
#ifdef APPLE_LION_OR_NEWER
|
||||
#define git_CC_error_check(pattern, err) \
|
||||
do { \
|
||||
|
|
19
compat/sha1-chunked.c
Normal file
19
compat/sha1-chunked.c
Normal file
|
@ -0,0 +1,19 @@
|
|||
#include "cache.h"
|
||||
|
||||
int git_SHA1_Update_Chunked(platform_SHA_CTX *c, const void *data, size_t len)
|
||||
{
|
||||
size_t nr;
|
||||
size_t total = 0;
|
||||
const char *cdata = (const char*)data;
|
||||
|
||||
while (len) {
|
||||
nr = len;
|
||||
if (nr > SHA1_MAX_BLOCK_SIZE)
|
||||
nr = SHA1_MAX_BLOCK_SIZE;
|
||||
platform_SHA1_Update(c, cdata, nr);
|
||||
total += nr;
|
||||
cdata += nr;
|
||||
len -= nr;
|
||||
}
|
||||
return total;
|
||||
}
|
2
compat/sha1-chunked.h
Normal file
2
compat/sha1-chunked.h
Normal file
|
@ -0,0 +1,2 @@
|
|||
|
||||
int git_SHA1_Update_Chunked(platform_SHA_CTX *c, const void *data, size_t len);
|
|
@ -19,7 +19,7 @@ int ppc_SHA1_Init(ppc_SHA_CTX *c);
|
|||
int ppc_SHA1_Update(ppc_SHA_CTX *c, const void *p, unsigned long n);
|
||||
int ppc_SHA1_Final(unsigned char *hash, ppc_SHA_CTX *c);
|
||||
|
||||
#define git_SHA_CTX ppc_SHA_CTX
|
||||
#define git_SHA1_Init ppc_SHA1_Init
|
||||
#define git_SHA1_Update ppc_SHA1_Update
|
||||
#define git_SHA1_Final ppc_SHA1_Final
|
||||
#define platform_SHA_CTX ppc_SHA_CTX
|
||||
#define platform_SHA1_Init ppc_SHA1_Init
|
||||
#define platform_SHA1_Update ppc_SHA1_Update
|
||||
#define platform_SHA1_Final ppc_SHA1_Final
|
||||
|
|
Loading…
Reference in a new issue