Commit Diff

Commit:
12bec09b8ee75929ed950b389867d6116246a690
From:
Omar Polo <op@omarpolo.com>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
remove now unused sha1 handling from inflate and deflate both were changed to use the new got_hash APIs.
Actions:
Patch | Tree
commit - 7b074ee1ba7f2a0f63c30e6fee0f3715f0c3d2ed
commit + 12bec09b8ee75929ed950b389867d6116246a690
blob - fda3b7bb4c3102bedbed38b3065acde113eeb9a3
blob + 810758f4341bc956ef1809cb09b43bb7b9368bd8
--- lib/deflate.c
+++ lib/deflate.c
@@ -86,9 +86,6 @@ csum_output(struct got_deflate_checksum *csum, const u
 	if (csum->output_crc)
 		*csum->output_crc = crc32(*csum->output_crc, buf, len);
 
-	if (csum->output_sha1)
-		SHA1Update(csum->output_sha1, buf, len);
-
 	if (csum->output_ctx)
 		got_hash_update(csum->output_ctx, buf, len);
 }
blob - b2bda4a5026dccd005650cb802799dd42a235574
blob + 4bdb5f64edbbd9ea0e541c57a33289de76ca6fc5
--- lib/got_lib_deflate.h
+++ lib/got_lib_deflate.h
@@ -18,9 +18,6 @@ struct got_deflate_checksum {
 	/* If not NULL, mix output bytes into this CRC checksum. */
 	uint32_t *output_crc;
 
-	/* If not NULL, mix output bytes into this SHA1 context. */
-	SHA1_CTX *output_sha1;
-
 	/* If not NULL, mix output bytes into this hash context. */
 	struct got_hash *output_ctx;
 };
blob - 1f5de8404ec67a5500a3ef801466a208558ba9d3
blob + e840cb74426e3420d5429948e642c13e3480f331
--- lib/got_lib_inflate.h
+++ lib/got_lib_inflate.h
@@ -18,18 +18,12 @@ struct got_inflate_checksum {
 	/* If not NULL, mix input bytes into this CRC checksum. */
 	uint32_t *input_crc;
 
-	/* If not NULL, mix input bytes into this SHA1 context. */
-	SHA1_CTX *input_sha1;
-
 	/* if not NULL, mix input bytes into this hash context. */
 	struct got_hash *input_ctx;
 
 	/* If not NULL, mix output bytes into this CRC checksum. */
 	uint32_t *output_crc;
 
-	/* If not NULL, mix output bytes into this SHA1 context. */
-	SHA1_CTX *output_sha1;
-
 	/* If not NULL, mix output bytes into this hash context. */
 	struct got_hash *output_ctx;
 };
blob - 7bbc9fd91dda8ec3420c22d048349828595e8b74
blob + cfdcf7fb14127a2fe5599dece9aa0969e6c76b0a
--- lib/inflate.c
+++ lib/inflate.c
@@ -90,9 +90,6 @@ csum_input(struct got_inflate_checksum *csum, const ui
 {
 	if (csum->input_crc)
 		*csum->input_crc = crc32(*csum->input_crc, buf, len);
-
-	if (csum->input_sha1)
-		SHA1Update(csum->input_sha1, buf, len);
 
 	if (csum->input_ctx)
 		got_hash_update(csum->input_ctx, buf, len);
@@ -104,9 +101,6 @@ csum_output(struct got_inflate_checksum *csum, const u
 	if (csum->output_crc)
 		*csum->output_crc = crc32(*csum->output_crc, buf, len);
 
-	if (csum->output_sha1)
-		SHA1Update(csum->output_sha1, buf, len);
-
 	if (csum->output_ctx)
 		got_hash_update(csum->output_ctx, buf, len);
 }