diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 14:05:03 -0800 |
| commit | b5d2d8eef0ad08022a3f635c0bc292eb2cc5aefc (patch) | |
| tree | 591e520fa223ef9294eb0fe50b7868023f3262a3 /block-sha1/sha1.h | |
| parent | e6ed5a438c7a5436a08c08e269174d9975f8dc1d (diff) | |
| parent | 001fd7a90b5851f62e700510729a5e09706f9b63 (diff) | |
| download | git-b5d2d8eef0ad08022a3f635c0bc292eb2cc5aefc.tar.gz git-b5d2d8eef0ad08022a3f635c0bc292eb2cc5aefc.tar.xz | |
Merge branch 'ad/sha1-update-chunked' into maint
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
Diffstat (limited to 'block-sha1/sha1.h')
| -rw-r--r-- | block-sha1/sha1.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block-sha1/sha1.h b/block-sha1/sha1.h index b864df623..4df674775 100644 --- a/block-sha1/sha1.h +++ b/block-sha1/sha1.h @@ -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 |