mm: strictly nested kmap_atomic()

[linux-2.6.git] / crypto / rmd128.c

diff --git a/crypto/rmd128.c b/crypto/rmd128.c
index f72d2ce848d011fc5ab95e23dd247afa8a841efd..1ceb6735aa5386f5507fbd0c9e5cc19a66feb7b5 100644 (file)
--- a/crypto/rmd128.c
+++ b/crypto/rmd128.c
@@ -13,11 +13,10 @@
  * any later version.
  *
  */
+#include <crypto/internal/hash.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <linux/crypto.h>
-#include <linux/cryptohash.h>
 #include <linux/types.h>
 #include <asm/byteorder.h>
 
@@ -26,7 +25,7 @@
 struct rmd128_ctx {
        u64 byte_count;
        u32 state[4];
-       u32 buffer[16];
+       __le32 buffer[16];
 };
 
 #define K1  RMD_K1
@@ -44,11 +43,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)) + (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;
 
@@ -218,31 +217,9 @@ static void rmd128_transform(u32 *state, u32 const *in)
        return;
 }
 
-static inline void le32_to_cpu_array(u32 *buf, unsigned int words)
+static int rmd128_init(struct shash_desc *desc)
 {
-       while (words--) {
-               le32_to_cpus(buf);
-               buf++;
-       }
-}
-
-static inline void cpu_to_le32_array(u32 *buf, unsigned int words)
-{
-       while (words--) {
-               cpu_to_le32s(buf);
-               buf++;
-       }
-}
-
-static inline void rmd128_transform_helper(struct rmd128_ctx *ctx)
-{
-       le32_to_cpu_array(ctx->buffer, sizeof(ctx->buffer) / sizeof(u32));
-       rmd128_transform(ctx->state, ctx->buffer);
-}
-
-static void rmd128_init(struct crypto_tfm *tfm)
-{
-       struct rmd128_ctx *rctx = crypto_tfm_ctx(tfm);
+       struct rmd128_ctx *rctx = shash_desc_ctx(desc);
 
        rctx->byte_count = 0;
 
@@ -252,12 +229,14 @@ static void rmd128_init(struct crypto_tfm *tfm)
        rctx->state[3] = RMD_H3;
 
        memset(rctx->buffer, 0, sizeof(rctx->buffer));
+
+       return 0;
 }
 
-static void rmd128_update(struct crypto_tfm *tfm, const u8 *data,
-                         unsigned int len)
+static int rmd128_update(struct shash_desc *desc, const u8 *data,
+                        unsigned int len)
 {
-       struct rmd128_ctx *rctx = crypto_tfm_ctx(tfm);
+       struct rmd128_ctx *rctx = shash_desc_ctx(desc);
        const u32 avail = sizeof(rctx->buffer) - (rctx->byte_count & 0x3f);
 
        rctx->byte_count += len;
@@ -266,73 +245,80 @@ static void rmd128_update(struct crypto_tfm *tfm, const u8 *data,
        if (avail > len) {
                memcpy((char *)rctx->buffer + (sizeof(rctx->buffer) - avail),
                       data, len);
-               return;
+               goto out;
        }
 
        memcpy((char *)rctx->buffer + (sizeof(rctx->buffer) - avail),
               data, avail);
 
-       rmd128_transform_helper(rctx);
+       rmd128_transform(rctx->state, rctx->buffer);
        data += avail;
        len -= avail;
 
        while (len >= sizeof(rctx->buffer)) {
                memcpy(rctx->buffer, data, sizeof(rctx->buffer));
-               rmd128_transform_helper(rctx);
+               rmd128_transform(rctx->state, rctx->buffer);
                data += sizeof(rctx->buffer);
                len -= sizeof(rctx->buffer);
        }
 
        memcpy(rctx->buffer, data, len);
+
+out:
+       return 0;
 }
 
 /* Add padding and return the message digest. */
-static void rmd128_final(struct crypto_tfm *tfm, u8 *out)
+static int rmd128_final(struct shash_desc *desc, u8 *out)
 {
-       struct rmd128_ctx *rctx = crypto_tfm_ctx(tfm);
-       u32 index, padlen;
-       u64 bits;
+       struct rmd128_ctx *rctx = shash_desc_ctx(desc);
+       u32 i, index, padlen;
+       __le64 bits;
+       __le32 *dst = (__le32 *)out;
        static const u8 padding[64] = { 0x80, };
-       bits = rctx->byte_count << 3;
+
+       bits = cpu_to_le64(rctx->byte_count << 3);
 
        /* Pad out to 56 mod 64 */
        index = rctx->byte_count & 0x3f;
        padlen = (index < 56) ? (56 - index) : ((64+56) - index);
-       rmd128_update(tfm, padding, padlen);
+       rmd128_update(desc, padding, padlen);
 
        /* Append length */
-       rmd128_update(tfm, (const u8 *)&bits, sizeof(bits));
+       rmd128_update(desc, (const u8 *)&bits, sizeof(bits));
 
        /* Store state in digest */
-       memcpy(out, rctx->state, sizeof(rctx->state));
+       for (i = 0; i < 4; i++)
+               dst[i] = cpu_to_le32p(&rctx->state[i]);
 
        /* Wipe context */
        memset(rctx, 0, sizeof(*rctx));
+
+       return 0;
 }
 
-static struct crypto_alg alg = {
-       .cra_name        =      "rmd128",
-       .cra_driver_name =      "rmd128",
-       .cra_flags       =      CRYPTO_ALG_TYPE_DIGEST,
-       .cra_blocksize   =      RMD128_BLOCK_SIZE,
-       .cra_ctxsize     =      sizeof(struct rmd128_ctx),
-       .cra_module      =      THIS_MODULE,
-       .cra_list        =      LIST_HEAD_INIT(alg.cra_list),
-       .cra_u           =      { .digest = {
-       .dia_digestsize  =      RMD128_DIGEST_SIZE,
-       .dia_init        =      rmd128_init,
-       .dia_update      =      rmd128_update,
-       .dia_final       =      rmd128_final } }
+static struct shash_alg alg = {
+       .digestsize     =       RMD128_DIGEST_SIZE,
+       .init           =       rmd128_init,
+       .update         =       rmd128_update,
+       .final          =       rmd128_final,
+       .descsize       =       sizeof(struct rmd128_ctx),
+       .base           =       {
+               .cra_name        =      "rmd128",
+               .cra_flags       =      CRYPTO_ALG_TYPE_SHASH,
+               .cra_blocksize   =      RMD128_BLOCK_SIZE,
+               .cra_module      =      THIS_MODULE,
+       }
 };
 
 static int __init rmd128_mod_init(void)
 {
-       return crypto_register_alg(&alg);
+       return crypto_register_shash(&alg);
 }
 
 static void __exit rmd128_mod_fini(void)
 {
-       crypto_unregister_alg(&alg);
+       crypto_unregister_shash(&alg);
 }
 
 module_init(rmd128_mod_init);
@@ -340,5 +326,3 @@ module_exit(rmd128_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("RIPEMD-128 Message Digest");
-
-MODULE_ALIAS("rmd128");