|
|
@@ -1,6 +1,7 @@
|
|
|
#include <linux/compiler.h>
|
|
|
#include <linux/export.h>
|
|
|
#include <linux/cryptohash.h>
|
|
|
+#include <linux/bitops.h>
|
|
|
|
|
|
/* F, G and H are basic MD4 functions: selection, majority, parity */
|
|
|
#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
|
|
|
@@ -14,7 +15,7 @@
|
|
|
* 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)))
|
|
|
+ (a += f(b, c, d) + x, a = rol32(a, s))
|
|
|
#define K1 0
|
|
|
#define K2 013240474631UL
|
|
|
#define K3 015666365641UL
|