diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-01-03 14:57:25 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 14:57:25 -0600 |
| commit | a223bae5cf7629fb77b2af0b0df9d02c634520c0 (patch) | |
| tree | 5435e02eb3cbb0d69a3da44b3a86e3ef865a50e5 /src/hash | |
| parent | 399c0b194045be1a7f6440347ce3e08ffc1b8584 (diff) | |
| parent | ba56f781a91487ad657e1a72888c914b1cec5de9 (diff) | |
| download | libgit2-a223bae5cf7629fb77b2af0b0df9d02c634520c0.tar.gz | |
Merge pull request #4437 from pks-t/pks/openssl-hash-errors
hash: openssl: check return values of SHA1_* functions
Diffstat (limited to 'src/hash')
| -rw-r--r-- | src/hash/hash_openssl.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/hash/hash_openssl.h b/src/hash/hash_openssl.h index 9a55d472d..048c2bdb3 100644 --- a/src/hash/hash_openssl.h +++ b/src/hash/hash_openssl.h @@ -23,21 +23,36 @@ struct git_hash_ctx { GIT_INLINE(int) git_hash_init(git_hash_ctx *ctx) { assert(ctx); - SHA1_Init(&ctx->c); + + if (SHA1_Init(&ctx->c) != 1) { + giterr_set(GITERR_SHA1, "hash_openssl: failed to initialize hash context"); + return -1; + } + return 0; } GIT_INLINE(int) git_hash_update(git_hash_ctx *ctx, const void *data, size_t len) { assert(ctx); - SHA1_Update(&ctx->c, data, len); + + if (SHA1_Update(&ctx->c, data, len) != 1) { + giterr_set(GITERR_SHA1, "hash_openssl: failed to update hash"); + return -1; + } + return 0; } GIT_INLINE(int) git_hash_final(git_oid *out, git_hash_ctx *ctx) { assert(ctx); - SHA1_Final(out->id, &ctx->c); + + if (SHA1_Final(out->id, &ctx->c) != 1) { + giterr_set(GITERR_SHA1, "hash_openssl: failed to finalize hash"); + return -1; + } + return 0; } |
