Merge branch 'pandora-27-omap1' into rev2

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

diff --git a/crypto/rmd256.c b/crypto/rmd256.c
index 88f2203..e3de5b4 100644 (file)
--- a/crypto/rmd256.c
+++ b/crypto/rmd256.c
@@ -26,7 +26,7 @@
 struct rmd256_ctx {
        u64 byte_count;
        u32 state[8];
-       u32 buffer[16];
+       __le32 buffer[16];
 };
 
 #define K1  RMD_K1
@@ -44,11 +44,11 @@ struct rmd256_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 rmd256_transform(u32 *state, u32 const *in)
+static void rmd256_transform(u32 *state, const __le32 *in)
 {
        u32 aa, bb, cc, dd, aaa, bbb, ccc, ddd, tmp;
 
@@ -288,8 +288,8 @@ static void rmd256_final(struct crypto_tfm *tfm, u8 *out)
 {
        struct rmd256_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);
@@ -304,7 +304,7 @@ static void rmd256_final(struct crypto_tfm *tfm, u8 *out)
 
        /* Store state in digest */
        for (i = 0; i < 8; i++)
-               dst[i] = cpu_to_le32(rctx->state[i]);
+               dst[i] = cpu_to_le32p(&rctx->state[i]);
 
        /* Wipe context */
        memset(rctx, 0, sizeof(*rctx));