Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / crypto / rmd160.c

diff --git a/crypto/rmd160.c b/crypto/rmd160.c
index 136e31f..f001ec7 100644 (file)
--- a/crypto/rmd160.c
+++ b/crypto/rmd160.c
@@ -26,7 +26,7 @@
 struct rmd160_ctx {
        u64 byte_count;
        u32 state[5];
-       u32 buffer[16];
+       __le32 buffer[16];
 };
 
 #define K1  RMD_K1
@@ -47,12 +47,12 @@ struct rmd160_ctx {
 #define F5(x, y, z) (x ^ (y | ~z))
 
 #define ROUND(a, b, c, d, e, 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)) + (e); \
        (c) = rol32((c), 10); \
 }
 
-static void rmd160_transform(u32 *state, u32 const *in)
+static void rmd160_transform(u32 *state, const __le32 *in)
 {
        u32 aa, bb, cc, dd, ee, aaa, bbb, ccc, ddd, eee;
 
@@ -313,8 +313,8 @@ static void rmd160_final(struct crypto_tfm *tfm, u8 *out)
 {
        struct rmd160_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);
@@ -329,7 +329,7 @@ static void rmd160_final(struct crypto_tfm *tfm, u8 *out)
 
        /* Store state in digest */
        for (i = 0; i < 5; i++)
-               dst[i] = cpu_to_le32(rctx->state[i]);
+               dst[i] = cpu_to_le32p(&rctx->state[i]);
 
        /* Wipe context */
        memset(rctx, 0, sizeof(*rctx));