md5: fix "fast" md5 broken by prev commit

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-10-16 21:34:36 +02:00
parent e8ee86250d
commit 1ac476bb85

View File

@@ -245,6 +245,7 @@ static void md5_hash_block(md5_ctx_t *ctx)
OP(C, D, A, B, 17, 0xa679438e); OP(C, D, A, B, 17, 0xa679438e);
OP(B, C, D, A, 22, 0x49b40821); OP(B, C, D, A, 22, 0x49b40821);
# endif # endif
words -= 16;
/* For the second to fourth round we have the possibly swapped words /* For the second to fourth round we have the possibly swapped words
in WORDS. Redefine the macro to take an additional first 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 # undef OP
# define OP(f, a, b, c, d, k, s, T) \ # define OP(f, a, b, c, d, k, s, T) \
do { \ do { \
a += f(b, c, d) + correct_words[k] + T; \ a += f(b, c, d) + words[k] + T; \
a = rotl32(a, s); \ a = rotl32(a, s); \
a += b; \ a += b; \
} while (0) } while (0)