From: Matt Mackall Replace duplicate halfMD4 code with call to lib/ Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton --- 25-akpm/fs/ext3/hash.c | 70 +------------------------------------ 25-akpm/include/linux/cryptohash.h | 2 - 25-akpm/lib/halfmd4.c | 10 +++-- 3 files changed, 10 insertions(+), 72 deletions(-) diff -puN fs/ext3/hash.c~random-pt4-kill-duplicate-halfmd4-in-ext3-htree fs/ext3/hash.c --- 25/fs/ext3/hash.c~random-pt4-kill-duplicate-halfmd4-in-ext3-htree 2005-01-22 23:48:18.113569904 -0800 +++ 25-akpm/fs/ext3/hash.c 2005-01-22 23:48:18.120568840 -0800 @@ -13,6 +13,7 @@ #include #include #include +#include #define DELTA 0x9E3779B9 @@ -33,73 +34,6 @@ static void TEA_transform(__u32 buf[4], buf[1] += b1; } -/* F, G and H are basic MD4 functions: selection, majority, parity */ -#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) -#define G(x, y, z) (((x) & (y)) + (((x) ^ (y)) & (z))) -#define H(x, y, z) ((x) ^ (y) ^ (z)) - -/* - * The generic round function. The application is so specific that - * we don't bother protecting all the arguments with parens, as is generally - * good macro practice, in favor of extra legibility. - * Rotation is separate from addition to prevent recomputation - */ -#define ROUND(f, a, b, c, d, x, s) \ - (a += f(b, c, d) + x, a = (a << s) | (a >> (32-s))) -#define K1 0 -#define K2 013240474631UL -#define K3 015666365641UL - -/* - * Basic cut-down MD4 transform. Returns only 32 bits of result. - */ -static void halfMD4Transform (__u32 buf[4], __u32 const in[]) -{ - __u32 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; - - /* Round 1 */ - ROUND(F, a, b, c, d, in[0] + K1, 3); - ROUND(F, d, a, b, c, in[1] + K1, 7); - ROUND(F, c, d, a, b, in[2] + K1, 11); - ROUND(F, b, c, d, a, in[3] + K1, 19); - ROUND(F, a, b, c, d, in[4] + K1, 3); - ROUND(F, d, a, b, c, in[5] + K1, 7); - ROUND(F, c, d, a, b, in[6] + K1, 11); - ROUND(F, b, c, d, a, in[7] + K1, 19); - - /* Round 2 */ - ROUND(G, a, b, c, d, in[1] + K2, 3); - ROUND(G, d, a, b, c, in[3] + K2, 5); - ROUND(G, c, d, a, b, in[5] + K2, 9); - ROUND(G, b, c, d, a, in[7] + K2, 13); - ROUND(G, a, b, c, d, in[0] + K2, 3); - ROUND(G, d, a, b, c, in[2] + K2, 5); - ROUND(G, c, d, a, b, in[4] + K2, 9); - ROUND(G, b, c, d, a, in[6] + K2, 13); - - /* Round 3 */ - ROUND(H, a, b, c, d, in[3] + K3, 3); - ROUND(H, d, a, b, c, in[7] + K3, 9); - ROUND(H, c, d, a, b, in[2] + K3, 11); - ROUND(H, b, c, d, a, in[6] + K3, 15); - ROUND(H, a, b, c, d, in[1] + K3, 3); - ROUND(H, d, a, b, c, in[5] + K3, 9); - ROUND(H, c, d, a, b, in[0] + K3, 11); - ROUND(H, b, c, d, a, in[4] + K3, 15); - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - -#undef ROUND -#undef F -#undef G -#undef H -#undef K1 -#undef K2 -#undef K3 /* The old legacy hash */ static __u32 dx_hack_hash (const char *name, int len) @@ -187,7 +121,7 @@ int ext3fs_dirhash(const char *name, int p = name; while (len > 0) { str2hashbuf(p, len, in, 8); - halfMD4Transform(buf, in); + half_md4_transform(buf, in); len -= 32; p += 32; } diff -puN include/linux/cryptohash.h~random-pt4-kill-duplicate-halfmd4-in-ext3-htree include/linux/cryptohash.h --- 25/include/linux/cryptohash.h~random-pt4-kill-duplicate-halfmd4-in-ext3-htree 2005-01-22 23:48:18.114569752 -0800 +++ 25-akpm/include/linux/cryptohash.h 2005-01-22 23:48:18.120568840 -0800 @@ -7,6 +7,6 @@ void sha_init(__u32 *buf); void sha_transform(__u32 *digest, const char *data, __u32 *W); -__u32 half_md4_transform(__u32 const buf[4], __u32 const in[8]); +__u32 half_md4_transform(__u32 buf[4], __u32 const in[8]); #endif diff -puN lib/halfmd4.c~random-pt4-kill-duplicate-halfmd4-in-ext3-htree lib/halfmd4.c --- 25/lib/halfmd4.c~random-pt4-kill-duplicate-halfmd4-in-ext3-htree 2005-01-22 23:48:18.116569448 -0800 +++ 25-akpm/lib/halfmd4.c 2005-01-22 23:48:18.121568688 -0800 @@ -21,7 +21,7 @@ /* * Basic cut-down MD4 transform. Returns only 32 bits of result. */ -__u32 half_md4_transform(__u32 const buf[4], __u32 const in[8]) +__u32 half_md4_transform(__u32 buf[4], __u32 const in[8]) { __u32 a = buf[0], b = buf[1], c = buf[2], d = buf[3]; @@ -55,7 +55,11 @@ __u32 half_md4_transform(__u32 const buf ROUND(H, c, d, a, b, in[0] + K3, 11); ROUND(H, b, c, d, a, in[4] + K3, 15); - return buf[1] + b; /* "most hashed" word */ - /* Alternative: return sum of all words? */ + buf[0] += a; + buf[1] += b; + buf[2] += c; + buf[3] += d; + + return buf[1]; /* "most hashed" word */ } _