Commit 1c78bc17 authored by Alexander Kuleshov's avatar Alexander Kuleshov Committed by Linus Torvalds

lib/halfmd4.c: use rol32 inline function in the ROUND macro

<linux/bitops.h> provides rol32() inline function, let's use already
predefined function instead of direct expression.
Signed-off-by: default avatarAlexander Kuleshov <kuleshovmail@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 78e3c795
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/export.h> #include <linux/export.h>
#include <linux/cryptohash.h> #include <linux/cryptohash.h>
#include <linux/bitops.h>
/* F, G and H are basic MD4 functions: selection, majority, parity */ /* F, G and H are basic MD4 functions: selection, majority, parity */
#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z)))) #define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
...@@ -14,7 +15,7 @@ ...@@ -14,7 +15,7 @@
* Rotation is separate from addition to prevent recomputation * Rotation is separate from addition to prevent recomputation
*/ */
#define ROUND(f, a, b, c, d, x, s) \ #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 K1 0
#define K2 013240474631UL #define K2 013240474631UL
#define K3 015666365641UL #define K3 015666365641UL
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment