diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-16 21:34:36 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-10-16 21:34:36 +0200 |
| commit | 1ac476bb8561f57703b84f090ed7a575fa512823 (patch) | |
| tree | afefea33aece76219b71a4880cd3c9c36f6210e8 /libbb | |
| parent | e8ee86250d78b7a9c59699aca597f392c1593225 (diff) | |
| download | busybox-1ac476bb8561f57703b84f090ed7a575fa512823.tar.gz | |
md5: fix "fast" md5 broken by prev commit
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/md5.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libbb/md5.c b/libbb/md5.c index 3c24bc60b..f192d0e47 100644 --- a/libbb/md5.c +++ b/libbb/md5.c @@ -245,6 +245,7 @@ static void md5_hash_block(md5_ctx_t *ctx) OP(C, D, A, B, 17, 0xa679438e); OP(B, C, D, A, 22, 0x49b40821); # endif + words -= 16; /* For the second to fourth round we have the possibly swapped words in WORDS. Redefine the macro to take an additional first @@ -252,7 +253,7 @@ static void md5_hash_block(md5_ctx_t *ctx) # undef OP # define OP(f, a, b, c, d, k, s, T) \ do { \ - a += f(b, c, d) + correct_words[k] + T; \ + a += f(b, c, d) + words[k] + T; \ a = rotl32(a, s); \ a += b; \ } while (0) |