media: ov5640: change 1080p resolution to 1088p

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

diff --git a/crypto/khazad.c b/crypto/khazad.c
index 6809210362c1ee97a938be5b90beb30362094960..527e4e395fc32f8f0d271b372ed93941fb6e1bcc 100644 (file)
--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@@ -23,7 +23,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>
 
@@ -754,23 +753,18 @@ static const u64 c[KHAZAD_ROUNDS + 1] = {
        0xccc41d14c363da5dULL, 0x5fdc7dcd7f5a6c5cULL, 0xf726ffede89d6f8eULL
 };
 
-static int khazad_setkey(void *ctx_arg, const u8 *in_key,
-                       unsigned int key_len, u32 *flags)
+static int khazad_setkey(struct crypto_tfm *tfm, const u8 *in_key,
+                        unsigned int key_len)
 {
-       struct khazad_ctx *ctx = ctx_arg;
-       const __be64 *key = (const __be64 *)in_key;
+       struct khazad_ctx *ctx = crypto_tfm_ctx(tfm);
+       const __be32 *key = (const __be32 *)in_key;
        int r;
        const u64 *S = T7;
        u64 K2, K1;
-       
-       if (key_len != 16)
-       {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               return -EINVAL;
-       }
 
-       K2 = be64_to_cpu(key[0]);
-       K1 = be64_to_cpu(key[1]);
+       /* key is supposed to be 32-bit aligned */
+       K2 = ((u64)be32_to_cpu(key[0]) << 32) | be32_to_cpu(key[1]);
+       K1 = ((u64)be32_to_cpu(key[2]) << 32) | be32_to_cpu(key[3]);
 
        /* setup the encrypt key */
        for (r = 0; r <= KHAZAD_ROUNDS; r++) {
@@ -840,15 +834,15 @@ static void khazad_crypt(const u64 roundKey[KHAZAD_ROUNDS + 1],
        *dst = cpu_to_be64(state);
 }
 
-static void khazad_encrypt(void *ctx_arg, u8 *dst, const u8 *src)
+static void khazad_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-       struct khazad_ctx *ctx = ctx_arg;
+       struct khazad_ctx *ctx = crypto_tfm_ctx(tfm);
        khazad_crypt(ctx->E, dst, src);
 }
 
-static void khazad_decrypt(void *ctx_arg, u8 *dst, const u8 *src)
+static void khazad_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
-       struct khazad_ctx *ctx = ctx_arg;
+       struct khazad_ctx *ctx = crypto_tfm_ctx(tfm);
        khazad_crypt(ctx->D, dst, src);
 }
 
@@ -857,6 +851,7 @@ static struct crypto_alg khazad_alg = {
        .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
        .cra_blocksize          =       KHAZAD_BLOCK_SIZE,
        .cra_ctxsize            =       sizeof (struct khazad_ctx),
+       .cra_alignmask          =       7,
        .cra_module             =       THIS_MODULE,
        .cra_list               =       LIST_HEAD_INIT(khazad_alg.cra_list),
        .cra_u                  =       { .cipher = {
@@ -867,7 +862,7 @@ static struct crypto_alg khazad_alg = {
        .cia_decrypt            =       khazad_decrypt } }
 };
 
-static int __init init(void)
+static int __init khazad_mod_init(void)
 {
        int ret = 0;
        
@@ -875,14 +870,14 @@ static int __init init(void)
        return ret;
 }
 
-static void __exit fini(void)
+static void __exit khazad_mod_fini(void)
 {
        crypto_unregister_alg(&khazad_alg);
 }
 
 
-module_init(init);
-module_exit(fini);
+module_init(khazad_mod_init);
+module_exit(khazad_mod_fini);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Khazad Cryptographic Algorithm");