diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2017-12-10 17:26:43 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2017-12-20 16:08:04 +0000 |
| commit | a89560d5693a2f43cc852cb5806df837dc79b790 (patch) | |
| tree | 18f4fdb726e688e381f679bc62a3027568cc8ec1 | |
| parent | 3e6533ba12c1c567f91efe621bdd155ff801877c (diff) | |
| download | libgit2-a89560d5693a2f43cc852cb5806df837dc79b790.tar.gz | |
hash: win32 hash mechanism should support large files
Teach the win32 hash mechanisms to support large files. The hash
primitives take at most `ULONG_MAX` bytes at a time. Loop, giving the
hash function the maximum supported number of bytes, until we have
hashed the entire file.
| -rw-r--r-- | src/hash/hash_win32.c | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/src/hash/hash_win32.c b/src/hash/hash_win32.c index 4d53a57bd..20ba9a5fe 100644 --- a/src/hash/hash_win32.c +++ b/src/hash/hash_win32.c @@ -136,12 +136,21 @@ GIT_INLINE(int) hash_cryptoapi_init(git_hash_ctx *ctx) return 0; } -GIT_INLINE(int) hash_cryptoapi_update(git_hash_ctx *ctx, const void *data, size_t len) +GIT_INLINE(int) hash_cryptoapi_update(git_hash_ctx *ctx, const void *_data, size_t len) { + const BYTE *data = (BYTE *)_data; + assert(ctx->ctx.cryptoapi.valid); - if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, (const BYTE *)data, (DWORD)len, 0)) - return -1; + while (len > 0) { + DWORD chunk = (len > MAXDWORD) ? MAXDWORD : (DWORD)len; + + if (!CryptHashData(ctx->ctx.cryptoapi.hash_handle, data, chunk, 0)) + return -1; + + data += chunk; + len -= chunk; + } return 0; } @@ -202,10 +211,19 @@ GIT_INLINE(int) hash_cng_init(git_hash_ctx *ctx) return 0; } -GIT_INLINE(int) hash_cng_update(git_hash_ctx *ctx, const void *data, size_t len) +GIT_INLINE(int) hash_cng_update(git_hash_ctx *ctx, const void *_data, size_t len) { - if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, (PBYTE)data, (ULONG)len, 0) < 0) - return -1; + PBYTE data = (PBYTE)_data; + + while (len > 0) { + ULONG chunk = (len > ULONG_MAX) ? ULONG_MAX : (ULONG)len; + + if (ctx->prov->prov.cng.hash_data(ctx->ctx.cng.hash_handle, data, chunk, 0) < 0) + return -1; + + data += chunk; + len -= chunk; + } return 0; } |