Commit f0a09160 by Edward Thomson

fuzzers: use updated hash functions

parent 923364c5
...@@ -34,6 +34,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) ...@@ -34,6 +34,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
git_commit_graph_file file = {{0}}; git_commit_graph_file file = {{0}};
git_commit_graph_entry e; git_commit_graph_entry e;
git_buf commit_graph_buf = GIT_BUF_INIT; git_buf commit_graph_buf = GIT_BUF_INIT;
unsigned char hash[GIT_HASH_SHA1_SIZE];
git_oid oid = {{0}}; git_oid oid = {{0}};
bool append_hash = false; bool append_hash = false;
...@@ -50,14 +51,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) ...@@ -50,14 +51,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
size -= 4; size -= 4;
if (append_hash) { if (append_hash) {
if (git_buf_init(&commit_graph_buf, size + sizeof(oid)) < 0) if (git_buf_init(&commit_graph_buf, size + GIT_HASH_SHA1_SIZE) < 0)
goto cleanup; goto cleanup;
if (git_hash_buf(&oid, data, size) < 0) { if (git_hash_buf(hash, data, size, GIT_HASH_ALGORITHM_SHA1) < 0) {
fprintf(stderr, "Failed to compute the SHA1 hash\n"); fprintf(stderr, "Failed to compute the SHA1 hash\n");
abort(); abort();
} }
memcpy(commit_graph_buf.ptr, data, size); memcpy(commit_graph_buf.ptr, data, size);
memcpy(commit_graph_buf.ptr + size, &oid, sizeof(oid)); memcpy(commit_graph_buf.ptr + size, hash, GIT_HASH_SHA1_SIZE);
memcpy(oid.id, hash, GIT_OID_RAWSZ);
} else { } else {
git_buf_attach_notowned(&commit_graph_buf, (char *)data, size); git_buf_attach_notowned(&commit_graph_buf, (char *)data, size);
} }
......
...@@ -34,6 +34,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) ...@@ -34,6 +34,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
git_midx_file idx = {{0}}; git_midx_file idx = {{0}};
git_midx_entry e; git_midx_entry e;
git_buf midx_buf = GIT_BUF_INIT; git_buf midx_buf = GIT_BUF_INIT;
unsigned char hash[GIT_HASH_SHA1_SIZE];
git_oid oid = {{0}}; git_oid oid = {{0}};
bool append_hash = false; bool append_hash = false;
...@@ -50,14 +51,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) ...@@ -50,14 +51,16 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
size -= 4; size -= 4;
if (append_hash) { if (append_hash) {
if (git_buf_init(&midx_buf, size + sizeof(oid)) < 0) if (git_buf_init(&midx_buf, size + GIT_HASH_SHA1_SIZE) < 0)
goto cleanup; goto cleanup;
if (git_hash_buf(&oid, data, size) < 0) { if (git_hash_buf(hash, data, size, GIT_HASH_ALGORITHM_SHA1) < 0) {
fprintf(stderr, "Failed to compute the SHA1 hash\n"); fprintf(stderr, "Failed to compute the SHA1 hash\n");
abort(); abort();
} }
memcpy(midx_buf.ptr, data, size); memcpy(midx_buf.ptr, data, size);
memcpy(midx_buf.ptr + size, &oid, sizeof(oid)); memcpy(midx_buf.ptr + size, hash, GIT_HASH_SHA1_SIZE);
memcpy(oid.id, hash, GIT_OID_RAWSZ);
} else { } else {
git_buf_attach_notowned(&midx_buf, (char *)data, size); git_buf_attach_notowned(&midx_buf, (char *)data, size);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment