Skip to content

Commit 1b9e9be

Browse files
ttaylorrgitster
authored andcommitted
csum-file.c: use unsafe SHA-1 implementation when available
Update hashwrite() and friends to use the unsafe_-variants of hashing functions, calling for e.g., "the_hash_algo->unsafe_update_fn()" instead of "the_hash_algo->update_fn()". These callers only use the_hash_algo to produce a checksum, which we depend on for data integrity, but not for cryptographic purposes, so these callers are safe to use the unsafe (non-collision detecting) SHA-1 implementation. To time this, I took a freshly packed copy of linux.git, and ran the following with and without the OPENSSL_SHA1_UNSAFE=1 build-knob. Both versions were compiled with -O3: $ git for-each-ref --format='%(objectname)' refs/heads refs/tags >in $ valgrind --tool=callgrind ~/src/git/git-pack-objects \ --revs --stdout --all-progress --use-bitmap-index <in >/dev/null Without OPENSSL_SHA1_UNSAFE=1 (that is, using the collision-detecting SHA-1 implementation for both cryptographic and non-cryptographic purposes), we spend a significant amount of our instruction count in hashwrite(): $ callgrind_annotate --inclusive=yes | grep hashwrite | head -n1 159,998,868,413 (79.42%) /home/ttaylorr/src/git/csum-file.c:hashwrite [/home/ttaylorr/src/git/git-pack-objects] , and the resulting "clone" takes 19.219 seconds of wall clock time, 18.94 seconds of user time and 0.28 seconds of system time. Compiling with OPENSSL_SHA1_UNSAFE=1, we spend ~60% fewer instructions in hashwrite(): $ callgrind_annotate --inclusive=yes | grep hashwrite | head -n1 59,164,001,176 (58.79%) /home/ttaylorr/src/git/csum-file.c:hashwrite [/home/ttaylorr/src/git/git-pack-objects] , and generate the resulting "clone" much faster, in only 11.597 seconds of wall time, 11.37 seconds of user time, and 0.23 seconds of system time, for a ~40% speed-up. Signed-off-by: Taylor Blau <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 06c92da commit 1b9e9be

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

csum-file.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void hashflush(struct hashfile *f)
5050

5151
if (offset) {
5252
if (!f->skip_hash)
53-
the_hash_algo->update_fn(&f->ctx, f->buffer, offset);
53+
the_hash_algo->unsafe_update_fn(&f->ctx, f->buffer, offset);
5454
flush(f, f->buffer, offset);
5555
f->offset = 0;
5656
}
@@ -73,7 +73,7 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result,
7373
if (f->skip_hash)
7474
hashclr(f->buffer, the_repository->hash_algo);
7575
else
76-
the_hash_algo->final_fn(f->buffer, &f->ctx);
76+
the_hash_algo->unsafe_final_fn(f->buffer, &f->ctx);
7777

7878
if (result)
7979
hashcpy(result, f->buffer, the_repository->hash_algo);
@@ -128,7 +128,7 @@ void hashwrite(struct hashfile *f, const void *buf, unsigned int count)
128128
* f->offset is necessarily zero.
129129
*/
130130
if (!f->skip_hash)
131-
the_hash_algo->update_fn(&f->ctx, buf, nr);
131+
the_hash_algo->unsafe_update_fn(&f->ctx, buf, nr);
132132
flush(f, buf, nr);
133133
} else {
134134
/*
@@ -174,7 +174,7 @@ static struct hashfile *hashfd_internal(int fd, const char *name,
174174
f->name = name;
175175
f->do_crc = 0;
176176
f->skip_hash = 0;
177-
the_hash_algo->init_fn(&f->ctx);
177+
the_hash_algo->unsafe_init_fn(&f->ctx);
178178

179179
f->buffer_len = buffer_len;
180180
f->buffer = xmalloc(buffer_len);
@@ -208,7 +208,7 @@ void hashfile_checkpoint(struct hashfile *f, struct hashfile_checkpoint *checkpo
208208
{
209209
hashflush(f);
210210
checkpoint->offset = f->total;
211-
the_hash_algo->clone_fn(&checkpoint->ctx, &f->ctx);
211+
the_hash_algo->unsafe_clone_fn(&checkpoint->ctx, &f->ctx);
212212
}
213213

214214
int hashfile_truncate(struct hashfile *f, struct hashfile_checkpoint *checkpoint)
@@ -219,7 +219,7 @@ int hashfile_truncate(struct hashfile *f, struct hashfile_checkpoint *checkpoint
219219
lseek(f->fd, offset, SEEK_SET) != offset)
220220
return -1;
221221
f->total = offset;
222-
the_hash_algo->clone_fn(&f->ctx, &checkpoint->ctx);
222+
the_hash_algo->unsafe_clone_fn(&f->ctx, &checkpoint->ctx);
223223
f->offset = 0; /* hashflush() was called in checkpoint */
224224
return 0;
225225
}
@@ -245,9 +245,9 @@ int hashfile_checksum_valid(const unsigned char *data, size_t total_len)
245245
if (total_len < the_hash_algo->rawsz)
246246
return 0; /* say "too short"? */
247247

248-
the_hash_algo->init_fn(&ctx);
249-
the_hash_algo->update_fn(&ctx, data, data_len);
250-
the_hash_algo->final_fn(got, &ctx);
248+
the_hash_algo->unsafe_init_fn(&ctx);
249+
the_hash_algo->unsafe_update_fn(&ctx, data, data_len);
250+
the_hash_algo->unsafe_final_fn(got, &ctx);
251251

252252
return hasheq(got, data + data_len, the_repository->hash_algo);
253253
}

0 commit comments

Comments
 (0)