aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Stevens <cr-marcstevens@users.noreply.github.com>2017-03-01 07:37:45 +0100
committerGitHub <noreply@github.com>2017-03-01 07:37:45 +0100
commit44c017d85e3fd547ba869266e5304484f29276a6 (patch)
treea2ff3c011c44f158b821959efe37e2b3cb1622bc
parentec0ddf3d6041989463a584fe2ca0d241f7248e43 (diff)
downloadsha1collisiondetection-44c017d85e3fd547ba869266e5304484f29276a6.tar.gz
Update sha1.c
-rw-r--r--lib/sha1.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/sha1.c b/lib/sha1.c
index 7920c96..7381c49 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -44,19 +44,22 @@
void sha1_message_expansion(uint32_t W[80])
{
- for (unsigned i = 16; i < 80; ++i)
+ unsigned i;
+ for (i = 16; i < 80; ++i)
W[i] = rotate_left(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16], 1);
}
void sha1_compression(uint32_t ihv[5], const uint32_t m[16])
{
uint32_t W[80];
+ uint32_t a,b,c,d,e;
+ unsigned i;
memcpy(W, m, 16 * 4);
- for (unsigned i = 16; i < 80; ++i)
+ for (i = 16; i < 80; ++i)
W[i] = rotate_left(W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16], 1);
- uint32_t a = ihv[0], b = ihv[1], c = ihv[2], d = ihv[3], e = ihv[4];
+ a = ihv[0]; b = ihv[1]; c = ihv[2]; d = ihv[3]; e = ihv[4];
HASHCLASH_SHA1COMPRESS_ROUND1_STEP(a, b, c, d, e, W, 0);
HASHCLASH_SHA1COMPRESS_ROUND1_STEP(e, a, b, c, d, W, 1);