Merge tag 'r8169-20060920-00' of git://electric-eye.fr.zoreil.com/home/romieu/linux...

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

diff --git a/crypto/anubis.c b/crypto/anubis.c
index 2c796bd..1c771f7 100644 (file)
--- a/crypto/anubis.c
+++ b/crypto/anubis.c
@@ -460,16 +460,16 @@ static const u32 rc[] = {
        0xf726ffedU, 0xe89d6f8eU, 0x19a0f089U,
 };
 
-static int anubis_setkey(void *ctx_arg, const u8 *in_key,
-                        unsigned int key_len, u32 *flags)
+static int anubis_setkey(struct crypto_tfm *tfm, const u8 *in_key,
+                        unsigned int key_len)
 {
+       struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);
        const __be32 *key = (const __be32 *)in_key;
+       u32 *flags = &tfm->crt_flags;
        int N, R, i, r;
        u32 kappa[ANUBIS_MAX_N];
        u32 inter[ANUBIS_MAX_N];
 
-       struct anubis_ctx *ctx = ctx_arg;
-
        switch (key_len)
        {
                case 16: case 20: case 24: case 28:
@@ -660,15 +660,15 @@ static void anubis_crypt(u32 roundKey[ANUBIS_MAX_ROUNDS + 1][4],
                dst[i] = cpu_to_be32(inter[i]);
 }
 
-static void anubis_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
+static void anubis_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-       struct anubis_ctx *ctx = ctx_arg;
+       struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);
        anubis_crypt(ctx->E, dst, src, ctx->R);
 }
 
-static void anubis_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
+static void anubis_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-       struct anubis_ctx *ctx = ctx_arg;
+       struct anubis_ctx *ctx = crypto_tfm_ctx(tfm);
        anubis_crypt(ctx->D, dst, src, ctx->R);
 }