X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=crypto%2Frmd128.c;h=5de6fa2a76fbe489f4868341ce595971733e3a91;hb=67a37308ae37f8948d3c26f75a18f0ddb77ac198;hp=89a535aa6eb8994033d933c8c68b342436f86675;hpb=0f923a2aab7baa94c5fef498384151af1cd72cba;p=linux-2.6-omap-h63xx.git

diff --git a/crypto/rmd128.c b/crypto/rmd128.c
index 89a535aa6eb..5de6fa2a76f 100644
--- a/crypto/rmd128.c
+++ b/crypto/rmd128.c
@@ -26,7 +26,7 @@
 struct rmd128_ctx {
 	u64 byte_count;
 	u32 state[4];
-	u32 buffer[16];
+	__le32 buffer[16];
 };
 
 #define K1  RMD_K1
@@ -44,11 +44,11 @@ struct rmd128_ctx {
 #define F4(x, y, z) (y ^ (z & (x ^ y)))	/* z ? x : y */
 
 #define ROUND(a, b, c, d, f, k, x, s)  { \
-	(a) += f((b), (c), (d)) + le32_to_cpu(x) + (k); \
+	(a) += f((b), (c), (d)) + le32_to_cpup(&(x)) + (k);	\
 	(a) = rol32((a), (s)); \
 }
 
-static void rmd128_transform(u32 *state, u32 const *in)
+static void rmd128_transform(u32 *state, const __le32 *in)
 {
 	u32 aa, bb, cc, dd, aaa, bbb, ccc, ddd;
 
@@ -269,8 +269,8 @@ static void rmd128_final(struct crypto_tfm *tfm, u8 *out)
 {
 	struct rmd128_ctx *rctx = crypto_tfm_ctx(tfm);
 	u32 i, index, padlen;
-	u64 bits;
-	u32 *dst = (u32 *)out;
+	__le64 bits;
+	__le32 *dst = (__le32 *)out;
 	static const u8 padding[64] = { 0x80, };
 
 	bits = cpu_to_le64(rctx->byte_count << 3);
@@ -285,7 +285,7 @@ static void rmd128_final(struct crypto_tfm *tfm, u8 *out)
 
 	/* Store state in digest */
 	for (i = 0; i < 4; i++)
-		dst[i] = cpu_to_le32(rctx->state[i]);
+		dst[i] = cpu_to_le32p(&rctx->state[i]);
 
 	/* Wipe context */
 	memset(rctx, 0, sizeof(*rctx));