diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-10-28 21:40:10 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-10-28 21:40:10 +0000 |
| commit | d9a2c66ab5c2b6a446bb2fe07ed4875a39e162f2 (patch) | |
| tree | 0dea0555f027b15f6d3bf95c8971caba2cc0f89d /src/lib/crypto/md4 | |
| parent | 052d558202badc4e9e81641058c89d17f656e2f5 (diff) | |
| download | krb5-d9a2c66ab5c2b6a446bb2fe07ed4875a39e162f2.tar.gz krb5-d9a2c66ab5c2b6a446bb2fe07ed4875a39e162f2.tar.xz krb5-d9a2c66ab5c2b6a446bb2fe07ed4875a39e162f2.zip | |
* md5.c: Fix to deal with types longer than 32 bits
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10259 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/md4')
| -rw-r--r-- | src/lib/crypto/md4/ChangeLog | 4 | ||||
| -rw-r--r-- | src/lib/crypto/md4/md4.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index 3653c4509..bcac6ed4b 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,7 @@ +Tue Oct 28 16:36:15 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> + + * md4.c: Fix to deal with types longer than 32 bits. + Sat Feb 22 18:53:00 1997 Richard Basch <basch@lehman.com> * Makefile.in: Use some of the new library list build rules in diff --git a/src/lib/crypto/md4/md4.c b/src/lib/crypto/md4/md4.c index 8714f4a0b..fbfd25625 100644 --- a/src/lib/crypto/md4/md4.c +++ b/src/lib/crypto/md4/md4.c @@ -68,18 +68,21 @@ static unsigned char PADDING[64] = { #define H(x, y, z) ((x) ^ (y) ^ (z)) /* ROTATE_LEFT rotates x left n bits */ -#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n)))) +#define ROTATE_LEFT(x, n) (((x) << (n)) & 0xffffffff | ((x) >> (32-(n)))) /* FF, GG and HH are MD4 transformations for rounds 1, 2 and 3 */ /* Rotation is separate from addition to prevent recomputation */ #define FF(a, b, c, d, x, s) \ {(a) += F ((b), (c), (d)) + (x); \ + (a) &= 0xffffffff; \ (a) = ROTATE_LEFT ((a), (s));} #define GG(a, b, c, d, x, s) \ {(a) += G ((b), (c), (d)) + (x) + UL(013240474631); \ + (a) &= 0xffffffff; \ (a) = ROTATE_LEFT ((a), (s));} #define HH(a, b, c, d, x, s) \ {(a) += H ((b), (c), (d)) + (x) + UL(015666365641); \ + (a) &= 0xffffffff; \ (a) = ROTATE_LEFT ((a), (s));} void |