diff --git a/[refs] b/[refs] index 4280aa8c21af..443ce3b41c47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: afad2608c766f53c79ec4ffccdb4bef660b90a89 +refs/heads/master: bcb0ad2b34daade529ce1f38eede0ea8b7309535 diff --git a/trunk/crypto/sha1.c b/trunk/crypto/sha1.c index 8048e2dd3c14..21571ed35b7e 100644 --- a/trunk/crypto/sha1.c +++ b/trunk/crypto/sha1.c @@ -61,8 +61,8 @@ static void sha1_update(void *ctx, const u8 *data, unsigned int len) u32 temp[SHA_WORKSPACE_WORDS]; if (partial) { - done = 64 - partial; - memcpy(sctx->buffer + partial, data, done); + done = -partial; + memcpy(sctx->buffer + partial, data, done + 64); src = sctx->buffer; }