block-sha1: undo ctx->size change

Undo the change I picked up from the mailing list discussion suggested
by Nico, not because it is wrong, but it will be done at the end of the
follow-up series.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index 50b2b42b03f255689b26cc91d7fb02ce5601dff2..eef32f7859e4f5cf9a0a4ba2a81d2f858f48daee 100644 (file)
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -31,7 +31,7 @@ void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
 {
        int lenW = ctx->lenW;
 
-       ctx->size += len;
+       ctx->size += (unsigned long long) len << 3;
 
        /* Read the data into W and process blocks as they get full
         */
@@ -68,8 +68,8 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx)
 
        /* Pad with a binary 1 (ie 0x80), then zeroes, then length
         */
-       padlen[0] = htonl(ctx->size >> (32 - 3));
-       padlen[1] = htonl(ctx->size << 3);
+       padlen[0] = htonl(ctx->size >> 32);
+       padlen[1] = htonl(ctx->size);
 
        blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - ctx->lenW)));
        blk_SHA1_Update(ctx, padlen, 8);