X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=block-sha1%2Fsha1.c;h=d880a5336ecbee175162a86a3336a783c79b0eb0;hb=567323d387dda559dbdba8c15453aba629393955;hp=d8934757a5e5e259f26c4a09f7ea5d10615df0c1;hpb=712d352577012d5035da69bbf49ea0f0df8bb7da;p=git.git diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c index d8934757a..d880a5336 100644 --- a/block-sha1/sha1.c +++ b/block-sha1/sha1.c @@ -236,13 +236,13 @@ void blk_SHA1_Init(blk_SHA_CTX *ctx) void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len) { - int lenW = ctx->size & 63; + unsigned int lenW = ctx->size & 63; ctx->size += len; /* Read the data into W and process blocks as they get full */ if (lenW) { - int left = 64 - lenW; + unsigned int left = 64 - lenW; if (len < left) left = len; memcpy(lenW + (char *)ctx->W, data, left); @@ -269,8 +269,8 @@ void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx) int i; /* Pad with a binary 1 (ie 0x80), then zeroes, then length */ - padlen[0] = htonl(ctx->size >> 29); - padlen[1] = htonl(ctx->size << 3); + padlen[0] = htonl((uint32_t)(ctx->size >> 29)); + padlen[1] = htonl((uint32_t)(ctx->size << 3)); i = ctx->size & 63; blk_SHA1_Update(ctx, pad, 1+ (63 & (55 - i)));