diff --git a/[refs] b/[refs] index f36caecc8c3c..7a65d5deca8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9d70a6c86cd86e111291bd0d506028ecb9649923 +refs/heads/master: fa9b98fdab5b57ecb4dd3d6c2489e262af458c44 diff --git a/trunk/crypto/sha1.c b/trunk/crypto/sha1.c index 7b1abca29365..8048e2dd3c14 100644 --- a/trunk/crypto/sha1.c +++ b/trunk/crypto/sha1.c @@ -52,8 +52,8 @@ static void sha1_update(void *ctx, const u8 *data, unsigned int len) unsigned int partial, done; const u8 *src; - partial = (sctx->count >> 3) & 0x3f; - sctx->count += len << 3; + partial = sctx->count & 0x3f; + sctx->count += len; done = 0; src = data; @@ -88,10 +88,10 @@ static void sha1_final(void* ctx, u8 *out) __be64 bits; static const u8 padding[64] = { 0x80, }; - bits = cpu_to_be64(sctx->count); + bits = cpu_to_be64(sctx->count << 3); /* Pad out to 56 mod 64 */ - index = (sctx->count >> 3) & 0x3f; + index = sctx->count & 0x3f; padlen = (index < 56) ? (56 - index) : ((64+56) - index); sha1_update(sctx, padding, padlen);