Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Mar 2012 20:20:43 +0000 (13:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Mar 2012 20:20:43 +0000 (13:20 -0700)
Pull crypto update from Herbert Xu:
 "* sha512 bug fixes (already in your tree).
  * SHA224/SHA384 AEAD support in caam.
  * X86-64 optimised version of Camellia.
  * Tegra AES support.
  * Bulk algorithm registration interface to make driver registration easier.
  * padata race fixes.
  * Misc fixes."

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
  padata: Fix race on sequence number wrap
  padata: Fix race in the serialization path
  crypto: camellia - add assembler implementation for x86_64
  crypto: camellia - rename camellia.c to camellia_generic.c
  crypto: camellia - fix checkpatch warnings
  crypto: camellia - rename camellia module to camellia_generic
  crypto: tcrypt - add more camellia tests
  crypto: testmgr - add more camellia test vectors
  crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro
  crypto: twofish-x86_64/i586 - set alignmask to zero
  crypto: blowfish-x86_64 - set alignmask to zero
  crypto: serpent-sse2 - combine ablk_*_init functions
  crypto: blowfish-x86_64 - use crypto_[un]register_algs
  crypto: twofish-x86_64-3way - use crypto_[un]register_algs
  crypto: serpent-sse2 - use crypto_[un]register_algs
  crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()
  crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()
  crypto: In crypto_add_alg(), 'exact' wants to be initialized to 0
  crypto: caam - fix gcc 4.6 warning
  crypto: Add bulk algorithm registration interface
  ...

39 files changed:
arch/arm/mach-tegra/fuse.c
arch/x86/crypto/Makefile
arch/x86/crypto/blowfish_glue.c
arch/x86/crypto/camellia-x86_64-asm_64.S [new file with mode: 0644]
arch/x86/crypto/camellia_glue.c [new file with mode: 0644]
arch/x86/crypto/serpent-sse2-i586-asm_32.S
arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
arch/x86/crypto/serpent_sse2_glue.c
arch/x86/crypto/twofish_glue.c
arch/x86/crypto/twofish_glue_3way.c
crypto/Kconfig
crypto/Makefile
crypto/algapi.c
crypto/camellia.c [deleted file]
crypto/camellia_generic.c [new file with mode: 0644]
crypto/crypto_user.c
crypto/tcrypt.c
crypto/testmgr.c
crypto/testmgr.h
drivers/char/hw_random/tx4939-rng.c
drivers/crypto/Kconfig
drivers/crypto/Makefile
drivers/crypto/caam/caamalg.c
drivers/crypto/caam/ctrl.c
drivers/crypto/geode-aes.c
drivers/crypto/hifn_795x.c
drivers/crypto/ixp4xx_crypto.c
drivers/crypto/mv_cesa.c
drivers/crypto/n2_core.c
drivers/crypto/omap-aes.c
drivers/crypto/omap-sham.c
drivers/crypto/picoxcell_crypto.c
drivers/crypto/s5p-sss.c
drivers/crypto/talitos.c
drivers/crypto/tegra-aes.c [new file with mode: 0644]
drivers/crypto/tegra-aes.h [new file with mode: 0644]
include/linux/crypto.h
include/linux/padata.h
kernel/padata.c

index 1fa26d9..ea49bd9 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
+#include <linux/module.h>
 
 #include <mach/iomap.h>
 
@@ -58,6 +59,7 @@ unsigned long long tegra_chip_uid(void)
        hi = fuse_readl(FUSE_UID_HIGH);
        return (hi << 32ull) | lo;
 }
+EXPORT_SYMBOL(tegra_chip_uid);
 
 int tegra_sku_id(void)
 {
index 2b0b963..e191ac0 100644 (file)
@@ -8,6 +8,7 @@ obj-$(CONFIG_CRYPTO_SALSA20_586) += salsa20-i586.o
 obj-$(CONFIG_CRYPTO_SERPENT_SSE2_586) += serpent-sse2-i586.o
 
 obj-$(CONFIG_CRYPTO_AES_X86_64) += aes-x86_64.o
+obj-$(CONFIG_CRYPTO_CAMELLIA_X86_64) += camellia-x86_64.o
 obj-$(CONFIG_CRYPTO_BLOWFISH_X86_64) += blowfish-x86_64.o
 obj-$(CONFIG_CRYPTO_TWOFISH_X86_64) += twofish-x86_64.o
 obj-$(CONFIG_CRYPTO_TWOFISH_X86_64_3WAY) += twofish-x86_64-3way.o
@@ -25,6 +26,7 @@ salsa20-i586-y := salsa20-i586-asm_32.o salsa20_glue.o
 serpent-sse2-i586-y := serpent-sse2-i586-asm_32.o serpent_sse2_glue.o
 
 aes-x86_64-y := aes-x86_64-asm_64.o aes_glue.o
+camellia-x86_64-y := camellia-x86_64-asm_64.o camellia_glue.o
 blowfish-x86_64-y := blowfish-x86_64-asm_64.o blowfish_glue.o
 twofish-x86_64-y := twofish-x86_64-asm_64.o twofish_glue.o
 twofish-x86_64-3way-y := twofish-x86_64-asm_64-3way.o twofish_glue_3way.o
index b05aa16..7967474 100644 (file)
@@ -25,6 +25,7 @@
  *
  */
 
+#include <asm/processor.h>
 #include <crypto/blowfish.h>
 #include <linux/crypto.h>
 #include <linux/init.h>
@@ -76,27 +77,6 @@ static void blowfish_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
        blowfish_dec_blk(crypto_tfm_ctx(tfm), dst, src);
 }
 
-static struct crypto_alg bf_alg = {
-       .cra_name               =       "blowfish",
-       .cra_driver_name        =       "blowfish-asm",
-       .cra_priority           =       200,
-       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize          =       BF_BLOCK_SIZE,
-       .cra_ctxsize            =       sizeof(struct bf_ctx),
-       .cra_alignmask          =       3,
-       .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(bf_alg.cra_list),
-       .cra_u                  =       {
-               .cipher = {
-                       .cia_min_keysize        =       BF_MIN_KEY_SIZE,
-                       .cia_max_keysize        =       BF_MAX_KEY_SIZE,
-                       .cia_setkey             =       blowfish_setkey,
-                       .cia_encrypt            =       blowfish_encrypt,
-                       .cia_decrypt            =       blowfish_decrypt,
-               }
-       }
-};
-
 static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
                     void (*fn)(struct bf_ctx *, u8 *, const u8 *),
                     void (*fn_4way)(struct bf_ctx *, u8 *, const u8 *))
@@ -160,28 +140,6 @@ static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return ecb_crypt(desc, &walk, blowfish_dec_blk, blowfish_dec_blk_4way);
 }
 
-static struct crypto_alg blk_ecb_alg = {
-       .cra_name               = "ecb(blowfish)",
-       .cra_driver_name        = "ecb-blowfish-asm",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = BF_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct bf_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_ecb_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = BF_MIN_KEY_SIZE,
-                       .max_keysize    = BF_MAX_KEY_SIZE,
-                       .setkey         = blowfish_setkey,
-                       .encrypt        = ecb_encrypt,
-                       .decrypt        = ecb_decrypt,
-               },
-       },
-};
-
 static unsigned int __cbc_encrypt(struct blkcipher_desc *desc,
                                  struct blkcipher_walk *walk)
 {
@@ -307,29 +265,6 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return err;
 }
 
-static struct crypto_alg blk_cbc_alg = {
-       .cra_name               = "cbc(blowfish)",
-       .cra_driver_name        = "cbc-blowfish-asm",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = BF_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct bf_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_cbc_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = BF_MIN_KEY_SIZE,
-                       .max_keysize    = BF_MAX_KEY_SIZE,
-                       .ivsize         = BF_BLOCK_SIZE,
-                       .setkey         = blowfish_setkey,
-                       .encrypt        = cbc_encrypt,
-                       .decrypt        = cbc_decrypt,
-               },
-       },
-};
-
 static void ctr_crypt_final(struct bf_ctx *ctx, struct blkcipher_walk *walk)
 {
        u8 *ctrblk = walk->iv;
@@ -423,7 +358,67 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return err;
 }
 
-static struct crypto_alg blk_ctr_alg = {
+static struct crypto_alg bf_algs[4] = { {
+       .cra_name               = "blowfish",
+       .cra_driver_name        = "blowfish-asm",
+       .cra_priority           = 200,
+       .cra_flags              = CRYPTO_ALG_TYPE_CIPHER,
+       .cra_blocksize          = BF_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct bf_ctx),
+       .cra_alignmask          = 0,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(bf_algs[0].cra_list),
+       .cra_u = {
+               .cipher = {
+                       .cia_min_keysize        = BF_MIN_KEY_SIZE,
+                       .cia_max_keysize        = BF_MAX_KEY_SIZE,
+                       .cia_setkey             = blowfish_setkey,
+                       .cia_encrypt            = blowfish_encrypt,
+                       .cia_decrypt            = blowfish_decrypt,
+               }
+       }
+}, {
+       .cra_name               = "ecb(blowfish)",
+       .cra_driver_name        = "ecb-blowfish-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = BF_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct bf_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(bf_algs[1].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = BF_MIN_KEY_SIZE,
+                       .max_keysize    = BF_MAX_KEY_SIZE,
+                       .setkey         = blowfish_setkey,
+                       .encrypt        = ecb_encrypt,
+                       .decrypt        = ecb_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "cbc(blowfish)",
+       .cra_driver_name        = "cbc-blowfish-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = BF_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct bf_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(bf_algs[2].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = BF_MIN_KEY_SIZE,
+                       .max_keysize    = BF_MAX_KEY_SIZE,
+                       .ivsize         = BF_BLOCK_SIZE,
+                       .setkey         = blowfish_setkey,
+                       .encrypt        = cbc_encrypt,
+                       .decrypt        = cbc_decrypt,
+               },
+       },
+}, {
        .cra_name               = "ctr(blowfish)",
        .cra_driver_name        = "ctr-blowfish-asm",
        .cra_priority           = 300,
@@ -433,7 +428,7 @@ static struct crypto_alg blk_ctr_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_blkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_ctr_alg.cra_list),
+       .cra_list               = LIST_HEAD_INIT(bf_algs[3].cra_list),
        .cra_u = {
                .blkcipher = {
                        .min_keysize    = BF_MIN_KEY_SIZE,
@@ -444,43 +439,45 @@ static struct crypto_alg blk_ctr_alg = {
                        .decrypt        = ctr_crypt,
                },
        },
-};
+} };
+
+static bool is_blacklisted_cpu(void)
+{
+       if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+               return false;
+
+       if (boot_cpu_data.x86 == 0x0f) {
+               /*
+                * On Pentium 4, blowfish-x86_64 is slower than generic C
+                * implementation because use of 64bit rotates (which are really
+                * slow on P4). Therefore blacklist P4s.
+                */
+               return true;
+       }
+
+       return false;
+}
+
+static int force;
+module_param(force, int, 0);
+MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
 
 static int __init init(void)
 {
-       int err;
+       if (!force && is_blacklisted_cpu()) {
+               printk(KERN_INFO
+                       "blowfish-x86_64: performance on this CPU "
+                       "would be suboptimal: disabling "
+                       "blowfish-x86_64.\n");
+               return -ENODEV;
+       }
 
-       err = crypto_register_alg(&bf_alg);
-       if (err)
-               goto bf_err;
-       err = crypto_register_alg(&blk_ecb_alg);
-       if (err)
-               goto ecb_err;
-       err = crypto_register_alg(&blk_cbc_alg);
-       if (err)
-               goto cbc_err;
-       err = crypto_register_alg(&blk_ctr_alg);
-       if (err)
-               goto ctr_err;
-
-       return 0;
-
-ctr_err:
-       crypto_unregister_alg(&blk_cbc_alg);
-cbc_err:
-       crypto_unregister_alg(&blk_ecb_alg);
-ecb_err:
-       crypto_unregister_alg(&bf_alg);
-bf_err:
-       return err;
+       return crypto_register_algs(bf_algs, ARRAY_SIZE(bf_algs));
 }
 
 static void __exit fini(void)
 {
-       crypto_unregister_alg(&blk_ctr_alg);
-       crypto_unregister_alg(&blk_cbc_alg);
-       crypto_unregister_alg(&blk_ecb_alg);
-       crypto_unregister_alg(&bf_alg);
+       crypto_unregister_algs(bf_algs, ARRAY_SIZE(bf_algs));
 }
 
 module_init(init);
diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
new file mode 100644 (file)
index 0000000..0b33743
--- /dev/null
@@ -0,0 +1,520 @@
+/*
+ * Camellia Cipher Algorithm (x86_64)
+ *
+ * Copyright (C) 2012 Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ *
+ */
+
+.file "camellia-x86_64-asm_64.S"
+.text
+
+.extern camellia_sp10011110;
+.extern camellia_sp22000222;
+.extern camellia_sp03303033;
+.extern camellia_sp00444404;
+.extern camellia_sp02220222;
+.extern camellia_sp30333033;
+.extern camellia_sp44044404;
+.extern camellia_sp11101110;
+
+#define sp10011110 camellia_sp10011110
+#define sp22000222 camellia_sp22000222
+#define sp03303033 camellia_sp03303033
+#define sp00444404 camellia_sp00444404
+#define sp02220222 camellia_sp02220222
+#define sp30333033 camellia_sp30333033
+#define sp44044404 camellia_sp44044404
+#define sp11101110 camellia_sp11101110
+
+#define CAMELLIA_TABLE_BYTE_LEN 272
+
+/* struct camellia_ctx: */
+#define key_table 0
+#define key_length CAMELLIA_TABLE_BYTE_LEN
+
+/* register macros */
+#define CTX %rdi
+#define RIO %rsi
+#define RIOd %esi
+
+#define RAB0 %rax
+#define RCD0 %rcx
+#define RAB1 %rbx
+#define RCD1 %rdx
+
+#define RAB0d %eax
+#define RCD0d %ecx
+#define RAB1d %ebx
+#define RCD1d %edx
+
+#define RAB0bl %al
+#define RCD0bl %cl
+#define RAB1bl %bl
+#define RCD1bl %dl
+
+#define RAB0bh %ah
+#define RCD0bh %ch
+#define RAB1bh %bh
+#define RCD1bh %dh
+
+#define RT0 %rsi
+#define RT1 %rbp
+#define RT2 %r8
+
+#define RT0d %esi
+#define RT1d %ebp
+#define RT2d %r8d
+
+#define RT2bl %r8b
+
+#define RXOR %r9
+#define RRBP %r10
+#define RDST %r11
+
+#define RXORd %r9d
+#define RXORbl %r9b
+
+#define xor2ror16(T0, T1, tmp1, tmp2, ab, dst) \
+       movzbl ab ## bl,                tmp2 ## d; \
+       movzbl ab ## bh,                tmp1 ## d; \
+       rorq $16,                       ab; \
+       xorq T0(, tmp2, 8),             dst; \
+       xorq T1(, tmp1, 8),             dst;
+
+/**********************************************************************
+  1-way camellia
+ **********************************************************************/
+#define roundsm(ab, subkey, cd) \
+       movq (key_table + ((subkey) * 2) * 4)(CTX),     RT2; \
+       \
+       xor2ror16(sp00444404, sp03303033, RT0, RT1, ab ## 0, cd ## 0); \
+       xor2ror16(sp22000222, sp10011110, RT0, RT1, ab ## 0, RT2); \
+       xor2ror16(sp11101110, sp44044404, RT0, RT1, ab ## 0, cd ## 0); \
+       xor2ror16(sp30333033, sp02220222, RT0, RT1, ab ## 0, RT2); \
+       \
+       xorq RT2,                                       cd ## 0;
+
+#define fls(l, r, kl, kr) \
+       movl (key_table + ((kl) * 2) * 4)(CTX),         RT0d; \
+       andl l ## 0d,                                   RT0d; \
+       roll $1,                                        RT0d; \
+       shlq $32,                                       RT0; \
+       xorq RT0,                                       l ## 0; \
+       movq (key_table + ((kr) * 2) * 4)(CTX),         RT1; \
+       orq r ## 0,                                     RT1; \
+       shrq $32,                                       RT1; \
+       xorq RT1,                                       r ## 0; \
+       \
+       movq (key_table + ((kl) * 2) * 4)(CTX),         RT2; \
+       orq l ## 0,                                     RT2; \
+       shrq $32,                                       RT2; \
+       xorq RT2,                                       l ## 0; \
+       movl (key_table + ((kr) * 2) * 4)(CTX),         RT0d; \
+       andl r ## 0d,                                   RT0d; \
+       roll $1,                                        RT0d; \
+       shlq $32,                                       RT0; \
+       xorq RT0,                                       r ## 0;
+
+#define enc_rounds(i) \
+       roundsm(RAB, i + 2, RCD); \
+       roundsm(RCD, i + 3, RAB); \
+       roundsm(RAB, i + 4, RCD); \
+       roundsm(RCD, i + 5, RAB); \
+       roundsm(RAB, i + 6, RCD); \
+       roundsm(RCD, i + 7, RAB);
+
+#define enc_fls(i) \
+       fls(RAB, RCD, i + 0, i + 1);
+
+#define enc_inpack() \
+       movq (RIO),                     RAB0; \
+       bswapq                          RAB0; \
+       rolq $32,                       RAB0; \
+       movq 4*2(RIO),                  RCD0; \
+       bswapq                          RCD0; \
+       rorq $32,                       RCD0; \
+       xorq key_table(CTX),            RAB0;
+
+#define enc_outunpack(op, max) \
+       xorq key_table(CTX, max, 8),    RCD0; \
+       rorq $32,                       RCD0; \
+       bswapq                          RCD0; \
+       op ## q RCD0,                   (RIO); \
+       rolq $32,                       RAB0; \
+       bswapq                          RAB0; \
+       op ## q RAB0,                   4*2(RIO);
+
+#define dec_rounds(i) \
+       roundsm(RAB, i + 7, RCD); \
+       roundsm(RCD, i + 6, RAB); \
+       roundsm(RAB, i + 5, RCD); \
+       roundsm(RCD, i + 4, RAB); \
+       roundsm(RAB, i + 3, RCD); \
+       roundsm(RCD, i + 2, RAB);
+
+#define dec_fls(i) \
+       fls(RAB, RCD, i + 1, i + 0);
+
+#define dec_inpack(max) \
+       movq (RIO),                     RAB0; \
+       bswapq                          RAB0; \
+       rolq $32,                       RAB0; \
+       movq 4*2(RIO),                  RCD0; \
+       bswapq                          RCD0; \
+       rorq $32,                       RCD0; \
+       xorq key_table(CTX, max, 8),    RAB0;
+
+#define dec_outunpack() \
+       xorq key_table(CTX),            RCD0; \
+       rorq $32,                       RCD0; \
+       bswapq                          RCD0; \
+       movq RCD0,                      (RIO); \
+       rolq $32,                       RAB0; \
+       bswapq                          RAB0; \
+       movq RAB0,                      4*2(RIO);
+
+.global __camellia_enc_blk;
+.type   __camellia_enc_blk,@function;
+
+__camellia_enc_blk:
+       /* input:
+        *      %rdi: ctx, CTX
+        *      %rsi: dst
+        *      %rdx: src
+        *      %rcx: bool xor
+        */
+       movq %rbp, RRBP;
+
+       movq %rcx, RXOR;
+       movq %rsi, RDST;
+       movq %rdx, RIO;
+
+       enc_inpack();
+
+       enc_rounds(0);
+       enc_fls(8);
+       enc_rounds(8);
+       enc_fls(16);
+       enc_rounds(16);
+       movl $24, RT1d; /* max */
+
+       cmpb $16, key_length(CTX);
+       je __enc_done;
+
+       enc_fls(24);
+       enc_rounds(24);
+       movl $32, RT1d; /* max */
+
+__enc_done:
+       testb RXORbl, RXORbl;
+       movq RDST, RIO;
+
+       jnz __enc_xor;
+
+       enc_outunpack(mov, RT1);
+
+       movq RRBP, %rbp;
+       ret;
+
+__enc_xor:
+       enc_outunpack(xor, RT1);
+
+       movq RRBP, %rbp;
+       ret;
+
+.global camellia_dec_blk;
+.type   camellia_dec_blk,@function;
+
+camellia_dec_blk:
+       /* input:
+        *      %rdi: ctx, CTX
+        *      %rsi: dst
+        *      %rdx: src
+        */
+       cmpl $16, key_length(CTX);
+       movl $32, RT2d;
+       movl $24, RXORd;
+       cmovel RXORd, RT2d; /* max */
+
+       movq %rbp, RRBP;
+       movq %rsi, RDST;
+       movq %rdx, RIO;
+
+       dec_inpack(RT2);
+
+       cmpb $24, RT2bl;
+       je __dec_rounds16;
+
+       dec_rounds(24);
+       dec_fls(24);
+
+__dec_rounds16:
+       dec_rounds(16);
+       dec_fls(16);
+       dec_rounds(8);
+       dec_fls(8);
+       dec_rounds(0);
+
+       movq RDST, RIO;
+
+       dec_outunpack();
+
+       movq RRBP, %rbp;
+       ret;
+
+/**********************************************************************
+  2-way camellia
+ **********************************************************************/
+#define roundsm2(ab, subkey, cd) \
+       movq (key_table + ((subkey) * 2) * 4)(CTX),     RT2; \
+       xorq RT2,                                       cd ## 1; \
+       \
+       xor2ror16(sp00444404, sp03303033, RT0, RT1, ab ## 0, cd ## 0); \
+       xor2ror16(sp22000222, sp10011110, RT0, RT1, ab ## 0, RT2); \
+       xor2ror16(sp11101110, sp44044404, RT0, RT1, ab ## 0, cd ## 0); \
+       xor2ror16(sp30333033, sp02220222, RT0, RT1, ab ## 0, RT2); \
+       \
+               xor2ror16(sp00444404, sp03303033, RT0, RT1, ab ## 1, cd ## 1); \
+               xorq RT2,                                       cd ## 0; \
+               xor2ror16(sp22000222, sp10011110, RT0, RT1, ab ## 1, cd ## 1); \
+               xor2ror16(sp11101110, sp44044404, RT0, RT1, ab ## 1, cd ## 1); \
+               xor2ror16(sp30333033, sp02220222, RT0, RT1, ab ## 1, cd ## 1);
+
+#define fls2(l, r, kl, kr) \
+       movl (key_table + ((kl) * 2) * 4)(CTX),         RT0d; \
+       andl l ## 0d,                                   RT0d; \
+       roll $1,                                        RT0d; \
+       shlq $32,                                       RT0; \
+       xorq RT0,                                       l ## 0; \
+       movq (key_table + ((kr) * 2) * 4)(CTX),         RT1; \
+       orq r ## 0,                                     RT1; \
+       shrq $32,                                       RT1; \
+       xorq RT1,                                       r ## 0; \
+       \
+               movl (key_table + ((kl) * 2) * 4)(CTX),         RT2d; \
+               andl l ## 1d,                                   RT2d; \
+               roll $1,                                        RT2d; \
+               shlq $32,                                       RT2; \
+               xorq RT2,                                       l ## 1; \
+               movq (key_table + ((kr) * 2) * 4)(CTX),         RT0; \
+               orq r ## 1,                                     RT0; \
+               shrq $32,                                       RT0; \
+               xorq RT0,                                       r ## 1; \
+       \
+       movq (key_table + ((kl) * 2) * 4)(CTX),         RT1; \
+       orq l ## 0,                                     RT1; \
+       shrq $32,                                       RT1; \
+       xorq RT1,                                       l ## 0; \
+       movl (key_table + ((kr) * 2) * 4)(CTX),         RT2d; \
+       andl r ## 0d,                                   RT2d; \
+       roll $1,                                        RT2d; \
+       shlq $32,                                       RT2; \
+       xorq RT2,                                       r ## 0; \
+       \
+               movq (key_table + ((kl) * 2) * 4)(CTX),         RT0; \
+               orq l ## 1,                                     RT0; \
+               shrq $32,                                       RT0; \
+               xorq RT0,                                       l ## 1; \
+               movl (key_table + ((kr) * 2) * 4)(CTX),         RT1d; \
+               andl r ## 1d,                                   RT1d; \
+               roll $1,                                        RT1d; \
+               shlq $32,                                       RT1; \
+               xorq RT1,                                       r ## 1;
+
+#define enc_rounds2(i) \
+       roundsm2(RAB, i + 2, RCD); \
+       roundsm2(RCD, i + 3, RAB); \
+       roundsm2(RAB, i + 4, RCD); \
+       roundsm2(RCD, i + 5, RAB); \
+       roundsm2(RAB, i + 6, RCD); \
+       roundsm2(RCD, i + 7, RAB);
+
+#define enc_fls2(i) \
+       fls2(RAB, RCD, i + 0, i + 1);
+
+#define enc_inpack2() \
+       movq (RIO),                     RAB0; \
+       bswapq                          RAB0; \
+       rorq $32,                       RAB0; \
+       movq 4*2(RIO),                  RCD0; \
+       bswapq                          RCD0; \
+       rolq $32,                       RCD0; \
+       xorq key_table(CTX),            RAB0; \
+       \
+               movq 8*2(RIO),                  RAB1; \
+               bswapq                          RAB1; \
+               rorq $32,                       RAB1; \
+               movq 12*2(RIO),                 RCD1; \
+               bswapq                          RCD1; \
+               rolq $32,                       RCD1; \
+               xorq key_table(CTX),            RAB1;
+
+#define enc_outunpack2(op, max) \
+       xorq key_table(CTX, max, 8),    RCD0; \
+       rolq $32,                       RCD0; \
+       bswapq                          RCD0; \
+       op ## q RCD0,                   (RIO); \
+       rorq $32,                       RAB0; \
+       bswapq                          RAB0; \
+       op ## q RAB0,                   4*2(RIO); \
+       \
+               xorq key_table(CTX, max, 8),    RCD1; \
+               rolq $32,                       RCD1; \
+               bswapq                          RCD1; \
+               op ## q RCD1,                   8*2(RIO); \
+               rorq $32,                       RAB1; \
+               bswapq                          RAB1; \
+               op ## q RAB1,                   12*2(RIO);
+
+#define dec_rounds2(i) \
+       roundsm2(RAB, i + 7, RCD); \
+       roundsm2(RCD, i + 6, RAB); \
+       roundsm2(RAB, i + 5, RCD); \
+       roundsm2(RCD, i + 4, RAB); \
+       roundsm2(RAB, i + 3, RCD); \
+       roundsm2(RCD, i + 2, RAB);
+
+#define dec_fls2(i) \
+       fls2(RAB, RCD, i + 1, i + 0);
+
+#define dec_inpack2(max) \
+       movq (RIO),                     RAB0; \
+       bswapq                          RAB0; \
+       rorq $32,                       RAB0; \
+       movq 4*2(RIO),                  RCD0; \
+       bswapq                          RCD0; \
+       rolq $32,                       RCD0; \
+       xorq key_table(CTX, max, 8),    RAB0; \
+       \
+               movq 8*2(RIO),                  RAB1; \
+               bswapq                          RAB1; \
+               rorq $32,                       RAB1; \
+               movq 12*2(RIO),                 RCD1; \
+               bswapq                          RCD1; \
+               rolq $32,                       RCD1; \
+               xorq key_table(CTX, max, 8),    RAB1;
+
+#define dec_outunpack2() \
+       xorq key_table(CTX),            RCD0; \
+       rolq $32,                       RCD0; \
+       bswapq                          RCD0; \
+       movq RCD0,                      (RIO); \
+       rorq $32,                       RAB0; \
+       bswapq                          RAB0; \
+       movq RAB0,                      4*2(RIO); \
+       \
+               xorq key_table(CTX),            RCD1; \
+               rolq $32,                       RCD1; \
+               bswapq                          RCD1; \
+               movq RCD1,                      8*2(RIO); \
+               rorq $32,                       RAB1; \
+               bswapq                          RAB1; \
+               movq RAB1,                      12*2(RIO);
+
+.global __camellia_enc_blk_2way;
+.type   __camellia_enc_blk_2way,@function;
+
+__camellia_enc_blk_2way:
+       /* input:
+        *      %rdi: ctx, CTX
+        *      %rsi: dst
+        *      %rdx: src
+        *      %rcx: bool xor
+        */
+       pushq %rbx;
+
+       movq %rbp, RRBP;
+       movq %rcx, RXOR;
+       movq %rsi, RDST;
+       movq %rdx, RIO;
+
+       enc_inpack2();
+
+       enc_rounds2(0);
+       enc_fls2(8);
+       enc_rounds2(8);
+       enc_fls2(16);
+       enc_rounds2(16);
+       movl $24, RT2d; /* max */
+
+       cmpb $16, key_length(CTX);
+       je __enc2_done;
+
+       enc_fls2(24);
+       enc_rounds2(24);
+       movl $32, RT2d; /* max */
+
+__enc2_done:
+       test RXORbl, RXORbl;
+       movq RDST, RIO;
+       jnz __enc2_xor;
+
+       enc_outunpack2(mov, RT2);
+
+       movq RRBP, %rbp;
+       popq %rbx;
+       ret;
+
+__enc2_xor:
+       enc_outunpack2(xor, RT2);
+
+       movq RRBP, %rbp;
+       popq %rbx;
+       ret;
+
+.global camellia_dec_blk_2way;
+.type   camellia_dec_blk_2way,@function;
+
+camellia_dec_blk_2way:
+       /* input:
+        *      %rdi: ctx, CTX
+        *      %rsi: dst
+        *      %rdx: src
+        */
+       cmpl $16, key_length(CTX);
+       movl $32, RT2d;
+       movl $24, RXORd;
+       cmovel RXORd, RT2d; /* max */
+
+       movq %rbx, RXOR;
+       movq %rbp, RRBP;
+       movq %rsi, RDST;
+       movq %rdx, RIO;
+
+       dec_inpack2(RT2);
+
+       cmpb $24, RT2bl;
+       je __dec2_rounds16;
+
+       dec_rounds2(24);
+       dec_fls2(24);
+
+__dec2_rounds16:
+       dec_rounds2(16);
+       dec_fls2(16);
+       dec_rounds2(8);
+       dec_fls2(8);
+       dec_rounds2(0);
+
+       movq RDST, RIO;
+
+       dec_outunpack2();
+
+       movq RRBP, %rbp;
+       movq RXOR, %rbx;
+       ret;
diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c
new file mode 100644 (file)
index 0000000..1ca36a9
--- /dev/null
@@ -0,0 +1,1952 @@
+/*
+ * Glue Code for assembler optimized version of Camellia
+ *
+ * Copyright (c) 2012 Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
+ *
+ * Camellia parts based on code by:
+ *  Copyright (C) 2006 NTT (Nippon Telegraph and Telephone Corporation)
+ * CBC & ECB parts based on code (crypto/cbc.c,ecb.c) by:
+ *   Copyright (c) 2006 Herbert Xu <herbert@gondor.apana.org.au>
+ * CTR part based on code (crypto/ctr.c) by:
+ *   (C) Copyright IBM Corp. 2007 - Joy Latten <latten@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ *
+ */
+
+#include <asm/processor.h>
+#include <asm/unaligned.h>
+#include <linux/crypto.h>
+#include <linux/init.h>
+#include <linux/module.h>
+#include <linux/types.h>
+#include <crypto/algapi.h>
+#include <crypto/b128ops.h>
+#include <crypto/lrw.h>
+#include <crypto/xts.h>
+
+#define CAMELLIA_MIN_KEY_SIZE  16
+#define CAMELLIA_MAX_KEY_SIZE  32
+#define CAMELLIA_BLOCK_SIZE    16
+#define CAMELLIA_TABLE_BYTE_LEN        272
+
+struct camellia_ctx {
+       u64 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u64)];
+       u32 key_length;
+};
+
+/* regular block cipher functions */
+asmlinkage void __camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst,
+                                  const u8 *src, bool xor);
+asmlinkage void camellia_dec_blk(struct camellia_ctx *ctx, u8 *dst,
+                                const u8 *src);
+
+/* 2-way parallel cipher functions */
+asmlinkage void __camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst,
+                                       const u8 *src, bool xor);
+asmlinkage void camellia_dec_blk_2way(struct camellia_ctx *ctx, u8 *dst,
+                                     const u8 *src);
+
+static inline void camellia_enc_blk(struct camellia_ctx *ctx, u8 *dst,
+                                   const u8 *src)
+{
+       __camellia_enc_blk(ctx, dst, src, false);
+}
+
+static inline void camellia_enc_blk_xor(struct camellia_ctx *ctx, u8 *dst,
+                                       const u8 *src)
+{
+       __camellia_enc_blk(ctx, dst, src, true);
+}
+
+static inline void camellia_enc_blk_2way(struct camellia_ctx *ctx, u8 *dst,
+                                        const u8 *src)
+{
+       __camellia_enc_blk_2way(ctx, dst, src, false);
+}
+
+static inline void camellia_enc_blk_xor_2way(struct camellia_ctx *ctx, u8 *dst,
+                                            const u8 *src)
+{
+       __camellia_enc_blk_2way(ctx, dst, src, true);
+}
+
+static void camellia_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
+{
+       camellia_enc_blk(crypto_tfm_ctx(tfm), dst, src);
+}
+
+static void camellia_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
+{
+       camellia_dec_blk(crypto_tfm_ctx(tfm), dst, src);
+}
+
+/* camellia sboxes */
+const u64 camellia_sp10011110[256] = {
+       0x7000007070707000, 0x8200008282828200, 0x2c00002c2c2c2c00,
+       0xec0000ecececec00, 0xb30000b3b3b3b300, 0x2700002727272700,
+       0xc00000c0c0c0c000, 0xe50000e5e5e5e500, 0xe40000e4e4e4e400,
+       0x8500008585858500, 0x5700005757575700, 0x3500003535353500,
+       0xea0000eaeaeaea00, 0x0c00000c0c0c0c00, 0xae0000aeaeaeae00,
+       0x4100004141414100, 0x2300002323232300, 0xef0000efefefef00,
+       0x6b00006b6b6b6b00, 0x9300009393939300, 0x4500004545454500,
+       0x1900001919191900, 0xa50000a5a5a5a500, 0x2100002121212100,
+       0xed0000edededed00, 0x0e00000e0e0e0e00, 0x4f00004f4f4f4f00,
+       0x4e00004e4e4e4e00, 0x1d00001d1d1d1d00, 0x6500006565656500,
+       0x9200009292929200, 0xbd0000bdbdbdbd00, 0x8600008686868600,
+       0xb80000b8b8b8b800, 0xaf0000afafafaf00, 0x8f00008f8f8f8f00,
+       0x7c00007c7c7c7c00, 0xeb0000ebebebeb00, 0x1f00001f1f1f1f00,
+       0xce0000cececece00, 0x3e00003e3e3e3e00, 0x3000003030303000,
+       0xdc0000dcdcdcdc00, 0x5f00005f5f5f5f00, 0x5e00005e5e5e5e00,
+       0xc50000c5c5c5c500, 0x0b00000b0b0b0b00, 0x1a00001a1a1a1a00,
+       0xa60000a6a6a6a600, 0xe10000e1e1e1e100, 0x3900003939393900,
+       0xca0000cacacaca00, 0xd50000d5d5d5d500, 0x4700004747474700,
+       0x5d00005d5d5d5d00, 0x3d00003d3d3d3d00, 0xd90000d9d9d9d900,
+       0x0100000101010100, 0x5a00005a5a5a5a00, 0xd60000d6d6d6d600,
+       0x5100005151515100, 0x5600005656565600, 0x6c00006c6c6c6c00,
+       0x4d00004d4d4d4d00, 0x8b00008b8b8b8b00, 0x0d00000d0d0d0d00,
+       0x9a00009a9a9a9a00, 0x6600006666666600, 0xfb0000fbfbfbfb00,
+       0xcc0000cccccccc00, 0xb00000b0b0b0b000, 0x2d00002d2d2d2d00,
+       0x7400007474747400, 0x1200001212121200, 0x2b00002b2b2b2b00,
+       0x2000002020202000, 0xf00000f0f0f0f000, 0xb10000b1b1b1b100,
+       0x8400008484848400, 0x9900009999999900, 0xdf0000dfdfdfdf00,
+       0x4c00004c4c4c4c00, 0xcb0000cbcbcbcb00, 0xc20000c2c2c2c200,
+       0x3400003434343400, 0x7e00007e7e7e7e00, 0x7600007676767600,
+       0x0500000505050500, 0x6d00006d6d6d6d00, 0xb70000b7b7b7b700,
+       0xa90000a9a9a9a900, 0x3100003131313100, 0xd10000d1d1d1d100,
+       0x1700001717171700, 0x0400000404040400, 0xd70000d7d7d7d700,
+       0x1400001414141400, 0x5800005858585800, 0x3a00003a3a3a3a00,
+       0x6100006161616100, 0xde0000dededede00, 0x1b00001b1b1b1b00,
+       0x1100001111111100, 0x1c00001c1c1c1c00, 0x3200003232323200,
+       0x0f00000f0f0f0f00, 0x9c00009c9c9c9c00, 0x1600001616161600,
+       0x5300005353535300, 0x1800001818181800, 0xf20000f2f2f2f200,
+       0x2200002222222200, 0xfe0000fefefefe00, 0x4400004444444400,
+       0xcf0000cfcfcfcf00, 0xb20000b2b2b2b200, 0xc30000c3c3c3c300,
+       0xb50000b5b5b5b500, 0x7a00007a7a7a7a00, 0x9100009191919100,
+       0x2400002424242400, 0x0800000808080800, 0xe80000e8e8e8e800,
+       0xa80000a8a8a8a800, 0x6000006060606000, 0xfc0000fcfcfcfc00,
+       0x6900006969696900, 0x5000005050505000, 0xaa0000aaaaaaaa00,
+       0xd00000d0d0d0d000, 0xa00000a0a0a0a000, 0x7d00007d7d7d7d00,
+       0xa10000a1a1a1a100, 0x8900008989898900, 0x6200006262626200,
+       0x9700009797979700, 0x5400005454545400, 0x5b00005b5b5b5b00,
+       0x1e00001e1e1e1e00, 0x9500009595959500, 0xe00000e0e0e0e000,
+       0xff0000ffffffff00, 0x6400006464646400, 0xd20000d2d2d2d200,
+       0x1000001010101000, 0xc40000c4c4c4c400, 0x0000000000000000,
+       0x4800004848484800, 0xa30000a3a3a3a300, 0xf70000f7f7f7f700,
+       0x7500007575757500, 0xdb0000dbdbdbdb00, 0x8a00008a8a8a8a00,
+       0x0300000303030300, 0xe60000e6e6e6e600, 0xda0000dadadada00,
+       0x0900000909090900, 0x3f00003f3f3f3f00, 0xdd0000dddddddd00,
+       0x9400009494949400, 0x8700008787878700, 0x5c00005c5c5c5c00,
+       0x8300008383838300, 0x0200000202020200, 0xcd0000cdcdcdcd00,
+       0x4a00004a4a4a4a00, 0x9000009090909000, 0x3300003333333300,
+       0x7300007373737300, 0x6700006767676700, 0xf60000f6f6f6f600,
+       0xf30000f3f3f3f300, 0x9d00009d9d9d9d00, 0x7f00007f7f7f7f00,
+       0xbf0000bfbfbfbf00, 0xe20000e2e2e2e200, 0x5200005252525200,
+       0x9b00009b9b9b9b00, 0xd80000d8d8d8d800, 0x2600002626262600,
+       0xc80000c8c8c8c800, 0x3700003737373700, 0xc60000c6c6c6c600,
+       0x3b00003b3b3b3b00, 0x8100008181818100, 0x9600009696969600,
+       0x6f00006f6f6f6f00, 0x4b00004b4b4b4b00, 0x1300001313131300,
+       0xbe0000bebebebe00, 0x6300006363636300, 0x2e00002e2e2e2e00,
+       0xe90000e9e9e9e900, 0x7900007979797900, 0xa70000a7a7a7a700,
+       0x8c00008c8c8c8c00, 0x9f00009f9f9f9f00, 0x6e00006e6e6e6e00,
+       0xbc0000bcbcbcbc00, 0x8e00008e8e8e8e00, 0x2900002929292900,
+       0xf50000f5f5f5f500, 0xf90000f9f9f9f900, 0xb60000b6b6b6b600,
+       0x2f00002f2f2f2f00, 0xfd0000fdfdfdfd00, 0xb40000b4b4b4b400,
+       0x5900005959595900, 0x7800007878787800, 0x9800009898989800,
+       0x0600000606060600, 0x6a00006a6a6a6a00, 0xe70000e7e7e7e700,
+       0x4600004646464600, 0x7100007171717100, 0xba0000babababa00,
+       0xd40000d4d4d4d400, 0x2500002525252500, 0xab0000abababab00,
+       0x4200004242424200, 0x8800008888888800, 0xa20000a2a2a2a200,
+       0x8d00008d8d8d8d00, 0xfa0000fafafafa00, 0x7200007272727200,
+       0x0700000707070700, 0xb90000b9b9b9b900, 0x5500005555555500,
+       0xf80000f8f8f8f800, 0xee0000eeeeeeee00, 0xac0000acacacac00,
+       0x0a00000a0a0a0a00, 0x3600003636363600, 0x4900004949494900,
+       0x2a00002a2a2a2a00, 0x6800006868686800, 0x3c00003c3c3c3c00,
+       0x3800003838383800, 0xf10000f1f1f1f100, 0xa40000a4a4a4a400,
+       0x4000004040404000, 0x2800002828282800, 0xd30000d3d3d3d300,
+       0x7b00007b7b7b7b00, 0xbb0000bbbbbbbb00, 0xc90000c9c9c9c900,
+       0x4300004343434300, 0xc10000c1c1c1c100, 0x1500001515151500,
+       0xe30000e3e3e3e300, 0xad0000adadadad00, 0xf40000f4f4f4f400,
+       0x7700007777777700, 0xc70000c7c7c7c700, 0x8000008080808000,
+       0x9e00009e9e9e9e00,
+};
+
+const u64 camellia_sp22000222[256] = {
+       0xe0e0000000e0e0e0, 0x0505000000050505, 0x5858000000585858,
+       0xd9d9000000d9d9d9, 0x6767000000676767, 0x4e4e0000004e4e4e,
+       0x8181000000818181, 0xcbcb000000cbcbcb, 0xc9c9000000c9c9c9,
+       0x0b0b0000000b0b0b, 0xaeae000000aeaeae, 0x6a6a0000006a6a6a,
+       0xd5d5000000d5d5d5, 0x1818000000181818, 0x5d5d0000005d5d5d,
+       0x8282000000828282, 0x4646000000464646, 0xdfdf000000dfdfdf,
+       0xd6d6000000d6d6d6, 0x2727000000272727, 0x8a8a0000008a8a8a,
+       0x3232000000323232, 0x4b4b0000004b4b4b, 0x4242000000424242,
+       0xdbdb000000dbdbdb, 0x1c1c0000001c1c1c, 0x9e9e0000009e9e9e,
+       0x9c9c0000009c9c9c, 0x3a3a0000003a3a3a, 0xcaca000000cacaca,
+       0x2525000000252525, 0x7b7b0000007b7b7b, 0x0d0d0000000d0d0d,
+       0x7171000000717171, 0x5f5f0000005f5f5f, 0x1f1f0000001f1f1f,
+       0xf8f8000000f8f8f8, 0xd7d7000000d7d7d7, 0x3e3e0000003e3e3e,
+       0x9d9d0000009d9d9d, 0x7c7c0000007c7c7c, 0x6060000000606060,
+       0xb9b9000000b9b9b9, 0xbebe000000bebebe, 0xbcbc000000bcbcbc,
+       0x8b8b0000008b8b8b, 0x1616000000161616, 0x3434000000343434,
+       0x4d4d0000004d4d4d, 0xc3c3000000c3c3c3, 0x7272000000727272,
+       0x9595000000959595, 0xabab000000ababab, 0x8e8e0000008e8e8e,
+       0xbaba000000bababa, 0x7a7a0000007a7a7a, 0xb3b3000000b3b3b3,
+       0x0202000000020202, 0xb4b4000000b4b4b4, 0xadad000000adadad,
+       0xa2a2000000a2a2a2, 0xacac000000acacac, 0xd8d8000000d8d8d8,
+       0x9a9a0000009a9a9a, 0x1717000000171717, 0x1a1a0000001a1a1a,
+       0x3535000000353535, 0xcccc000000cccccc, 0xf7f7000000f7f7f7,
+       0x9999000000999999, 0x6161000000616161, 0x5a5a0000005a5a5a,
+       0xe8e8000000e8e8e8, 0x2424000000242424, 0x5656000000565656,
+       0x4040000000404040, 0xe1e1000000e1e1e1, 0x6363000000636363,
+       0x0909000000090909, 0x3333000000333333, 0xbfbf000000bfbfbf,
+       0x9898000000989898, 0x9797000000979797, 0x8585000000858585,
+       0x6868000000686868, 0xfcfc000000fcfcfc, 0xecec000000ececec,
+       0x0a0a0000000a0a0a, 0xdada000000dadada, 0x6f6f0000006f6f6f,
+       0x5353000000535353, 0x6262000000626262, 0xa3a3000000a3a3a3,
+       0x2e2e0000002e2e2e, 0x0808000000080808, 0xafaf000000afafaf,
+       0x2828000000282828, 0xb0b0000000b0b0b0, 0x7474000000747474,
+       0xc2c2000000c2c2c2, 0xbdbd000000bdbdbd, 0x3636000000363636,
+       0x2222000000222222, 0x3838000000383838, 0x6464000000646464,
+       0x1e1e0000001e1e1e, 0x3939000000393939, 0x2c2c0000002c2c2c,
+       0xa6a6000000a6a6a6, 0x3030000000303030, 0xe5e5000000e5e5e5,
+       0x4444000000444444, 0xfdfd000000fdfdfd, 0x8888000000888888,
+       0x9f9f0000009f9f9f, 0x6565000000656565, 0x8787000000878787,
+       0x6b6b0000006b6b6b, 0xf4f4000000f4f4f4, 0x2323000000232323,
+       0x4848000000484848, 0x1010000000101010, 0xd1d1000000d1d1d1,
+       0x5151000000515151, 0xc0c0000000c0c0c0, 0xf9f9000000f9f9f9,
+       0xd2d2000000d2d2d2, 0xa0a0000000a0a0a0, 0x5555000000555555,
+       0xa1a1000000a1a1a1, 0x4141000000414141, 0xfafa000000fafafa,
+       0x4343000000434343, 0x1313000000131313, 0xc4c4000000c4c4c4,
+       0x2f2f0000002f2f2f, 0xa8a8000000a8a8a8, 0xb6b6000000b6b6b6,
+       0x3c3c0000003c3c3c, 0x2b2b0000002b2b2b, 0xc1c1000000c1c1c1,
+       0xffff000000ffffff, 0xc8c8000000c8c8c8, 0xa5a5000000a5a5a5,
+       0x2020000000202020, 0x8989000000898989, 0x0000000000000000,
+       0x9090000000909090, 0x4747000000474747, 0xefef000000efefef,
+       0xeaea000000eaeaea, 0xb7b7000000b7b7b7, 0x1515000000151515,
+       0x0606000000060606, 0xcdcd000000cdcdcd, 0xb5b5000000b5b5b5,
+       0x1212000000121212, 0x7e7e0000007e7e7e, 0xbbbb000000bbbbbb,
+       0x2929000000292929, 0x0f0f0000000f0f0f, 0xb8b8000000b8b8b8,
+       0x0707000000070707, 0x0404000000040404, 0x9b9b0000009b9b9b,
+       0x9494000000949494, 0x2121000000212121, 0x6666000000666666,
+       0xe6e6000000e6e6e6, 0xcece000000cecece, 0xeded000000ededed,
+       0xe7e7000000e7e7e7, 0x3b3b0000003b3b3b, 0xfefe000000fefefe,
+       0x7f7f0000007f7f7f, 0xc5c5000000c5c5c5, 0xa4a4000000a4a4a4,
+       0x3737000000373737, 0xb1b1000000b1b1b1, 0x4c4c0000004c4c4c,
+       0x9191000000919191, 0x6e6e0000006e6e6e, 0x8d8d0000008d8d8d,
+       0x7676000000767676, 0x0303000000030303, 0x2d2d0000002d2d2d,
+       0xdede000000dedede, 0x9696000000969696, 0x2626000000262626,
+       0x7d7d0000007d7d7d, 0xc6c6000000c6c6c6, 0x5c5c0000005c5c5c,
+       0xd3d3000000d3d3d3, 0xf2f2000000f2f2f2, 0x4f4f0000004f4f4f,
+       0x1919000000191919, 0x3f3f0000003f3f3f, 0xdcdc000000dcdcdc,
+       0x7979000000797979, 0x1d1d0000001d1d1d, 0x5252000000525252,
+       0xebeb000000ebebeb, 0xf3f3000000f3f3f3, 0x6d6d0000006d6d6d,
+       0x5e5e0000005e5e5e, 0xfbfb000000fbfbfb, 0x6969000000696969,
+       0xb2b2000000b2b2b2, 0xf0f0000000f0f0f0, 0x3131000000313131,
+       0x0c0c0000000c0c0c, 0xd4d4000000d4d4d4, 0xcfcf000000cfcfcf,
+       0x8c8c0000008c8c8c, 0xe2e2000000e2e2e2, 0x7575000000757575,
+       0xa9a9000000a9a9a9, 0x4a4a0000004a4a4a, 0x5757000000575757,
+       0x8484000000848484, 0x1111000000111111, 0x4545000000454545,
+       0x1b1b0000001b1b1b, 0xf5f5000000f5f5f5, 0xe4e4000000e4e4e4,
+       0x0e0e0000000e0e0e, 0x7373000000737373, 0xaaaa000000aaaaaa,
+       0xf1f1000000f1f1f1, 0xdddd000000dddddd, 0x5959000000595959,
+       0x1414000000141414, 0x6c6c0000006c6c6c, 0x9292000000929292,
+       0x5454000000545454, 0xd0d0000000d0d0d0, 0x7878000000787878,
+       0x7070000000707070, 0xe3e3000000e3e3e3, 0x4949000000494949,
+       0x8080000000808080, 0x5050000000505050, 0xa7a7000000a7a7a7,
+       0xf6f6000000f6f6f6, 0x7777000000777777, 0x9393000000939393,
+       0x8686000000868686, 0x8383000000838383, 0x2a2a0000002a2a2a,
+       0xc7c7000000c7c7c7, 0x5b5b0000005b5b5b, 0xe9e9000000e9e9e9,
+       0xeeee000000eeeeee, 0x8f8f0000008f8f8f, 0x0101000000010101,
+       0x3d3d0000003d3d3d,
+};
+
+const u64 camellia_sp03303033[256] = {
+       0x0038380038003838, 0x0041410041004141, 0x0016160016001616,
+       0x0076760076007676, 0x00d9d900d900d9d9, 0x0093930093009393,
+       0x0060600060006060, 0x00f2f200f200f2f2, 0x0072720072007272,
+       0x00c2c200c200c2c2, 0x00abab00ab00abab, 0x009a9a009a009a9a,
+       0x0075750075007575, 0x0006060006000606, 0x0057570057005757,
+       0x00a0a000a000a0a0, 0x0091910091009191, 0x00f7f700f700f7f7,
+       0x00b5b500b500b5b5, 0x00c9c900c900c9c9, 0x00a2a200a200a2a2,
+       0x008c8c008c008c8c, 0x00d2d200d200d2d2, 0x0090900090009090,
+       0x00f6f600f600f6f6, 0x0007070007000707, 0x00a7a700a700a7a7,
+       0x0027270027002727, 0x008e8e008e008e8e, 0x00b2b200b200b2b2,
+       0x0049490049004949, 0x00dede00de00dede, 0x0043430043004343,
+       0x005c5c005c005c5c, 0x00d7d700d700d7d7, 0x00c7c700c700c7c7,
+       0x003e3e003e003e3e, 0x00f5f500f500f5f5, 0x008f8f008f008f8f,
+       0x0067670067006767, 0x001f1f001f001f1f, 0x0018180018001818,
+       0x006e6e006e006e6e, 0x00afaf00af00afaf, 0x002f2f002f002f2f,
+       0x00e2e200e200e2e2, 0x0085850085008585, 0x000d0d000d000d0d,
+       0x0053530053005353, 0x00f0f000f000f0f0, 0x009c9c009c009c9c,
+       0x0065650065006565, 0x00eaea00ea00eaea, 0x00a3a300a300a3a3,
+       0x00aeae00ae00aeae, 0x009e9e009e009e9e, 0x00ecec00ec00ecec,
+       0x0080800080008080, 0x002d2d002d002d2d, 0x006b6b006b006b6b,
+       0x00a8a800a800a8a8, 0x002b2b002b002b2b, 0x0036360036003636,
+       0x00a6a600a600a6a6, 0x00c5c500c500c5c5, 0x0086860086008686,
+       0x004d4d004d004d4d, 0x0033330033003333, 0x00fdfd00fd00fdfd,
+       0x0066660066006666, 0x0058580058005858, 0x0096960096009696,
+       0x003a3a003a003a3a, 0x0009090009000909, 0x0095950095009595,
+       0x0010100010001010, 0x0078780078007878, 0x00d8d800d800d8d8,
+       0x0042420042004242, 0x00cccc00cc00cccc, 0x00efef00ef00efef,
+       0x0026260026002626, 0x00e5e500e500e5e5, 0x0061610061006161,
+       0x001a1a001a001a1a, 0x003f3f003f003f3f, 0x003b3b003b003b3b,
+       0x0082820082008282, 0x00b6b600b600b6b6, 0x00dbdb00db00dbdb,
+       0x00d4d400d400d4d4, 0x0098980098009898, 0x00e8e800e800e8e8,
+       0x008b8b008b008b8b, 0x0002020002000202, 0x00ebeb00eb00ebeb,
+       0x000a0a000a000a0a, 0x002c2c002c002c2c, 0x001d1d001d001d1d,
+       0x00b0b000b000b0b0, 0x006f6f006f006f6f, 0x008d8d008d008d8d,
+       0x0088880088008888, 0x000e0e000e000e0e, 0x0019190019001919,
+       0x0087870087008787, 0x004e4e004e004e4e, 0x000b0b000b000b0b,
+       0x00a9a900a900a9a9, 0x000c0c000c000c0c, 0x0079790079007979,
+       0x0011110011001111, 0x007f7f007f007f7f, 0x0022220022002222,
+       0x00e7e700e700e7e7, 0x0059590059005959, 0x00e1e100e100e1e1,
+       0x00dada00da00dada, 0x003d3d003d003d3d, 0x00c8c800c800c8c8,
+       0x0012120012001212, 0x0004040004000404, 0x0074740074007474,
+       0x0054540054005454, 0x0030300030003030, 0x007e7e007e007e7e,
+       0x00b4b400b400b4b4, 0x0028280028002828, 0x0055550055005555,
+       0x0068680068006868, 0x0050500050005050, 0x00bebe00be00bebe,
+       0x00d0d000d000d0d0, 0x00c4c400c400c4c4, 0x0031310031003131,
+       0x00cbcb00cb00cbcb, 0x002a2a002a002a2a, 0x00adad00ad00adad,
+       0x000f0f000f000f0f, 0x00caca00ca00caca, 0x0070700070007070,
+       0x00ffff00ff00ffff, 0x0032320032003232, 0x0069690069006969,
+       0x0008080008000808, 0x0062620062006262, 0x0000000000000000,
+       0x0024240024002424, 0x00d1d100d100d1d1, 0x00fbfb00fb00fbfb,
+       0x00baba00ba00baba, 0x00eded00ed00eded, 0x0045450045004545,
+       0x0081810081008181, 0x0073730073007373, 0x006d6d006d006d6d,
+       0x0084840084008484, 0x009f9f009f009f9f, 0x00eeee00ee00eeee,
+       0x004a4a004a004a4a, 0x00c3c300c300c3c3, 0x002e2e002e002e2e,
+       0x00c1c100c100c1c1, 0x0001010001000101, 0x00e6e600e600e6e6,
+       0x0025250025002525, 0x0048480048004848, 0x0099990099009999,
+       0x00b9b900b900b9b9, 0x00b3b300b300b3b3, 0x007b7b007b007b7b,
+       0x00f9f900f900f9f9, 0x00cece00ce00cece, 0x00bfbf00bf00bfbf,
+       0x00dfdf00df00dfdf, 0x0071710071007171, 0x0029290029002929,
+       0x00cdcd00cd00cdcd, 0x006c6c006c006c6c, 0x0013130013001313,
+       0x0064640064006464, 0x009b9b009b009b9b, 0x0063630063006363,
+       0x009d9d009d009d9d, 0x00c0c000c000c0c0, 0x004b4b004b004b4b,
+       0x00b7b700b700b7b7, 0x00a5a500a500a5a5, 0x0089890089008989,
+       0x005f5f005f005f5f, 0x00b1b100b100b1b1, 0x0017170017001717,
+       0x00f4f400f400f4f4, 0x00bcbc00bc00bcbc, 0x00d3d300d300d3d3,
+       0x0046460046004646, 0x00cfcf00cf00cfcf, 0x0037370037003737,
+       0x005e5e005e005e5e, 0x0047470047004747, 0x0094940094009494,
+       0x00fafa00fa00fafa, 0x00fcfc00fc00fcfc, 0x005b5b005b005b5b,
+       0x0097970097009797, 0x00fefe00fe00fefe, 0x005a5a005a005a5a,
+       0x00acac00ac00acac, 0x003c3c003c003c3c, 0x004c4c004c004c4c,
+       0x0003030003000303, 0x0035350035003535, 0x00f3f300f300f3f3,
+       0x0023230023002323, 0x00b8b800b800b8b8, 0x005d5d005d005d5d,
+       0x006a6a006a006a6a, 0x0092920092009292, 0x00d5d500d500d5d5,
+       0x0021210021002121, 0x0044440044004444, 0x0051510051005151,
+       0x00c6c600c600c6c6, 0x007d7d007d007d7d, 0x0039390039003939,
+       0x0083830083008383, 0x00dcdc00dc00dcdc, 0x00aaaa00aa00aaaa,
+       0x007c7c007c007c7c, 0x0077770077007777, 0x0056560056005656,
+       0x0005050005000505, 0x001b1b001b001b1b, 0x00a4a400a400a4a4,
+       0x0015150015001515, 0x0034340034003434, 0x001e1e001e001e1e,
+       0x001c1c001c001c1c, 0x00f8f800f800f8f8, 0x0052520052005252,
+       0x0020200020002020, 0x0014140014001414, 0x00e9e900e900e9e9,
+       0x00bdbd00bd00bdbd, 0x00dddd00dd00dddd, 0x00e4e400e400e4e4,
+       0x00a1a100a100a1a1, 0x00e0e000e000e0e0, 0x008a8a008a008a8a,
+       0x00f1f100f100f1f1, 0x00d6d600d600d6d6, 0x007a7a007a007a7a,
+       0x00bbbb00bb00bbbb, 0x00e3e300e300e3e3, 0x0040400040004040,
+       0x004f4f004f004f4f,
+};
+
+const u64 camellia_sp00444404[256] = {
+       0x0000707070700070, 0x00002c2c2c2c002c, 0x0000b3b3b3b300b3,
+       0x0000c0c0c0c000c0, 0x0000e4e4e4e400e4, 0x0000575757570057,
+       0x0000eaeaeaea00ea, 0x0000aeaeaeae00ae, 0x0000232323230023,
+       0x00006b6b6b6b006b, 0x0000454545450045, 0x0000a5a5a5a500a5,
+       0x0000edededed00ed, 0x00004f4f4f4f004f, 0x00001d1d1d1d001d,
+       0x0000929292920092, 0x0000868686860086, 0x0000afafafaf00af,
+       0x00007c7c7c7c007c, 0x00001f1f1f1f001f, 0x00003e3e3e3e003e,
+       0x0000dcdcdcdc00dc, 0x00005e5e5e5e005e, 0x00000b0b0b0b000b,
+       0x0000a6a6a6a600a6, 0x0000393939390039, 0x0000d5d5d5d500d5,
+       0x00005d5d5d5d005d, 0x0000d9d9d9d900d9, 0x00005a5a5a5a005a,
+       0x0000515151510051, 0x00006c6c6c6c006c, 0x00008b8b8b8b008b,
+       0x00009a9a9a9a009a, 0x0000fbfbfbfb00fb, 0x0000b0b0b0b000b0,
+       0x0000747474740074, 0x00002b2b2b2b002b, 0x0000f0f0f0f000f0,
+       0x0000848484840084, 0x0000dfdfdfdf00df, 0x0000cbcbcbcb00cb,
+       0x0000343434340034, 0x0000767676760076, 0x00006d6d6d6d006d,
+       0x0000a9a9a9a900a9, 0x0000d1d1d1d100d1, 0x0000040404040004,
+       0x0000141414140014, 0x00003a3a3a3a003a, 0x0000dededede00de,
+       0x0000111111110011, 0x0000323232320032, 0x00009c9c9c9c009c,
+       0x0000535353530053, 0x0000f2f2f2f200f2, 0x0000fefefefe00fe,
+       0x0000cfcfcfcf00cf, 0x0000c3c3c3c300c3, 0x00007a7a7a7a007a,
+       0x0000242424240024, 0x0000e8e8e8e800e8, 0x0000606060600060,
+       0x0000696969690069, 0x0000aaaaaaaa00aa, 0x0000a0a0a0a000a0,
+       0x0000a1a1a1a100a1, 0x0000626262620062, 0x0000545454540054,
+       0x00001e1e1e1e001e, 0x0000e0e0e0e000e0, 0x0000646464640064,
+       0x0000101010100010, 0x0000000000000000, 0x0000a3a3a3a300a3,
+       0x0000757575750075, 0x00008a8a8a8a008a, 0x0000e6e6e6e600e6,
+       0x0000090909090009, 0x0000dddddddd00dd, 0x0000878787870087,
+       0x0000838383830083, 0x0000cdcdcdcd00cd, 0x0000909090900090,
+       0x0000737373730073, 0x0000f6f6f6f600f6, 0x00009d9d9d9d009d,
+       0x0000bfbfbfbf00bf, 0x0000525252520052, 0x0000d8d8d8d800d8,
+       0x0000c8c8c8c800c8, 0x0000c6c6c6c600c6, 0x0000818181810081,
+       0x00006f6f6f6f006f, 0x0000131313130013, 0x0000636363630063,
+       0x0000e9e9e9e900e9, 0x0000a7a7a7a700a7, 0x00009f9f9f9f009f,
+       0x0000bcbcbcbc00bc, 0x0000292929290029, 0x0000f9f9f9f900f9,
+       0x00002f2f2f2f002f, 0x0000b4b4b4b400b4, 0x0000787878780078,
+       0x0000060606060006, 0x0000e7e7e7e700e7, 0x0000717171710071,
+       0x0000d4d4d4d400d4, 0x0000abababab00ab, 0x0000888888880088,
+       0x00008d8d8d8d008d, 0x0000727272720072, 0x0000b9b9b9b900b9,
+       0x0000f8f8f8f800f8, 0x0000acacacac00ac, 0x0000363636360036,
+       0x00002a2a2a2a002a, 0x00003c3c3c3c003c, 0x0000f1f1f1f100f1,
+       0x0000404040400040, 0x0000d3d3d3d300d3, 0x0000bbbbbbbb00bb,
+       0x0000434343430043, 0x0000151515150015, 0x0000adadadad00ad,
+       0x0000777777770077, 0x0000808080800080, 0x0000828282820082,
+       0x0000ecececec00ec, 0x0000272727270027, 0x0000e5e5e5e500e5,
+       0x0000858585850085, 0x0000353535350035, 0x00000c0c0c0c000c,
+       0x0000414141410041, 0x0000efefefef00ef, 0x0000939393930093,
+       0x0000191919190019, 0x0000212121210021, 0x00000e0e0e0e000e,
+       0x00004e4e4e4e004e, 0x0000656565650065, 0x0000bdbdbdbd00bd,
+       0x0000b8b8b8b800b8, 0x00008f8f8f8f008f, 0x0000ebebebeb00eb,
+       0x0000cececece00ce, 0x0000303030300030, 0x00005f5f5f5f005f,
+       0x0000c5c5c5c500c5, 0x00001a1a1a1a001a, 0x0000e1e1e1e100e1,
+       0x0000cacacaca00ca, 0x0000474747470047, 0x00003d3d3d3d003d,
+       0x0000010101010001, 0x0000d6d6d6d600d6, 0x0000565656560056,
+       0x00004d4d4d4d004d, 0x00000d0d0d0d000d, 0x0000666666660066,
+       0x0000cccccccc00cc, 0x00002d2d2d2d002d, 0x0000121212120012,
+       0x0000202020200020, 0x0000b1b1b1b100b1, 0x0000999999990099,
+       0x00004c4c4c4c004c, 0x0000c2c2c2c200c2, 0x00007e7e7e7e007e,
+       0x0000050505050005, 0x0000b7b7b7b700b7, 0x0000313131310031,
+       0x0000171717170017, 0x0000d7d7d7d700d7, 0x0000585858580058,
+       0x0000616161610061, 0x00001b1b1b1b001b, 0x00001c1c1c1c001c,
+       0x00000f0f0f0f000f, 0x0000161616160016, 0x0000181818180018,
+       0x0000222222220022, 0x0000444444440044, 0x0000b2b2b2b200b2,
+       0x0000b5b5b5b500b5, 0x0000919191910091, 0x0000080808080008,
+       0x0000a8a8a8a800a8, 0x0000fcfcfcfc00fc, 0x0000505050500050,
+       0x0000d0d0d0d000d0, 0x00007d7d7d7d007d, 0x0000898989890089,
+       0x0000979797970097, 0x00005b5b5b5b005b, 0x0000959595950095,
+       0x0000ffffffff00ff, 0x0000d2d2d2d200d2, 0x0000c4c4c4c400c4,
+       0x0000484848480048, 0x0000f7f7f7f700f7, 0x0000dbdbdbdb00db,
+       0x0000030303030003, 0x0000dadadada00da, 0x00003f3f3f3f003f,
+       0x0000949494940094, 0x00005c5c5c5c005c, 0x0000020202020002,
+       0x00004a4a4a4a004a, 0x0000333333330033, 0x0000676767670067,
+       0x0000f3f3f3f300f3, 0x00007f7f7f7f007f, 0x0000e2e2e2e200e2,
+       0x00009b9b9b9b009b, 0x0000262626260026, 0x0000373737370037,
+       0x00003b3b3b3b003b, 0x0000969696960096, 0x00004b4b4b4b004b,
+       0x0000bebebebe00be, 0x00002e2e2e2e002e, 0x0000797979790079,
+       0x00008c8c8c8c008c, 0x00006e6e6e6e006e, 0x00008e8e8e8e008e,
+       0x0000f5f5f5f500f5, 0x0000b6b6b6b600b6, 0x0000fdfdfdfd00fd,
+       0x0000595959590059, 0x0000989898980098, 0x00006a6a6a6a006a,
+       0x0000464646460046, 0x0000babababa00ba, 0x0000252525250025,
+       0x0000424242420042, 0x0000a2a2a2a200a2, 0x0000fafafafa00fa,
+       0x0000070707070007, 0x0000555555550055, 0x0000eeeeeeee00ee,
+       0x00000a0a0a0a000a, 0x0000494949490049, 0x0000686868680068,
+       0x0000383838380038, 0x0000a4a4a4a400a4, 0x0000282828280028,
+       0x00007b7b7b7b007b, 0x0000c9c9c9c900c9, 0x0000c1c1c1c100c1,
+       0x0000e3e3e3e300e3, 0x0000f4f4f4f400f4, 0x0000c7c7c7c700c7,
+       0x00009e9e9e9e009e,
+};
+
+const u64 camellia_sp02220222[256] = {
+       0x00e0e0e000e0e0e0, 0x0005050500050505, 0x0058585800585858,
+       0x00d9d9d900d9d9d9, 0x0067676700676767, 0x004e4e4e004e4e4e,
+       0x0081818100818181, 0x00cbcbcb00cbcbcb, 0x00c9c9c900c9c9c9,
+       0x000b0b0b000b0b0b, 0x00aeaeae00aeaeae, 0x006a6a6a006a6a6a,
+       0x00d5d5d500d5d5d5, 0x0018181800181818, 0x005d5d5d005d5d5d,
+       0x0082828200828282, 0x0046464600464646, 0x00dfdfdf00dfdfdf,
+       0x00d6d6d600d6d6d6, 0x0027272700272727, 0x008a8a8a008a8a8a,
+       0x0032323200323232, 0x004b4b4b004b4b4b, 0x0042424200424242,
+       0x00dbdbdb00dbdbdb, 0x001c1c1c001c1c1c, 0x009e9e9e009e9e9e,
+       0x009c9c9c009c9c9c, 0x003a3a3a003a3a3a, 0x00cacaca00cacaca,
+       0x0025252500252525, 0x007b7b7b007b7b7b, 0x000d0d0d000d0d0d,
+       0x0071717100717171, 0x005f5f5f005f5f5f, 0x001f1f1f001f1f1f,
+       0x00f8f8f800f8f8f8, 0x00d7d7d700d7d7d7, 0x003e3e3e003e3e3e,
+       0x009d9d9d009d9d9d, 0x007c7c7c007c7c7c, 0x0060606000606060,
+       0x00b9b9b900b9b9b9, 0x00bebebe00bebebe, 0x00bcbcbc00bcbcbc,
+       0x008b8b8b008b8b8b, 0x0016161600161616, 0x0034343400343434,
+       0x004d4d4d004d4d4d, 0x00c3c3c300c3c3c3, 0x0072727200727272,
+       0x0095959500959595, 0x00ababab00ababab, 0x008e8e8e008e8e8e,
+       0x00bababa00bababa, 0x007a7a7a007a7a7a, 0x00b3b3b300b3b3b3,
+       0x0002020200020202, 0x00b4b4b400b4b4b4, 0x00adadad00adadad,
+       0x00a2a2a200a2a2a2, 0x00acacac00acacac, 0x00d8d8d800d8d8d8,
+       0x009a9a9a009a9a9a, 0x0017171700171717, 0x001a1a1a001a1a1a,
+       0x0035353500353535, 0x00cccccc00cccccc, 0x00f7f7f700f7f7f7,
+       0x0099999900999999, 0x0061616100616161, 0x005a5a5a005a5a5a,
+       0x00e8e8e800e8e8e8, 0x0024242400242424, 0x0056565600565656,
+       0x0040404000404040, 0x00e1e1e100e1e1e1, 0x0063636300636363,
+       0x0009090900090909, 0x0033333300333333, 0x00bfbfbf00bfbfbf,
+       0x0098989800989898, 0x0097979700979797, 0x0085858500858585,
+       0x0068686800686868, 0x00fcfcfc00fcfcfc, 0x00ececec00ececec,
+       0x000a0a0a000a0a0a, 0x00dadada00dadada, 0x006f6f6f006f6f6f,
+       0x0053535300535353, 0x0062626200626262, 0x00a3a3a300a3a3a3,
+       0x002e2e2e002e2e2e, 0x0008080800080808, 0x00afafaf00afafaf,
+       0x0028282800282828, 0x00b0b0b000b0b0b0, 0x0074747400747474,
+       0x00c2c2c200c2c2c2, 0x00bdbdbd00bdbdbd, 0x0036363600363636,
+       0x0022222200222222, 0x0038383800383838, 0x0064646400646464,
+       0x001e1e1e001e1e1e, 0x0039393900393939, 0x002c2c2c002c2c2c,
+       0x00a6a6a600a6a6a6, 0x0030303000303030, 0x00e5e5e500e5e5e5,
+       0x0044444400444444, 0x00fdfdfd00fdfdfd, 0x0088888800888888,
+       0x009f9f9f009f9f9f, 0x0065656500656565, 0x0087878700878787,
+       0x006b6b6b006b6b6b, 0x00f4f4f400f4f4f4, 0x0023232300232323,
+       0x0048484800484848, 0x0010101000101010, 0x00d1d1d100d1d1d1,
+       0x0051515100515151, 0x00c0c0c000c0c0c0, 0x00f9f9f900f9f9f9,
+       0x00d2d2d200d2d2d2, 0x00a0a0a000a0a0a0, 0x0055555500555555,
+       0x00a1a1a100a1a1a1, 0x0041414100414141, 0x00fafafa00fafafa,
+       0x0043434300434343, 0x0013131300131313, 0x00c4c4c400c4c4c4,
+       0x002f2f2f002f2f2f, 0x00a8a8a800a8a8a8, 0x00b6b6b600b6b6b6,
+       0x003c3c3c003c3c3c, 0x002b2b2b002b2b2b, 0x00c1c1c100c1c1c1,
+       0x00ffffff00ffffff, 0x00c8c8c800c8c8c8, 0x00a5a5a500a5a5a5,
+       0x0020202000202020, 0x0089898900898989, 0x0000000000000000,
+       0x0090909000909090, 0x0047474700474747, 0x00efefef00efefef,
+       0x00eaeaea00eaeaea, 0x00b7b7b700b7b7b7, 0x0015151500151515,
+       0x0006060600060606, 0x00cdcdcd00cdcdcd, 0x00b5b5b500b5b5b5,
+       0x0012121200121212, 0x007e7e7e007e7e7e, 0x00bbbbbb00bbbbbb,
+       0x0029292900292929, 0x000f0f0f000f0f0f, 0x00b8b8b800b8b8b8,
+       0x0007070700070707, 0x0004040400040404, 0x009b9b9b009b9b9b,
+       0x0094949400949494, 0x0021212100212121, 0x0066666600666666,
+       0x00e6e6e600e6e6e6, 0x00cecece00cecece, 0x00ededed00ededed,
+       0x00e7e7e700e7e7e7, 0x003b3b3b003b3b3b, 0x00fefefe00fefefe,
+       0x007f7f7f007f7f7f, 0x00c5c5c500c5c5c5, 0x00a4a4a400a4a4a4,
+       0x0037373700373737, 0x00b1b1b100b1b1b1, 0x004c4c4c004c4c4c,
+       0x0091919100919191, 0x006e6e6e006e6e6e, 0x008d8d8d008d8d8d,
+       0x0076767600767676, 0x0003030300030303, 0x002d2d2d002d2d2d,
+       0x00dedede00dedede, 0x0096969600969696, 0x0026262600262626,
+       0x007d7d7d007d7d7d, 0x00c6c6c600c6c6c6, 0x005c5c5c005c5c5c,
+       0x00d3d3d300d3d3d3, 0x00f2f2f200f2f2f2, 0x004f4f4f004f4f4f,
+       0x0019191900191919, 0x003f3f3f003f3f3f, 0x00dcdcdc00dcdcdc,
+       0x0079797900797979, 0x001d1d1d001d1d1d, 0x0052525200525252,
+       0x00ebebeb00ebebeb, 0x00f3f3f300f3f3f3, 0x006d6d6d006d6d6d,
+       0x005e5e5e005e5e5e, 0x00fbfbfb00fbfbfb, 0x0069696900696969,
+       0x00b2b2b200b2b2b2, 0x00f0f0f000f0f0f0, 0x0031313100313131,
+       0x000c0c0c000c0c0c, 0x00d4d4d400d4d4d4, 0x00cfcfcf00cfcfcf,
+       0x008c8c8c008c8c8c, 0x00e2e2e200e2e2e2, 0x0075757500757575,
+       0x00a9a9a900a9a9a9, 0x004a4a4a004a4a4a, 0x0057575700575757,
+       0x0084848400848484, 0x0011111100111111, 0x0045454500454545,
+       0x001b1b1b001b1b1b, 0x00f5f5f500f5f5f5, 0x00e4e4e400e4e4e4,
+       0x000e0e0e000e0e0e, 0x0073737300737373, 0x00aaaaaa00aaaaaa,
+       0x00f1f1f100f1f1f1, 0x00dddddd00dddddd, 0x0059595900595959,
+       0x0014141400141414, 0x006c6c6c006c6c6c, 0x0092929200929292,
+       0x0054545400545454, 0x00d0d0d000d0d0d0, 0x0078787800787878,
+       0x0070707000707070, 0x00e3e3e300e3e3e3, 0x0049494900494949,
+       0x0080808000808080, 0x0050505000505050, 0x00a7a7a700a7a7a7,
+       0x00f6f6f600f6f6f6, 0x0077777700777777, 0x0093939300939393,
+       0x0086868600868686, 0x0083838300838383, 0x002a2a2a002a2a2a,
+       0x00c7c7c700c7c7c7, 0x005b5b5b005b5b5b, 0x00e9e9e900e9e9e9,
+       0x00eeeeee00eeeeee, 0x008f8f8f008f8f8f, 0x0001010100010101,
+       0x003d3d3d003d3d3d,
+};
+
+const u64 camellia_sp30333033[256] = {
+       0x3800383838003838, 0x4100414141004141, 0x1600161616001616,
+       0x7600767676007676, 0xd900d9d9d900d9d9, 0x9300939393009393,
+       0x6000606060006060, 0xf200f2f2f200f2f2, 0x7200727272007272,
+       0xc200c2c2c200c2c2, 0xab00ababab00abab, 0x9a009a9a9a009a9a,
+       0x7500757575007575, 0x0600060606000606, 0x5700575757005757,
+       0xa000a0a0a000a0a0, 0x9100919191009191, 0xf700f7f7f700f7f7,
+       0xb500b5b5b500b5b5, 0xc900c9c9c900c9c9, 0xa200a2a2a200a2a2,
+       0x8c008c8c8c008c8c, 0xd200d2d2d200d2d2, 0x9000909090009090,
+       0xf600f6f6f600f6f6, 0x0700070707000707, 0xa700a7a7a700a7a7,
+       0x2700272727002727, 0x8e008e8e8e008e8e, 0xb200b2b2b200b2b2,
+       0x4900494949004949, 0xde00dedede00dede, 0x4300434343004343,
+       0x5c005c5c5c005c5c, 0xd700d7d7d700d7d7, 0xc700c7c7c700c7c7,
+       0x3e003e3e3e003e3e, 0xf500f5f5f500f5f5, 0x8f008f8f8f008f8f,
+       0x6700676767006767, 0x1f001f1f1f001f1f, 0x1800181818001818,
+       0x6e006e6e6e006e6e, 0xaf00afafaf00afaf, 0x2f002f2f2f002f2f,
+       0xe200e2e2e200e2e2, 0x8500858585008585, 0x0d000d0d0d000d0d,
+       0x5300535353005353, 0xf000f0f0f000f0f0, 0x9c009c9c9c009c9c,
+       0x6500656565006565, 0xea00eaeaea00eaea, 0xa300a3a3a300a3a3,
+       0xae00aeaeae00aeae, 0x9e009e9e9e009e9e, 0xec00ececec00ecec,
+       0x8000808080008080, 0x2d002d2d2d002d2d, 0x6b006b6b6b006b6b,
+       0xa800a8a8a800a8a8, 0x2b002b2b2b002b2b, 0x3600363636003636,
+       0xa600a6a6a600a6a6, 0xc500c5c5c500c5c5, 0x8600868686008686,
+       0x4d004d4d4d004d4d, 0x3300333333003333, 0xfd00fdfdfd00fdfd,
+       0x6600666666006666, 0x5800585858005858, 0x9600969696009696,
+       0x3a003a3a3a003a3a, 0x0900090909000909, 0x9500959595009595,
+       0x1000101010001010, 0x7800787878007878, 0xd800d8d8d800d8d8,
+       0x4200424242004242, 0xcc00cccccc00cccc, 0xef00efefef00efef,
+       0x2600262626002626, 0xe500e5e5e500e5e5, 0x6100616161006161,
+       0x1a001a1a1a001a1a, 0x3f003f3f3f003f3f, 0x3b003b3b3b003b3b,
+       0x8200828282008282, 0xb600b6b6b600b6b6, 0xdb00dbdbdb00dbdb,
+       0xd400d4d4d400d4d4, 0x9800989898009898, 0xe800e8e8e800e8e8,
+       0x8b008b8b8b008b8b, 0x0200020202000202, 0xeb00ebebeb00ebeb,
+       0x0a000a0a0a000a0a, 0x2c002c2c2c002c2c, 0x1d001d1d1d001d1d,
+       0xb000b0b0b000b0b0, 0x6f006f6f6f006f6f, 0x8d008d8d8d008d8d,
+       0x8800888888008888, 0x0e000e0e0e000e0e, 0x1900191919001919,
+       0x8700878787008787, 0x4e004e4e4e004e4e, 0x0b000b0b0b000b0b,
+       0xa900a9a9a900a9a9, 0x0c000c0c0c000c0c, 0x7900797979007979,
+       0x1100111111001111, 0x7f007f7f7f007f7f, 0x2200222222002222,
+       0xe700e7e7e700e7e7, 0x5900595959005959, 0xe100e1e1e100e1e1,
+       0xda00dadada00dada, 0x3d003d3d3d003d3d, 0xc800c8c8c800c8c8,
+       0x1200121212001212, 0x0400040404000404, 0x7400747474007474,
+       0x5400545454005454, 0x3000303030003030, 0x7e007e7e7e007e7e,
+       0xb400b4b4b400b4b4, 0x2800282828002828, 0x5500555555005555,
+       0x6800686868006868, 0x5000505050005050, 0xbe00bebebe00bebe,
+       0xd000d0d0d000d0d0, 0xc400c4c4c400c4c4, 0x3100313131003131,
+       0xcb00cbcbcb00cbcb, 0x2a002a2a2a002a2a, 0xad00adadad00adad,
+       0x0f000f0f0f000f0f, 0xca00cacaca00caca, 0x7000707070007070,
+       0xff00ffffff00ffff, 0x3200323232003232, 0x6900696969006969,
+       0x0800080808000808, 0x6200626262006262, 0x0000000000000000,
+       0x2400242424002424, 0xd100d1d1d100d1d1, 0xfb00fbfbfb00fbfb,
+       0xba00bababa00baba, 0xed00ededed00eded, 0x4500454545004545,
+       0x8100818181008181, 0x7300737373007373, 0x6d006d6d6d006d6d,
+       0x8400848484008484, 0x9f009f9f9f009f9f, 0xee00eeeeee00eeee,
+       0x4a004a4a4a004a4a, 0xc300c3c3c300c3c3, 0x2e002e2e2e002e2e,
+       0xc100c1c1c100c1c1, 0x0100010101000101, 0xe600e6e6e600e6e6,
+       0x2500252525002525, 0x4800484848004848, 0x9900999999009999,
+       0xb900b9b9b900b9b9, 0xb300b3b3b300b3b3, 0x7b007b7b7b007b7b,
+       0xf900f9f9f900f9f9, 0xce00cecece00cece, 0xbf00bfbfbf00bfbf,
+       0xdf00dfdfdf00dfdf, 0x7100717171007171, 0x2900292929002929,
+       0xcd00cdcdcd00cdcd, 0x6c006c6c6c006c6c, 0x1300131313001313,
+       0x6400646464006464, 0x9b009b9b9b009b9b, 0x6300636363006363,
+       0x9d009d9d9d009d9d, 0xc000c0c0c000c0c0, 0x4b004b4b4b004b4b,
+       0xb700b7b7b700b7b7, 0xa500a5a5a500a5a5, 0x8900898989008989,
+       0x5f005f5f5f005f5f, 0xb100b1b1b100b1b1, 0x1700171717001717,
+       0xf400f4f4f400f4f4, 0xbc00bcbcbc00bcbc, 0xd300d3d3d300d3d3,
+       0x4600464646004646, 0xcf00cfcfcf00cfcf, 0x3700373737003737,
+       0x5e005e5e5e005e5e, 0x4700474747004747, 0x9400949494009494,
+       0xfa00fafafa00fafa, 0xfc00fcfcfc00fcfc, 0x5b005b5b5b005b5b,
+       0x9700979797009797, 0xfe00fefefe00fefe, 0x5a005a5a5a005a5a,
+       0xac00acacac00acac, 0x3c003c3c3c003c3c, 0x4c004c4c4c004c4c,
+       0x0300030303000303, 0x3500353535003535, 0xf300f3f3f300f3f3,
+       0x2300232323002323, 0xb800b8b8b800b8b8, 0x5d005d5d5d005d5d,
+       0x6a006a6a6a006a6a, 0x9200929292009292, 0xd500d5d5d500d5d5,
+       0x2100212121002121, 0x4400444444004444, 0x5100515151005151,
+       0xc600c6c6c600c6c6, 0x7d007d7d7d007d7d, 0x3900393939003939,
+       0x8300838383008383, 0xdc00dcdcdc00dcdc, 0xaa00aaaaaa00aaaa,
+       0x7c007c7c7c007c7c, 0x7700777777007777, 0x5600565656005656,
+       0x0500050505000505, 0x1b001b1b1b001b1b, 0xa400a4a4a400a4a4,
+       0x1500151515001515, 0x3400343434003434, 0x1e001e1e1e001e1e,
+       0x1c001c1c1c001c1c, 0xf800f8f8f800f8f8, 0x5200525252005252,
+       0x2000202020002020, 0x1400141414001414, 0xe900e9e9e900e9e9,
+       0xbd00bdbdbd00bdbd, 0xdd00dddddd00dddd, 0xe400e4e4e400e4e4,
+       0xa100a1a1a100a1a1, 0xe000e0e0e000e0e0, 0x8a008a8a8a008a8a,
+       0xf100f1f1f100f1f1, 0xd600d6d6d600d6d6, 0x7a007a7a7a007a7a,
+       0xbb00bbbbbb00bbbb, 0xe300e3e3e300e3e3, 0x4000404040004040,
+       0x4f004f4f4f004f4f,
+};
+
+const u64 camellia_sp44044404[256] = {
+       0x7070007070700070, 0x2c2c002c2c2c002c, 0xb3b300b3b3b300b3,
+       0xc0c000c0c0c000c0, 0xe4e400e4e4e400e4, 0x5757005757570057,
+       0xeaea00eaeaea00ea, 0xaeae00aeaeae00ae, 0x2323002323230023,
+       0x6b6b006b6b6b006b, 0x4545004545450045, 0xa5a500a5a5a500a5,
+       0xeded00ededed00ed, 0x4f4f004f4f4f004f, 0x1d1d001d1d1d001d,
+       0x9292009292920092, 0x8686008686860086, 0xafaf00afafaf00af,
+       0x7c7c007c7c7c007c, 0x1f1f001f1f1f001f, 0x3e3e003e3e3e003e,
+       0xdcdc00dcdcdc00dc, 0x5e5e005e5e5e005e, 0x0b0b000b0b0b000b,
+       0xa6a600a6a6a600a6, 0x3939003939390039, 0xd5d500d5d5d500d5,
+       0x5d5d005d5d5d005d, 0xd9d900d9d9d900d9, 0x5a5a005a5a5a005a,
+       0x5151005151510051, 0x6c6c006c6c6c006c, 0x8b8b008b8b8b008b,
+       0x9a9a009a9a9a009a, 0xfbfb00fbfbfb00fb, 0xb0b000b0b0b000b0,
+       0x7474007474740074, 0x2b2b002b2b2b002b, 0xf0f000f0f0f000f0,
+       0x8484008484840084, 0xdfdf00dfdfdf00df, 0xcbcb00cbcbcb00cb,
+       0x3434003434340034, 0x7676007676760076, 0x6d6d006d6d6d006d,
+       0xa9a900a9a9a900a9, 0xd1d100d1d1d100d1, 0x0404000404040004,
+       0x1414001414140014, 0x3a3a003a3a3a003a, 0xdede00dedede00de,
+       0x1111001111110011, 0x3232003232320032, 0x9c9c009c9c9c009c,
+       0x5353005353530053, 0xf2f200f2f2f200f2, 0xfefe00fefefe00fe,
+       0xcfcf00cfcfcf00cf, 0xc3c300c3c3c300c3, 0x7a7a007a7a7a007a,
+       0x2424002424240024, 0xe8e800e8e8e800e8, 0x6060006060600060,
+       0x6969006969690069, 0xaaaa00aaaaaa00aa, 0xa0a000a0a0a000a0,
+       0xa1a100a1a1a100a1, 0x6262006262620062, 0x5454005454540054,
+       0x1e1e001e1e1e001e, 0xe0e000e0e0e000e0, 0x6464006464640064,
+       0x1010001010100010, 0x0000000000000000, 0xa3a300a3a3a300a3,
+       0x7575007575750075, 0x8a8a008a8a8a008a, 0xe6e600e6e6e600e6,
+       0x0909000909090009, 0xdddd00dddddd00dd, 0x8787008787870087,
+       0x8383008383830083, 0xcdcd00cdcdcd00cd, 0x9090009090900090,
+       0x7373007373730073, 0xf6f600f6f6f600f6, 0x9d9d009d9d9d009d,
+       0xbfbf00bfbfbf00bf, 0x5252005252520052, 0xd8d800d8d8d800d8,
+       0xc8c800c8c8c800c8, 0xc6c600c6c6c600c6, 0x8181008181810081,
+       0x6f6f006f6f6f006f, 0x1313001313130013, 0x6363006363630063,
+       0xe9e900e9e9e900e9, 0xa7a700a7a7a700a7, 0x9f9f009f9f9f009f,
+       0xbcbc00bcbcbc00bc, 0x2929002929290029, 0xf9f900f9f9f900f9,
+       0x2f2f002f2f2f002f, 0xb4b400b4b4b400b4, 0x7878007878780078,
+       0x0606000606060006, 0xe7e700e7e7e700e7, 0x7171007171710071,
+       0xd4d400d4d4d400d4, 0xabab00ababab00ab, 0x8888008888880088,
+       0x8d8d008d8d8d008d, 0x7272007272720072, 0xb9b900b9b9b900b9,
+       0xf8f800f8f8f800f8, 0xacac00acacac00ac, 0x3636003636360036,
+       0x2a2a002a2a2a002a, 0x3c3c003c3c3c003c, 0xf1f100f1f1f100f1,
+       0x4040004040400040, 0xd3d300d3d3d300d3, 0xbbbb00bbbbbb00bb,
+       0x4343004343430043, 0x1515001515150015, 0xadad00adadad00ad,
+       0x7777007777770077, 0x8080008080800080, 0x8282008282820082,
+       0xecec00ececec00ec, 0x2727002727270027, 0xe5e500e5e5e500e5,
+       0x8585008585850085, 0x3535003535350035, 0x0c0c000c0c0c000c,
+       0x4141004141410041, 0xefef00efefef00ef, 0x9393009393930093,
+       0x1919001919190019, 0x2121002121210021, 0x0e0e000e0e0e000e,
+       0x4e4e004e4e4e004e, 0x6565006565650065, 0xbdbd00bdbdbd00bd,
+       0xb8b800b8b8b800b8, 0x8f8f008f8f8f008f, 0xebeb00ebebeb00eb,
+       0xcece00cecece00ce, 0x3030003030300030, 0x5f5f005f5f5f005f,
+       0xc5c500c5c5c500c5, 0x1a1a001a1a1a001a, 0xe1e100e1e1e100e1,
+       0xcaca00cacaca00ca, 0x4747004747470047, 0x3d3d003d3d3d003d,
+       0x0101000101010001, 0xd6d600d6d6d600d6, 0x5656005656560056,
+       0x4d4d004d4d4d004d, 0x0d0d000d0d0d000d, 0x6666006666660066,
+       0xcccc00cccccc00cc, 0x2d2d002d2d2d002d, 0x1212001212120012,
+       0x2020002020200020, 0xb1b100b1b1b100b1, 0x9999009999990099,
+       0x4c4c004c4c4c004c, 0xc2c200c2c2c200c2, 0x7e7e007e7e7e007e,
+       0x0505000505050005, 0xb7b700b7b7b700b7, 0x3131003131310031,
+       0x1717001717170017, 0xd7d700d7d7d700d7, 0x5858005858580058,
+       0x6161006161610061, 0x1b1b001b1b1b001b, 0x1c1c001c1c1c001c,
+       0x0f0f000f0f0f000f, 0x1616001616160016, 0x1818001818180018,
+       0x2222002222220022, 0x4444004444440044, 0xb2b200b2b2b200b2,
+       0xb5b500b5b5b500b5, 0x9191009191910091, 0x0808000808080008,
+       0xa8a800a8a8a800a8, 0xfcfc00fcfcfc00fc, 0x5050005050500050,
+       0xd0d000d0d0d000d0, 0x7d7d007d7d7d007d, 0x8989008989890089,
+       0x9797009797970097, 0x5b5b005b5b5b005b, 0x9595009595950095,
+       0xffff00ffffff00ff, 0xd2d200d2d2d200d2, 0xc4c400c4c4c400c4,
+       0x4848004848480048, 0xf7f700f7f7f700f7, 0xdbdb00dbdbdb00db,
+       0x0303000303030003, 0xdada00dadada00da, 0x3f3f003f3f3f003f,
+       0x9494009494940094, 0x5c5c005c5c5c005c, 0x0202000202020002,
+       0x4a4a004a4a4a004a, 0x3333003333330033, 0x6767006767670067,
+       0xf3f300f3f3f300f3, 0x7f7f007f7f7f007f, 0xe2e200e2e2e200e2,
+       0x9b9b009b9b9b009b, 0x2626002626260026, 0x3737003737370037,
+       0x3b3b003b3b3b003b, 0x9696009696960096, 0x4b4b004b4b4b004b,
+       0xbebe00bebebe00be, 0x2e2e002e2e2e002e, 0x7979007979790079,
+       0x8c8c008c8c8c008c, 0x6e6e006e6e6e006e, 0x8e8e008e8e8e008e,
+       0xf5f500f5f5f500f5, 0xb6b600b6b6b600b6, 0xfdfd00fdfdfd00fd,
+       0x5959005959590059, 0x9898009898980098, 0x6a6a006a6a6a006a,
+       0x4646004646460046, 0xbaba00bababa00ba, 0x2525002525250025,
+       0x4242004242420042, 0xa2a200a2a2a200a2, 0xfafa00fafafa00fa,
+       0x0707000707070007, 0x5555005555550055, 0xeeee00eeeeee00ee,
+       0x0a0a000a0a0a000a, 0x4949004949490049, 0x6868006868680068,
+       0x3838003838380038, 0xa4a400a4a4a400a4, 0x2828002828280028,
+       0x7b7b007b7b7b007b, 0xc9c900c9c9c900c9, 0xc1c100c1c1c100c1,
+       0xe3e300e3e3e300e3, 0xf4f400f4f4f400f4, 0xc7c700c7c7c700c7,
+       0x9e9e009e9e9e009e,
+};
+
+const u64 camellia_sp11101110[256] = {
+       0x7070700070707000, 0x8282820082828200, 0x2c2c2c002c2c2c00,
+       0xececec00ececec00, 0xb3b3b300b3b3b300, 0x2727270027272700,
+       0xc0c0c000c0c0c000, 0xe5e5e500e5e5e500, 0xe4e4e400e4e4e400,
+       0x8585850085858500, 0x5757570057575700, 0x3535350035353500,
+       0xeaeaea00eaeaea00, 0x0c0c0c000c0c0c00, 0xaeaeae00aeaeae00,
+       0x4141410041414100, 0x2323230023232300, 0xefefef00efefef00,
+       0x6b6b6b006b6b6b00, 0x9393930093939300, 0x4545450045454500,
+       0x1919190019191900, 0xa5a5a500a5a5a500, 0x2121210021212100,
+       0xededed00ededed00, 0x0e0e0e000e0e0e00, 0x4f4f4f004f4f4f00,
+       0x4e4e4e004e4e4e00, 0x1d1d1d001d1d1d00, 0x6565650065656500,
+       0x9292920092929200, 0xbdbdbd00bdbdbd00, 0x8686860086868600,
+       0xb8b8b800b8b8b800, 0xafafaf00afafaf00, 0x8f8f8f008f8f8f00,
+       0x7c7c7c007c7c7c00, 0xebebeb00ebebeb00, 0x1f1f1f001f1f1f00,
+       0xcecece00cecece00, 0x3e3e3e003e3e3e00, 0x3030300030303000,
+       0xdcdcdc00dcdcdc00, 0x5f5f5f005f5f5f00, 0x5e5e5e005e5e5e00,
+       0xc5c5c500c5c5c500, 0x0b0b0b000b0b0b00, 0x1a1a1a001a1a1a00,
+       0xa6a6a600a6a6a600, 0xe1e1e100e1e1e100, 0x3939390039393900,
+       0xcacaca00cacaca00, 0xd5d5d500d5d5d500, 0x4747470047474700,
+       0x5d5d5d005d5d5d00, 0x3d3d3d003d3d3d00, 0xd9d9d900d9d9d900,
+       0x0101010001010100, 0x5a5a5a005a5a5a00, 0xd6d6d600d6d6d600,
+       0x5151510051515100, 0x5656560056565600, 0x6c6c6c006c6c6c00,
+       0x4d4d4d004d4d4d00, 0x8b8b8b008b8b8b00, 0x0d0d0d000d0d0d00,
+       0x9a9a9a009a9a9a00, 0x6666660066666600, 0xfbfbfb00fbfbfb00,
+       0xcccccc00cccccc00, 0xb0b0b000b0b0b000, 0x2d2d2d002d2d2d00,
+       0x7474740074747400, 0x1212120012121200, 0x2b2b2b002b2b2b00,
+       0x2020200020202000, 0xf0f0f000f0f0f000, 0xb1b1b100b1b1b100,
+       0x8484840084848400, 0x9999990099999900, 0xdfdfdf00dfdfdf00,
+       0x4c4c4c004c4c4c00, 0xcbcbcb00cbcbcb00, 0xc2c2c200c2c2c200,
+       0x3434340034343400, 0x7e7e7e007e7e7e00, 0x7676760076767600,
+       0x0505050005050500, 0x6d6d6d006d6d6d00, 0xb7b7b700b7b7b700,
+       0xa9a9a900a9a9a900, 0x3131310031313100, 0xd1d1d100d1d1d100,
+       0x1717170017171700, 0x0404040004040400, 0xd7d7d700d7d7d700,
+       0x1414140014141400, 0x5858580058585800, 0x3a3a3a003a3a3a00,
+       0x6161610061616100, 0xdedede00dedede00, 0x1b1b1b001b1b1b00,
+       0x1111110011111100, 0x1c1c1c001c1c1c00, 0x3232320032323200,
+       0x0f0f0f000f0f0f00, 0x9c9c9c009c9c9c00, 0x1616160016161600,
+       0x5353530053535300, 0x1818180018181800, 0xf2f2f200f2f2f200,
+       0x2222220022222200, 0xfefefe00fefefe00, 0x4444440044444400,
+       0xcfcfcf00cfcfcf00, 0xb2b2b200b2b2b200, 0xc3c3c300c3c3c300,
+       0xb5b5b500b5b5b500, 0x7a7a7a007a7a7a00, 0x9191910091919100,
+       0x2424240024242400, 0x0808080008080800, 0xe8e8e800e8e8e800,
+       0xa8a8a800a8a8a800, 0x6060600060606000, 0xfcfcfc00fcfcfc00,
+       0x6969690069696900, 0x5050500050505000, 0xaaaaaa00aaaaaa00,
+       0xd0d0d000d0d0d000, 0xa0a0a000a0a0a000, 0x7d7d7d007d7d7d00,
+       0xa1a1a100a1a1a100, 0x8989890089898900, 0x6262620062626200,
+       0x9797970097979700, 0x5454540054545400, 0x5b5b5b005b5b5b00,
+       0x1e1e1e001e1e1e00, 0x9595950095959500, 0xe0e0e000e0e0e000,
+       0xffffff00ffffff00, 0x6464640064646400, 0xd2d2d200d2d2d200,
+       0x1010100010101000, 0xc4c4c400c4c4c400, 0x0000000000000000,
+       0x4848480048484800, 0xa3a3a300a3a3a300, 0xf7f7f700f7f7f700,
+       0x7575750075757500, 0xdbdbdb00dbdbdb00, 0x8a8a8a008a8a8a00,
+       0x0303030003030300, 0xe6e6e600e6e6e600, 0xdadada00dadada00,
+       0x0909090009090900, 0x3f3f3f003f3f3f00, 0xdddddd00dddddd00,
+       0x9494940094949400, 0x8787870087878700, 0x5c5c5c005c5c5c00,
+       0x8383830083838300, 0x0202020002020200, 0xcdcdcd00cdcdcd00,
+       0x4a4a4a004a4a4a00, 0x9090900090909000, 0x3333330033333300,
+       0x7373730073737300, 0x6767670067676700, 0xf6f6f600f6f6f600,
+       0xf3f3f300f3f3f300, 0x9d9d9d009d9d9d00, 0x7f7f7f007f7f7f00,
+       0xbfbfbf00bfbfbf00, 0xe2e2e200e2e2e200, 0x5252520052525200,
+       0x9b9b9b009b9b9b00, 0xd8d8d800d8d8d800, 0x2626260026262600,
+       0xc8c8c800c8c8c800, 0x3737370037373700, 0xc6c6c600c6c6c600,
+       0x3b3b3b003b3b3b00, 0x8181810081818100, 0x9696960096969600,
+       0x6f6f6f006f6f6f00, 0x4b4b4b004b4b4b00, 0x1313130013131300,
+       0xbebebe00bebebe00, 0x6363630063636300, 0x2e2e2e002e2e2e00,
+       0xe9e9e900e9e9e900, 0x7979790079797900, 0xa7a7a700a7a7a700,
+       0x8c8c8c008c8c8c00, 0x9f9f9f009f9f9f00, 0x6e6e6e006e6e6e00,
+       0xbcbcbc00bcbcbc00, 0x8e8e8e008e8e8e00, 0x2929290029292900,
+       0xf5f5f500f5f5f500, 0xf9f9f900f9f9f900, 0xb6b6b600b6b6b600,
+       0x2f2f2f002f2f2f00, 0xfdfdfd00fdfdfd00, 0xb4b4b400b4b4b400,
+       0x5959590059595900, 0x7878780078787800, 0x9898980098989800,
+       0x0606060006060600, 0x6a6a6a006a6a6a00, 0xe7e7e700e7e7e700,
+       0x4646460046464600, 0x7171710071717100, 0xbababa00bababa00,
+       0xd4d4d400d4d4d400, 0x2525250025252500, 0xababab00ababab00,
+       0x4242420042424200, 0x8888880088888800, 0xa2a2a200a2a2a200,
+       0x8d8d8d008d8d8d00, 0xfafafa00fafafa00, 0x7272720072727200,
+       0x0707070007070700, 0xb9b9b900b9b9b900, 0x5555550055555500,
+       0xf8f8f800f8f8f800, 0xeeeeee00eeeeee00, 0xacacac00acacac00,
+       0x0a0a0a000a0a0a00, 0x3636360036363600, 0x4949490049494900,
+       0x2a2a2a002a2a2a00, 0x6868680068686800, 0x3c3c3c003c3c3c00,
+       0x3838380038383800, 0xf1f1f100f1f1f100, 0xa4a4a400a4a4a400,
+       0x4040400040404000, 0x2828280028282800, 0xd3d3d300d3d3d300,
+       0x7b7b7b007b7b7b00, 0xbbbbbb00bbbbbb00, 0xc9c9c900c9c9c900,
+       0x4343430043434300, 0xc1c1c100c1c1c100, 0x1515150015151500,
+       0xe3e3e300e3e3e300, 0xadadad00adadad00, 0xf4f4f400f4f4f400,
+       0x7777770077777700, 0xc7c7c700c7c7c700, 0x8080800080808000,
+       0x9e9e9e009e9e9e00,
+};
+
+/* key constants */
+#define CAMELLIA_SIGMA1L (0xA09E667FL)
+#define CAMELLIA_SIGMA1R (0x3BCC908BL)
+#define CAMELLIA_SIGMA2L (0xB67AE858L)
+#define CAMELLIA_SIGMA2R (0x4CAA73B2L)
+#define CAMELLIA_SIGMA3L (0xC6EF372FL)
+#define CAMELLIA_SIGMA3R (0xE94F82BEL)
+#define CAMELLIA_SIGMA4L (0x54FF53A5L)
+#define CAMELLIA_SIGMA4R (0xF1D36F1CL)
+#define CAMELLIA_SIGMA5L (0x10E527FAL)
+#define CAMELLIA_SIGMA5R (0xDE682D1DL)
+#define CAMELLIA_SIGMA6L (0xB05688C2L)
+#define CAMELLIA_SIGMA6R (0xB3E6C1FDL)
+
+/* macros */
+#define ROLDQ(l, r, bits) ({ \
+       u64 t = l;                                      \
+       l = (l << bits) | (r >> (64 - bits));           \
+       r = (r << bits) | (t >> (64 - bits));           \
+})
+
+#define CAMELLIA_F(x, kl, kr, y) ({ \
+       u64 ii = x ^ (((u64)kl << 32) | kr);                            \
+       y = camellia_sp11101110[(uint8_t)ii];                           \
+       y ^= camellia_sp44044404[(uint8_t)(ii >> 8)];                   \
+       ii >>= 16;                                                      \
+       y ^= camellia_sp30333033[(uint8_t)ii];                          \
+       y ^= camellia_sp02220222[(uint8_t)(ii >> 8)];                   \
+       ii >>= 16;                                                      \
+       y ^= camellia_sp00444404[(uint8_t)ii];                          \
+       y ^= camellia_sp03303033[(uint8_t)(ii >> 8)];                   \
+       ii >>= 16;                                                      \
+       y ^= camellia_sp22000222[(uint8_t)ii];                          \
+       y ^= camellia_sp10011110[(uint8_t)(ii >> 8)];                   \
+       y = ror64(y, 32);                                               \
+})
+
+#define SET_SUBKEY_LR(INDEX, sRL) (subkey[(INDEX)] = ror64((sRL), 32))
+
+static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
+{
+       u64 kw4, tt;
+       u32 dw, tl, tr;
+
+       /* absorb kw2 to other subkeys */
+       /* round 2 */
+       subRL[3] ^= subRL[1];
+       /* round 4 */
+       subRL[5] ^= subRL[1];
+       /* round 6 */
+       subRL[7] ^= subRL[1];
+
+       subRL[1] ^= (subRL[1] & ~subRL[9]) << 32;
+       /* modified for FLinv(kl2) */
+       dw = (subRL[1] & subRL[9]) >> 32,
+               subRL[1] ^= rol32(dw, 1);
+
+       /* round 8 */
+       subRL[11] ^= subRL[1];
+       /* round 10 */
+       subRL[13] ^= subRL[1];
+       /* round 12 */
+       subRL[15] ^= subRL[1];
+
+       subRL[1] ^= (subRL[1] & ~subRL[17]) << 32;
+       /* modified for FLinv(kl4) */
+       dw = (subRL[1] & subRL[17]) >> 32,
+               subRL[1] ^= rol32(dw, 1);
+
+       /* round 14 */
+       subRL[19] ^= subRL[1];
+       /* round 16 */
+       subRL[21] ^= subRL[1];
+       /* round 18 */
+       subRL[23] ^= subRL[1];
+
+       if (max == 24) {
+               /* kw3 */
+               subRL[24] ^= subRL[1];
+
+               /* absorb kw4 to other subkeys */
+               kw4 = subRL[25];
+       } else {
+               subRL[1] ^= (subRL[1] & ~subRL[25]) << 32;
+               /* modified for FLinv(kl6) */
+               dw = (subRL[1] & subRL[25]) >> 32,
+                       subRL[1] ^= rol32(dw, 1);
+
+               /* round 20 */
+               subRL[27] ^= subRL[1];
+               /* round 22 */
+               subRL[29] ^= subRL[1];
+               /* round 24 */
+               subRL[31] ^= subRL[1];
+               /* kw3 */
+               subRL[32] ^= subRL[1];
+
+               /* absorb kw4 to other subkeys */
+               kw4 = subRL[33];
+               /* round 23 */
+               subRL[30] ^= kw4;
+               /* round 21 */
+               subRL[28] ^= kw4;
+               /* round 19 */
+               subRL[26] ^= kw4;
+
+               kw4 ^= (kw4 & ~subRL[24]) << 32;
+               /* modified for FL(kl5) */
+               dw = (kw4 & subRL[24]) >> 32,
+                       kw4 ^= rol32(dw, 1);
+       }
+
+       /* round 17 */
+       subRL[22] ^= kw4;
+       /* round 15 */
+       subRL[20] ^= kw4;
+       /* round 13 */
+       subRL[18] ^= kw4;
+
+       kw4 ^= (kw4 & ~subRL[16]) << 32;
+       /* modified for FL(kl3) */
+       dw = (kw4 & subRL[16]) >> 32,
+               kw4 ^= rol32(dw, 1);
+
+       /* round 11 */
+       subRL[14] ^= kw4;
+       /* round 9 */
+       subRL[12] ^= kw4;
+       /* round 7 */
+       subRL[10] ^= kw4;
+
+       kw4 ^= (kw4 & ~subRL[8]) << 32;
+       /* modified for FL(kl1) */
+       dw = (kw4 & subRL[8]) >> 32,
+               kw4 ^= rol32(dw, 1);
+
+       /* round 5 */
+       subRL[6] ^= kw4;
+       /* round 3 */
+       subRL[4] ^= kw4;
+       /* round 1 */
+       subRL[2] ^= kw4;
+       /* kw1 */
+       subRL[0] ^= kw4;
+
+       /* key XOR is end of F-function */
+       SET_SUBKEY_LR(0, subRL[0] ^ subRL[2]);                  /* kw1 */
+       SET_SUBKEY_LR(2, subRL[3]);                             /* round 1 */
+       SET_SUBKEY_LR(3, subRL[2] ^ subRL[4]);                  /* round 2 */
+       SET_SUBKEY_LR(4, subRL[3] ^ subRL[5]);                  /* round 3 */
+       SET_SUBKEY_LR(5, subRL[4] ^ subRL[6]);                  /* round 4 */
+       SET_SUBKEY_LR(6, subRL[5] ^ subRL[7]);                  /* round 5 */
+
+       tl = (subRL[10] >> 32) ^ (subRL[10] & ~subRL[8]);
+       dw = tl & (subRL[8] >> 32),                             /* FL(kl1) */
+               tr = subRL[10] ^ rol32(dw, 1);
+       tt = (tr | ((u64)tl << 32));
+
+       SET_SUBKEY_LR(7, subRL[6] ^ tt);                        /* round 6 */
+       SET_SUBKEY_LR(8, subRL[8]);                             /* FL(kl1) */
+       SET_SUBKEY_LR(9, subRL[9]);                             /* FLinv(kl2) */
+
+       tl = (subRL[7] >> 32) ^ (subRL[7] & ~subRL[9]);
+       dw = tl & (subRL[9] >> 32),                             /* FLinv(kl2) */
+               tr = subRL[7] ^ rol32(dw, 1);
+       tt = (tr | ((u64)tl << 32));
+
+       SET_SUBKEY_LR(10, subRL[11] ^ tt);                      /* round 7 */
+       SET_SUBKEY_LR(11, subRL[10] ^ subRL[12]);               /* round 8 */
+       SET_SUBKEY_LR(12, subRL[11] ^ subRL[13]);               /* round 9 */
+       SET_SUBKEY_LR(13, subRL[12] ^ subRL[14]);               /* round 10 */
+       SET_SUBKEY_LR(14, subRL[13] ^ subRL[15]);               /* round 11 */
+
+       tl = (subRL[18] >> 32) ^ (subRL[18] & ~subRL[16]);
+       dw = tl & (subRL[16] >> 32),                            /* FL(kl3) */
+               tr = subRL[18] ^ rol32(dw, 1);
+       tt = (tr | ((u64)tl << 32));
+
+       SET_SUBKEY_LR(15, subRL[14] ^ tt);                      /* round 12 */
+       SET_SUBKEY_LR(16, subRL[16]);                           /* FL(kl3) */
+       SET_SUBKEY_LR(17, subRL[17]);                           /* FLinv(kl4) */
+
+       tl = (subRL[15] >> 32) ^ (subRL[15] & ~subRL[17]);
+       dw = tl & (subRL[17] >> 32),                            /* FLinv(kl4) */
+               tr = subRL[15] ^ rol32(dw, 1);
+       tt = (tr | ((u64)tl << 32));
+
+       SET_SUBKEY_LR(18, subRL[19] ^ tt);                      /* round 13 */
+       SET_SUBKEY_LR(19, subRL[18] ^ subRL[20]);               /* round 14 */
+       SET_SUBKEY_LR(20, subRL[19] ^ subRL[21]);               /* round 15 */
+       SET_SUBKEY_LR(21, subRL[20] ^ subRL[22]);               /* round 16 */
+       SET_SUBKEY_LR(22, subRL[21] ^ subRL[23]);               /* round 17 */
+
+       if (max == 24) {
+               SET_SUBKEY_LR(23, subRL[22]);                   /* round 18 */
+               SET_SUBKEY_LR(24, subRL[24] ^ subRL[23]);       /* kw3 */
+       } else {
+               tl = (subRL[26] >> 32) ^ (subRL[26] & ~subRL[24]);
+               dw = tl & (subRL[24] >> 32),                    /* FL(kl5) */
+                       tr = subRL[26] ^ rol32(dw, 1);
+               tt = (tr | ((u64)tl << 32));
+
+               SET_SUBKEY_LR(23, subRL[22] ^ tt);              /* round 18 */
+               SET_SUBKEY_LR(24, subRL[24]);                   /* FL(kl5) */
+               SET_SUBKEY_LR(25, subRL[25]);                   /* FLinv(kl6) */
+
+               tl = (subRL[23] >> 32) ^ (subRL[23] & ~subRL[25]);
+               dw = tl & (subRL[25] >> 32),                    /* FLinv(kl6) */
+                       tr = subRL[23] ^ rol32(dw, 1);
+               tt = (tr | ((u64)tl << 32));
+
+               SET_SUBKEY_LR(26, subRL[27] ^ tt);              /* round 19 */
+               SET_SUBKEY_LR(27, subRL[26] ^ subRL[28]);       /* round 20 */
+               SET_SUBKEY_LR(28, subRL[27] ^ subRL[29]);       /* round 21 */
+               SET_SUBKEY_LR(29, subRL[28] ^ subRL[30]);       /* round 22 */
+               SET_SUBKEY_LR(30, subRL[29] ^ subRL[31]);       /* round 23 */
+               SET_SUBKEY_LR(31, subRL[30]);                   /* round 24 */
+               SET_SUBKEY_LR(32, subRL[32] ^ subRL[31]);       /* kw3 */
+       }
+}
+
+static void camellia_setup128(const unsigned char *key, u64 *subkey)
+{
+       u64 kl, kr, ww;
+       u64 subRL[26];
+
+       /**
+        *  k == kl || kr (|| is concatenation)
+        */
+       kl = get_unaligned_be64(key);
+       kr = get_unaligned_be64(key + 8);
+
+       /* generate KL dependent subkeys */
+       /* kw1 */
+       subRL[0] = kl;
+       /* kw2 */
+       subRL[1] = kr;
+
+       /* rotation left shift 15bit */
+       ROLDQ(kl, kr, 15);
+
+       /* k3 */
+       subRL[4] = kl;
+       /* k4 */
+       subRL[5] = kr;
+
+       /* rotation left shift 15+30bit */
+       ROLDQ(kl, kr, 30);
+
+       /* k7 */
+       subRL[10] = kl;
+       /* k8 */
+       subRL[11] = kr;
+
+       /* rotation left shift 15+30+15bit */
+       ROLDQ(kl, kr, 15);
+
+       /* k10 */
+       subRL[13] = kr;
+       /* rotation left shift 15+30+15+17 bit */
+       ROLDQ(kl, kr, 17);
+
+       /* kl3 */
+       subRL[16] = kl;
+       /* kl4 */
+       subRL[17] = kr;
+
+       /* rotation left shift 15+30+15+17+17 bit */
+       ROLDQ(kl, kr, 17);
+
+       /* k13 */
+       subRL[18] = kl;
+       /* k14 */
+       subRL[19] = kr;
+
+       /* rotation left shift 15+30+15+17+17+17 bit */
+       ROLDQ(kl, kr, 17);
+
+       /* k17 */
+       subRL[22] = kl;
+       /* k18 */
+       subRL[23] = kr;
+
+       /* generate KA */
+       kl = subRL[0];
+       kr = subRL[1];
+       CAMELLIA_F(kl, CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R, ww);
+       kr ^= ww;
+       CAMELLIA_F(kr, CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R, kl);
+
+       /* current status == (kll, klr, w0, w1) */
+       CAMELLIA_F(kl, CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R, kr);
+       kr ^= ww;
+       CAMELLIA_F(kr, CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R, ww);
+       kl ^= ww;
+
+       /* generate KA dependent subkeys */
+       /* k1, k2 */
+       subRL[2] = kl;
+       subRL[3] = kr;
+       ROLDQ(kl, kr, 15);
+       /* k5,k6 */
+       subRL[6] = kl;
+       subRL[7] = kr;
+       ROLDQ(kl, kr, 15);
+       /* kl1, kl2 */
+       subRL[8] = kl;
+       subRL[9] = kr;
+       ROLDQ(kl, kr, 15);
+       /* k9 */
+       subRL[12] = kl;
+       ROLDQ(kl, kr, 15);
+       /* k11, k12 */
+       subRL[14] = kl;
+       subRL[15] = kr;
+       ROLDQ(kl, kr, 34);
+       /* k15, k16 */
+       subRL[20] = kl;
+       subRL[21] = kr;
+       ROLDQ(kl, kr, 17);
+       /* kw3, kw4 */
+       subRL[24] = kl;
+       subRL[25] = kr;
+
+       camellia_setup_tail(subkey, subRL, 24);
+}
+
+static void camellia_setup256(const unsigned char *key, u64 *subkey)
+{
+       u64 kl, kr;                     /* left half of key */
+       u64 krl, krr;                   /* right half of key */
+       u64 ww;                         /* temporary variables */
+       u64 subRL[34];
+
+       /**
+        *  key = (kl || kr || krl || krr) (|| is concatenation)
+        */
+       kl = get_unaligned_be64(key);
+       kr = get_unaligned_be64(key + 8);
+       krl = get_unaligned_be64(key + 16);
+       krr = get_unaligned_be64(key + 24);
+
+       /* generate KL dependent subkeys */
+       /* kw1 */
+       subRL[0] = kl;
+       /* kw2 */
+       subRL[1] = kr;
+       ROLDQ(kl, kr, 45);
+       /* k9 */
+       subRL[12] = kl;
+       /* k10 */
+       subRL[13] = kr;
+       ROLDQ(kl, kr, 15);
+       /* kl3 */
+       subRL[16] = kl;
+       /* kl4 */
+       subRL[17] = kr;
+       ROLDQ(kl, kr, 17);
+       /* k17 */
+       subRL[22] = kl;
+       /* k18 */
+       subRL[23] = kr;
+       ROLDQ(kl, kr, 34);
+       /* k23 */
+       subRL[30] = kl;
+       /* k24 */
+       subRL[31] = kr;
+
+       /* generate KR dependent subkeys */
+       ROLDQ(krl, krr, 15);
+       /* k3 */
+       subRL[4] = krl;
+       /* k4 */
+       subRL[5] = krr;
+       ROLDQ(krl, krr, 15);
+       /* kl1 */
+       subRL[8] = krl;
+       /* kl2 */
+       subRL[9] = krr;
+       ROLDQ(krl, krr, 30);
+       /* k13 */
+       subRL[18] = krl;
+       /* k14 */
+       subRL[19] = krr;
+       ROLDQ(krl, krr, 34);
+       /* k19 */
+       subRL[26] = krl;
+       /* k20 */
+       subRL[27] = krr;
+       ROLDQ(krl, krr, 34);
+
+       /* generate KA */
+       kl = subRL[0] ^ krl;
+       kr = subRL[1] ^ krr;
+
+       CAMELLIA_F(kl, CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R, ww);
+       kr ^= ww;
+       CAMELLIA_F(kr, CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R, kl);
+       kl ^= krl;
+       CAMELLIA_F(kl, CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R, kr);
+       kr ^= ww ^ krr;
+       CAMELLIA_F(kr, CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R, ww);
+       kl ^= ww;
+
+       /* generate KB */
+       krl ^= kl;
+       krr ^= kr;
+       CAMELLIA_F(krl, CAMELLIA_SIGMA5L, CAMELLIA_SIGMA5R, ww);
+       krr ^= ww;
+       CAMELLIA_F(krr, CAMELLIA_SIGMA6L, CAMELLIA_SIGMA6R, ww);
+       krl ^= ww;
+
+       /* generate KA dependent subkeys */
+       ROLDQ(kl, kr, 15);
+       /* k5 */
+       subRL[6] = kl;
+       /* k6 */
+       subRL[7] = kr;
+       ROLDQ(kl, kr, 30);
+       /* k11 */
+       subRL[14] = kl;
+       /* k12 */
+       subRL[15] = kr;
+       /* rotation left shift 32bit */
+       ROLDQ(kl, kr, 32);
+       /* kl5 */
+       subRL[24] = kl;
+       /* kl6 */
+       subRL[25] = kr;
+       /* rotation left shift 17 from k11,k12 -> k21,k22 */
+       ROLDQ(kl, kr, 17);
+       /* k21 */
+       subRL[28] = kl;
+       /* k22 */
+       subRL[29] = kr;
+
+       /* generate KB dependent subkeys */
+       /* k1 */
+       subRL[2] = krl;
+       /* k2 */
+       subRL[3] = krr;
+       ROLDQ(krl, krr, 30);
+       /* k7 */
+       subRL[10] = krl;
+       /* k8 */
+       subRL[11] = krr;
+       ROLDQ(krl, krr, 30);
+       /* k15 */
+       subRL[20] = krl;
+       /* k16 */
+       subRL[21] = krr;
+       ROLDQ(krl, krr, 51);
+       /* kw3 */
+       subRL[32] = krl;
+       /* kw4 */
+       subRL[33] = krr;
+
+       camellia_setup_tail(subkey, subRL, 32);
+}
+
+static void camellia_setup192(const unsigned char *key, u64 *subkey)
+{
+       unsigned char kk[32];
+       u64 krl, krr;
+
+       memcpy(kk, key, 24);
+       memcpy((unsigned char *)&krl, key+16, 8);
+       krr = ~krl;
+       memcpy(kk+24, (unsigned char *)&krr, 8);
+       camellia_setup256(kk, subkey);
+}
+
+static int __camellia_setkey(struct camellia_ctx *cctx,
+                            const unsigned char *key,
+                            unsigned int key_len, u32 *flags)
+{
+       if (key_len != 16 && key_len != 24 && key_len != 32) {
+               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+               return -EINVAL;
+       }
+
+       cctx->key_length = key_len;
+
+       switch (key_len) {
+       case 16:
+               camellia_setup128(key, cctx->key_table);
+               break;
+       case 24:
+               camellia_setup192(key, cctx->key_table);
+               break;
+       case 32:
+               camellia_setup256(key, cctx->key_table);
+               break;
+       }
+
+       return 0;
+}
+
+static int camellia_setkey(struct crypto_tfm *tfm, const u8 *in_key,
+                          unsigned int key_len)
+{
+       return __camellia_setkey(crypto_tfm_ctx(tfm), in_key, key_len,
+                                &tfm->crt_flags);
+}
+
+static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
+                    void (*fn)(struct camellia_ctx *, u8 *, const u8 *),
+                    void (*fn_2way)(struct camellia_ctx *, u8 *, const u8 *))
+{
+       struct camellia_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+       unsigned int nbytes;
+       int err;
+
+       err = blkcipher_walk_virt(desc, walk);
+
+       while ((nbytes = walk->nbytes)) {
+               u8 *wsrc = walk->src.virt.addr;
+               u8 *wdst = walk->dst.virt.addr;
+
+               /* Process two block batch */
+               if (nbytes >= bsize * 2) {
+                       do {
+                               fn_2way(ctx, wdst, wsrc);
+
+                               wsrc += bsize * 2;
+                               wdst += bsize * 2;
+                               nbytes -= bsize * 2;
+                       } while (nbytes >= bsize * 2);
+
+                       if (nbytes < bsize)
+                               goto done;
+               }
+
+               /* Handle leftovers */
+               do {
+                       fn(ctx, wdst, wsrc);
+
+                       wsrc += bsize;
+                       wdst += bsize;
+                       nbytes -= bsize;
+               } while (nbytes >= bsize);
+
+done:
+               err = blkcipher_walk_done(desc, walk, nbytes);
+       }
+
+       return err;
+}
+
+static int ecb_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct blkcipher_walk walk;
+
+       blkcipher_walk_init(&walk, dst, src, nbytes);
+       return ecb_crypt(desc, &walk, camellia_enc_blk, camellia_enc_blk_2way);
+}
+
+static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct blkcipher_walk walk;
+
+       blkcipher_walk_init(&walk, dst, src, nbytes);
+       return ecb_crypt(desc, &walk, camellia_dec_blk, camellia_dec_blk_2way);
+}
+
+static unsigned int __cbc_encrypt(struct blkcipher_desc *desc,
+                                 struct blkcipher_walk *walk)
+{
+       struct camellia_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+       unsigned int nbytes = walk->nbytes;
+       u128 *src = (u128 *)walk->src.virt.addr;
+       u128 *dst = (u128 *)walk->dst.virt.addr;
+       u128 *iv = (u128 *)walk->iv;
+
+       do {
+               u128_xor(dst, src, iv);
+               camellia_enc_blk(ctx, (u8 *)dst, (u8 *)dst);
+               iv = dst;
+
+               src += 1;
+               dst += 1;
+               nbytes -= bsize;
+       } while (nbytes >= bsize);
+
+       u128_xor((u128 *)walk->iv, (u128 *)walk->iv, iv);
+       return nbytes;
+}
+
+static int cbc_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct blkcipher_walk walk;
+       int err;
+
+       blkcipher_walk_init(&walk, dst, src, nbytes);
+       err = blkcipher_walk_virt(desc, &walk);
+
+       while ((nbytes = walk.nbytes)) {
+               nbytes = __cbc_encrypt(desc, &walk);
+               err = blkcipher_walk_done(desc, &walk, nbytes);
+       }
+
+       return err;
+}
+
+static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
+                                 struct blkcipher_walk *walk)
+{
+       struct camellia_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+       unsigned int nbytes = walk->nbytes;
+       u128 *src = (u128 *)walk->src.virt.addr;
+       u128 *dst = (u128 *)walk->dst.virt.addr;
+       u128 ivs[2 - 1];
+       u128 last_iv;
+
+       /* Start of the last block. */
+       src += nbytes / bsize - 1;
+       dst += nbytes / bsize - 1;
+
+       last_iv = *src;
+
+       /* Process two block batch */
+       if (nbytes >= bsize * 2) {
+               do {
+                       nbytes -= bsize * (2 - 1);
+                       src -= 2 - 1;
+                       dst -= 2 - 1;
+
+                       ivs[0] = src[0];
+
+                       camellia_dec_blk_2way(ctx, (u8 *)dst, (u8 *)src);
+
+                       u128_xor(dst + 1, dst + 1, ivs + 0);
+
+                       nbytes -= bsize;
+                       if (nbytes < bsize)
+                               goto done;
+
+                       u128_xor(dst, dst, src - 1);
+                       src -= 1;
+                       dst -= 1;
+               } while (nbytes >= bsize * 2);
+
+               if (nbytes < bsize)
+                       goto done;
+       }
+
+       /* Handle leftovers */
+       for (;;) {
+               camellia_dec_blk(ctx, (u8 *)dst, (u8 *)src);
+
+               nbytes -= bsize;
+               if (nbytes < bsize)
+                       break;
+
+               u128_xor(dst, dst, src - 1);
+               src -= 1;
+               dst -= 1;
+       }
+
+done:
+       u128_xor(dst, dst, (u128 *)walk->iv);
+       *(u128 *)walk->iv = last_iv;
+
+       return nbytes;
+}
+
+static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct blkcipher_walk walk;
+       int err;
+
+       blkcipher_walk_init(&walk, dst, src, nbytes);
+       err = blkcipher_walk_virt(desc, &walk);
+
+       while ((nbytes = walk.nbytes)) {
+               nbytes = __cbc_decrypt(desc, &walk);
+               err = blkcipher_walk_done(desc, &walk, nbytes);
+       }
+
+       return err;
+}
+
+static inline void u128_to_be128(be128 *dst, const u128 *src)
+{
+       dst->a = cpu_to_be64(src->a);
+       dst->b = cpu_to_be64(src->b);
+}
+
+static inline void be128_to_u128(u128 *dst, const be128 *src)
+{
+       dst->a = be64_to_cpu(src->a);
+       dst->b = be64_to_cpu(src->b);
+}
+
+static inline void u128_inc(u128 *i)
+{
+       i->b++;
+       if (!i->b)
+               i->a++;
+}
+
+static void ctr_crypt_final(struct blkcipher_desc *desc,
+                           struct blkcipher_walk *walk)
+{
+       struct camellia_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       u8 keystream[CAMELLIA_BLOCK_SIZE];
+       u8 *src = walk->src.virt.addr;
+       u8 *dst = walk->dst.virt.addr;
+       unsigned int nbytes = walk->nbytes;
+       u128 ctrblk;
+
+       memcpy(keystream, src, nbytes);
+       camellia_enc_blk_xor(ctx, keystream, walk->iv);
+       memcpy(dst, keystream, nbytes);
+
+       be128_to_u128(&ctrblk, (be128 *)walk->iv);
+       u128_inc(&ctrblk);
+       u128_to_be128((be128 *)walk->iv, &ctrblk);
+}
+
+static unsigned int __ctr_crypt(struct blkcipher_desc *desc,
+                               struct blkcipher_walk *walk)
+{
+       struct camellia_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+       unsigned int nbytes = walk->nbytes;
+       u128 *src = (u128 *)walk->src.virt.addr;
+       u128 *dst = (u128 *)walk->dst.virt.addr;
+       u128 ctrblk;
+       be128 ctrblocks[2];
+
+       be128_to_u128(&ctrblk, (be128 *)walk->iv);
+
+       /* Process two block batch */
+       if (nbytes >= bsize * 2) {
+               do {
+                       if (dst != src) {
+                               dst[0] = src[0];
+                               dst[1] = src[1];
+                       }
+
+                       /* create ctrblks for parallel encrypt */
+                       u128_to_be128(&ctrblocks[0], &ctrblk);
+                       u128_inc(&ctrblk);
+                       u128_to_be128(&ctrblocks[1], &ctrblk);
+                       u128_inc(&ctrblk);
+
+                       camellia_enc_blk_xor_2way(ctx, (u8 *)dst,
+                                                (u8 *)ctrblocks);
+
+                       src += 2;
+                       dst += 2;
+                       nbytes -= bsize * 2;
+               } while (nbytes >= bsize * 2);
+
+               if (nbytes < bsize)
+                       goto done;
+       }
+
+       /* Handle leftovers */
+       do {
+               if (dst != src)
+                       *dst = *src;
+
+               u128_to_be128(&ctrblocks[0], &ctrblk);
+               u128_inc(&ctrblk);
+
+               camellia_enc_blk_xor(ctx, (u8 *)dst, (u8 *)ctrblocks);
+
+               src += 1;
+               dst += 1;
+               nbytes -= bsize;
+       } while (nbytes >= bsize);
+
+done:
+       u128_to_be128((be128 *)walk->iv, &ctrblk);
+       return nbytes;
+}
+
+static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                    struct scatterlist *src, unsigned int nbytes)
+{
+       struct blkcipher_walk walk;
+       int err;
+
+       blkcipher_walk_init(&walk, dst, src, nbytes);
+       err = blkcipher_walk_virt_block(desc, &walk, CAMELLIA_BLOCK_SIZE);
+
+       while ((nbytes = walk.nbytes) >= CAMELLIA_BLOCK_SIZE) {
+               nbytes = __ctr_crypt(desc, &walk);
+               err = blkcipher_walk_done(desc, &walk, nbytes);
+       }
+
+       if (walk.nbytes) {
+               ctr_crypt_final(desc, &walk);
+               err = blkcipher_walk_done(desc, &walk, 0);
+       }
+
+       return err;
+}
+
+static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+{
+       const unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+       struct camellia_ctx *ctx = priv;
+       int i;
+
+       while (nbytes >= 2 * bsize) {
+               camellia_enc_blk_2way(ctx, srcdst, srcdst);
+               srcdst += bsize * 2;
+               nbytes -= bsize * 2;
+       }
+
+       for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+               camellia_enc_blk(ctx, srcdst, srcdst);
+}
+
+static void decrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+{
+       const unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+       struct camellia_ctx *ctx = priv;
+       int i;
+
+       while (nbytes >= 2 * bsize) {
+               camellia_dec_blk_2way(ctx, srcdst, srcdst);
+               srcdst += bsize * 2;
+               nbytes -= bsize * 2;
+       }
+
+       for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+               camellia_dec_blk(ctx, srcdst, srcdst);
+}
+
+struct camellia_lrw_ctx {
+       struct lrw_table_ctx lrw_table;
+       struct camellia_ctx camellia_ctx;
+};
+
+static int lrw_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,
+                             unsigned int keylen)
+{
+       struct camellia_lrw_ctx *ctx = crypto_tfm_ctx(tfm);
+       int err;
+
+       err = __camellia_setkey(&ctx->camellia_ctx, key,
+                               keylen - CAMELLIA_BLOCK_SIZE,
+                               &tfm->crt_flags);
+       if (err)
+               return err;
+
+       return lrw_init_table(&ctx->lrw_table,
+                             key + keylen - CAMELLIA_BLOCK_SIZE);
+}
+
+static int lrw_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct camellia_lrw_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       be128 buf[2 * 4];
+       struct lrw_crypt_req req = {
+               .tbuf = buf,
+               .tbuflen = sizeof(buf),
+
+               .table_ctx = &ctx->lrw_table,
+               .crypt_ctx = &ctx->camellia_ctx,
+               .crypt_fn = encrypt_callback,
+       };
+
+       return lrw_crypt(desc, dst, src, nbytes, &req);
+}
+
+static int lrw_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct camellia_lrw_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       be128 buf[2 * 4];
+       struct lrw_crypt_req req = {
+               .tbuf = buf,
+               .tbuflen = sizeof(buf),
+
+               .table_ctx = &ctx->lrw_table,
+               .crypt_ctx = &ctx->camellia_ctx,
+               .crypt_fn = decrypt_callback,
+       };
+
+       return lrw_crypt(desc, dst, src, nbytes, &req);
+}
+
+static void lrw_exit_tfm(struct crypto_tfm *tfm)
+{
+       struct camellia_lrw_ctx *ctx = crypto_tfm_ctx(tfm);
+
+       lrw_free_table(&ctx->lrw_table);
+}
+
+struct camellia_xts_ctx {
+       struct camellia_ctx tweak_ctx;
+       struct camellia_ctx crypt_ctx;
+};
+
+static int xts_camellia_setkey(struct crypto_tfm *tfm, const u8 *key,
+                             unsigned int keylen)
+{
+       struct camellia_xts_ctx *ctx = crypto_tfm_ctx(tfm);
+       u32 *flags = &tfm->crt_flags;
+       int err;
+
+       /* key consists of keys of equal size concatenated, therefore
+        * the length must be even
+        */
+       if (keylen % 2) {
+               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+               return -EINVAL;
+       }
+
+       /* first half of xts-key is for crypt */
+       err = __camellia_setkey(&ctx->crypt_ctx, key, keylen / 2, flags);
+       if (err)
+               return err;
+
+       /* second half of xts-key is for tweak */
+       return __camellia_setkey(&ctx->tweak_ctx, key + keylen / 2, keylen / 2,
+                               flags);
+}
+
+static int xts_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       be128 buf[2 * 4];
+       struct xts_crypt_req req = {
+               .tbuf = buf,
+               .tbuflen = sizeof(buf),
+
+               .tweak_ctx = &ctx->tweak_ctx,
+               .tweak_fn = XTS_TWEAK_CAST(camellia_enc_blk),
+               .crypt_ctx = &ctx->crypt_ctx,
+               .crypt_fn = encrypt_callback,
+       };
+
+       return xts_crypt(desc, dst, src, nbytes, &req);
+}
+
+static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+                      struct scatterlist *src, unsigned int nbytes)
+{
+       struct camellia_xts_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+       be128 buf[2 * 4];
+       struct xts_crypt_req req = {
+               .tbuf = buf,
+               .tbuflen = sizeof(buf),
+
+               .tweak_ctx = &ctx->tweak_ctx,
+               .tweak_fn = XTS_TWEAK_CAST(camellia_enc_blk),
+               .crypt_ctx = &ctx->crypt_ctx,
+               .crypt_fn = decrypt_callback,
+       };
+
+       return xts_crypt(desc, dst, src, nbytes, &req);
+}
+
+static struct crypto_alg camellia_algs[6] = { {
+       .cra_name               = "camellia",
+       .cra_driver_name        = "camellia-asm",
+       .cra_priority           = 200,
+       .cra_flags              = CRYPTO_ALG_TYPE_CIPHER,
+       .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct camellia_ctx),
+       .cra_alignmask          = 0,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(camellia_algs[0].cra_list),
+       .cra_u                  = {
+               .cipher = {
+                       .cia_min_keysize = CAMELLIA_MIN_KEY_SIZE,
+                       .cia_max_keysize = CAMELLIA_MAX_KEY_SIZE,
+                       .cia_setkey      = camellia_setkey,
+                       .cia_encrypt     = camellia_encrypt,
+                       .cia_decrypt     = camellia_decrypt
+               }
+       }
+}, {
+       .cra_name               = "ecb(camellia)",
+       .cra_driver_name        = "ecb-camellia-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct camellia_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(camellia_algs[1].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = CAMELLIA_MIN_KEY_SIZE,
+                       .max_keysize    = CAMELLIA_MAX_KEY_SIZE,
+                       .setkey         = camellia_setkey,
+                       .encrypt        = ecb_encrypt,
+                       .decrypt        = ecb_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "cbc(camellia)",
+       .cra_driver_name        = "cbc-camellia-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct camellia_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(camellia_algs[2].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = CAMELLIA_MIN_KEY_SIZE,
+                       .max_keysize    = CAMELLIA_MAX_KEY_SIZE,
+                       .ivsize         = CAMELLIA_BLOCK_SIZE,
+                       .setkey         = camellia_setkey,
+                       .encrypt        = cbc_encrypt,
+                       .decrypt        = cbc_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "ctr(camellia)",
+       .cra_driver_name        = "ctr-camellia-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = 1,
+       .cra_ctxsize            = sizeof(struct camellia_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(camellia_algs[3].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = CAMELLIA_MIN_KEY_SIZE,
+                       .max_keysize    = CAMELLIA_MAX_KEY_SIZE,
+                       .ivsize         = CAMELLIA_BLOCK_SIZE,
+                       .setkey         = camellia_setkey,
+                       .encrypt        = ctr_crypt,
+                       .decrypt        = ctr_crypt,
+               },
+       },
+}, {
+       .cra_name               = "lrw(camellia)",
+       .cra_driver_name        = "lrw-camellia-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct camellia_lrw_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(camellia_algs[4].cra_list),
+       .cra_exit               = lrw_exit_tfm,
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = CAMELLIA_MIN_KEY_SIZE +
+                                               CAMELLIA_BLOCK_SIZE,
+                       .max_keysize    = CAMELLIA_MAX_KEY_SIZE +
+                                               CAMELLIA_BLOCK_SIZE,
+                       .ivsize         = CAMELLIA_BLOCK_SIZE,
+                       .setkey         = lrw_camellia_setkey,
+                       .encrypt        = lrw_encrypt,
+                       .decrypt        = lrw_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "xts(camellia)",
+       .cra_driver_name        = "xts-camellia-asm",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = CAMELLIA_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct camellia_xts_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(camellia_algs[5].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = CAMELLIA_MIN_KEY_SIZE * 2,
+                       .max_keysize    = CAMELLIA_MAX_KEY_SIZE * 2,
+                       .ivsize         = CAMELLIA_BLOCK_SIZE,
+                       .setkey         = xts_camellia_setkey,
+                       .encrypt        = xts_encrypt,
+                       .decrypt        = xts_decrypt,
+               },
+       },
+} };
+
+static bool is_blacklisted_cpu(void)
+{
+       if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+               return false;
+
+       if (boot_cpu_data.x86 == 0x0f) {
+               /*
+                * On Pentium 4, camellia-asm is slower than original assembler
+                * implementation because excessive uses of 64bit rotate and
+                * left-shifts (which are really slow on P4) needed to store and
+                * handle 128bit block in two 64bit registers.
+                */
+               return true;
+       }
+
+       return false;
+}
+
+static int force;
+module_param(force, int, 0);
+MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
+
+int __init init(void)
+{
+       if (!force && is_blacklisted_cpu()) {
+               printk(KERN_INFO
+                       "camellia-x86_64: performance on this CPU "
+                       "would be suboptimal: disabling "
+                       "camellia-x86_64.\n");
+               return -ENODEV;
+       }
+
+       return crypto_register_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
+}
+
+void __exit fini(void)
+{
+       crypto_unregister_algs(camellia_algs, ARRAY_SIZE(camellia_algs));
+}
+
+module_init(init);
+module_exit(fini);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Camellia Cipher Algorithm, asm optimized");
+MODULE_ALIAS("camellia");
+MODULE_ALIAS("camellia-asm");
index 4e37677..c00053d 100644 (file)
        pand x0,                x4; \
        pxor x2,                x4;
 
-#define transpose_4x4(x0, x1, x2, x3, t1, t2, t3) \
-       movdqa x2,              t3; \
-       movdqa x0,              t1; \
-       unpcklps x3,            t3; \
+#define transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \
        movdqa x0,              t2; \
-       unpcklps x1,            t1; \
-       unpckhps x1,            t2; \
-       movdqa t3,              x1; \
-       unpckhps x3,            x2; \
-       movdqa t1,              x0; \
-       movhlps t1,             x1; \
-       movdqa t2,              t1; \
-       movlhps t3,             x0; \
-       movlhps x2,             t1; \
-       movhlps t2,             x2; \
-       movdqa x2,              x3; \
-       movdqa t1,              x2;
+       punpckldq x1,           x0; \
+       punpckhdq x1,           t2; \
+       movdqa x2,              t1; \
+       punpckhdq x3,           x2; \
+       punpckldq x3,           t1; \
+       movdqa x0,              x1; \
+       punpcklqdq t1,          x0; \
+       punpckhqdq t1,          x1; \
+       movdqa t2,              x3; \
+       punpcklqdq x2,          t2; \
+       punpckhqdq x2,          x3; \
+       movdqa t2,              x2;
 
 #define read_blocks(in, x0, x1, x2, x3, t0, t1, t2) \
        movdqu (0*4*4)(in),     x0; \
index 7f24a15..3ee1ff0 100644 (file)
        get_key(i, 1, RK1); \
        SBOX ## _2(x0 ## 2, x1 ## 2, x2 ## 2, x3 ## 2, x4 ## 2); \
 
-#define transpose_4x4(x0, x1, x2, x3, t1, t2, t3) \
-       movdqa x2,              t3; \
-       movdqa x0,              t1; \
-       unpcklps x3,            t3; \
+#define transpose_4x4(x0, x1, x2, x3, t0, t1, t2) \
        movdqa x0,              t2; \
-       unpcklps x1,            t1; \
-       unpckhps x1,            t2; \
-       movdqa t3,              x1; \
-       unpckhps x3,            x2; \
-       movdqa t1,              x0; \
-       movhlps t1,             x1; \
-       movdqa t2,              t1; \
-       movlhps t3,             x0; \
-       movlhps x2,             t1; \
-       movhlps t2,             x2; \
-       movdqa x2,              x3; \
-       movdqa t1,              x2;
+       punpckldq x1,           x0; \
+       punpckhdq x1,           t2; \
+       movdqa x2,              t1; \
+       punpckhdq x3,           x2; \
+       punpckldq x3,           t1; \
+       movdqa x0,              x1; \
+       punpcklqdq t1,          x0; \
+       punpckhqdq t1,          x1; \
+       movdqa t2,              x3; \
+       punpcklqdq x2,          t2; \
+       punpckhqdq x2,          x3; \
+       movdqa t2,              x2;
 
 #define read_blocks(in, x0, x1, x2, x3, t0, t1, t2) \
        movdqu (0*4*4)(in),     x0; \
index 7955a9b..4b21be8 100644 (file)
@@ -145,28 +145,6 @@ static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return ecb_crypt(desc, &walk, false);
 }
 
-static struct crypto_alg blk_ecb_alg = {
-       .cra_name               = "__ecb-serpent-sse2",
-       .cra_driver_name        = "__driver-ecb-serpent-sse2",
-       .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = SERPENT_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct serpent_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_ecb_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE,
-                       .setkey         = serpent_setkey,
-                       .encrypt        = ecb_encrypt,
-                       .decrypt        = ecb_decrypt,
-               },
-       },
-};
-
 static unsigned int __cbc_encrypt(struct blkcipher_desc *desc,
                                  struct blkcipher_walk *walk)
 {
@@ -295,28 +273,6 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return err;
 }
 
-static struct crypto_alg blk_cbc_alg = {
-       .cra_name               = "__cbc-serpent-sse2",
-       .cra_driver_name        = "__driver-cbc-serpent-sse2",
-       .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = SERPENT_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct serpent_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_cbc_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE,
-                       .setkey         = serpent_setkey,
-                       .encrypt        = cbc_encrypt,
-                       .decrypt        = cbc_decrypt,
-               },
-       },
-};
-
 static inline void u128_to_be128(be128 *dst, const u128 *src)
 {
        dst->a = cpu_to_be64(src->a);
@@ -439,29 +395,6 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return err;
 }
 
-static struct crypto_alg blk_ctr_alg = {
-       .cra_name               = "__ctr-serpent-sse2",
-       .cra_driver_name        = "__driver-ctr-serpent-sse2",
-       .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = 1,
-       .cra_ctxsize            = sizeof(struct serpent_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_ctr_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE,
-                       .ivsize         = SERPENT_BLOCK_SIZE,
-                       .setkey         = serpent_setkey,
-                       .encrypt        = ctr_crypt,
-                       .decrypt        = ctr_crypt,
-               },
-       },
-};
-
 struct crypt_priv {
        struct serpent_ctx *ctx;
        bool fpu_enabled;
@@ -580,32 +513,6 @@ static void lrw_exit_tfm(struct crypto_tfm *tfm)
        lrw_free_table(&ctx->lrw_table);
 }
 
-static struct crypto_alg blk_lrw_alg = {
-       .cra_name               = "__lrw-serpent-sse2",
-       .cra_driver_name        = "__driver-lrw-serpent-sse2",
-       .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = SERPENT_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct serpent_lrw_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_lrw_alg.cra_list),
-       .cra_exit               = lrw_exit_tfm,
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE +
-                                         SERPENT_BLOCK_SIZE,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE +
-                                         SERPENT_BLOCK_SIZE,
-                       .ivsize         = SERPENT_BLOCK_SIZE,
-                       .setkey         = lrw_serpent_setkey,
-                       .encrypt        = lrw_encrypt,
-                       .decrypt        = lrw_decrypt,
-               },
-       },
-};
-
 struct serpent_xts_ctx {
        struct serpent_ctx tweak_ctx;
        struct serpent_ctx crypt_ctx;
@@ -689,29 +596,6 @@ static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return ret;
 }
 
-static struct crypto_alg blk_xts_alg = {
-       .cra_name               = "__xts-serpent-sse2",
-       .cra_driver_name        = "__driver-xts-serpent-sse2",
-       .cra_priority           = 0,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = SERPENT_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct serpent_xts_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_xts_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = SERPENT_MIN_KEY_SIZE * 2,
-                       .max_keysize    = SERPENT_MAX_KEY_SIZE * 2,
-                       .ivsize         = SERPENT_BLOCK_SIZE,
-                       .setkey         = xts_serpent_setkey,
-                       .encrypt        = xts_encrypt,
-                       .decrypt        = xts_decrypt,
-               },
-       },
-};
-
 static int ablk_set_key(struct crypto_ablkcipher *tfm, const u8 *key,
                        unsigned int key_len)
 {
@@ -792,28 +676,133 @@ static void ablk_exit(struct crypto_tfm *tfm)
        cryptd_free_ablkcipher(ctx->cryptd_tfm);
 }
 
-static void ablk_init_common(struct crypto_tfm *tfm,
-                            struct cryptd_ablkcipher *cryptd_tfm)
+static int ablk_init(struct crypto_tfm *tfm)
 {
        struct async_serpent_ctx *ctx = crypto_tfm_ctx(tfm);
+       struct cryptd_ablkcipher *cryptd_tfm;
+       char drv_name[CRYPTO_MAX_ALG_NAME];
+
+       snprintf(drv_name, sizeof(drv_name), "__driver-%s",
+                                       crypto_tfm_alg_driver_name(tfm));
+
+       cryptd_tfm = cryptd_alloc_ablkcipher(drv_name, 0, 0);
+       if (IS_ERR(cryptd_tfm))
+               return PTR_ERR(cryptd_tfm);
 
        ctx->cryptd_tfm = cryptd_tfm;
        tfm->crt_ablkcipher.reqsize = sizeof(struct ablkcipher_request) +
                crypto_ablkcipher_reqsize(&cryptd_tfm->base);
-}
-
-static int ablk_ecb_init(struct crypto_tfm *tfm)
-{
-       struct cryptd_ablkcipher *cryptd_tfm;
 
-       cryptd_tfm = cryptd_alloc_ablkcipher("__driver-ecb-serpent-sse2", 0, 0);
-       if (IS_ERR(cryptd_tfm))
-               return PTR_ERR(cryptd_tfm);
-       ablk_init_common(tfm, cryptd_tfm);
        return 0;
 }
 
-static struct crypto_alg ablk_ecb_alg = {
+static struct crypto_alg serpent_algs[10] = { {
+       .cra_name               = "__ecb-serpent-sse2",
+       .cra_driver_name        = "__driver-ecb-serpent-sse2",
+       .cra_priority           = 0,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = SERPENT_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct serpent_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[0].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = SERPENT_MIN_KEY_SIZE,
+                       .max_keysize    = SERPENT_MAX_KEY_SIZE,
+                       .setkey         = serpent_setkey,
+                       .encrypt        = ecb_encrypt,
+                       .decrypt        = ecb_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "__cbc-serpent-sse2",
+       .cra_driver_name        = "__driver-cbc-serpent-sse2",
+       .cra_priority           = 0,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = SERPENT_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct serpent_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[1].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = SERPENT_MIN_KEY_SIZE,
+                       .max_keysize    = SERPENT_MAX_KEY_SIZE,
+                       .setkey         = serpent_setkey,
+                       .encrypt        = cbc_encrypt,
+                       .decrypt        = cbc_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "__ctr-serpent-sse2",
+       .cra_driver_name        = "__driver-ctr-serpent-sse2",
+       .cra_priority           = 0,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = 1,
+       .cra_ctxsize            = sizeof(struct serpent_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[2].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = SERPENT_MIN_KEY_SIZE,
+                       .max_keysize    = SERPENT_MAX_KEY_SIZE,
+                       .ivsize         = SERPENT_BLOCK_SIZE,
+                       .setkey         = serpent_setkey,
+                       .encrypt        = ctr_crypt,
+                       .decrypt        = ctr_crypt,
+               },
+       },
+}, {
+       .cra_name               = "__lrw-serpent-sse2",
+       .cra_driver_name        = "__driver-lrw-serpent-sse2",
+       .cra_priority           = 0,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = SERPENT_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct serpent_lrw_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[3].cra_list),
+       .cra_exit               = lrw_exit_tfm,
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = SERPENT_MIN_KEY_SIZE +
+                                         SERPENT_BLOCK_SIZE,
+                       .max_keysize    = SERPENT_MAX_KEY_SIZE +
+                                         SERPENT_BLOCK_SIZE,
+                       .ivsize         = SERPENT_BLOCK_SIZE,
+                       .setkey         = lrw_serpent_setkey,
+                       .encrypt        = lrw_encrypt,
+                       .decrypt        = lrw_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "__xts-serpent-sse2",
+       .cra_driver_name        = "__driver-xts-serpent-sse2",
+       .cra_priority           = 0,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = SERPENT_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct serpent_xts_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[4].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = SERPENT_MIN_KEY_SIZE * 2,
+                       .max_keysize    = SERPENT_MAX_KEY_SIZE * 2,
+                       .ivsize         = SERPENT_BLOCK_SIZE,
+                       .setkey         = xts_serpent_setkey,
+                       .encrypt        = xts_encrypt,
+                       .decrypt        = xts_decrypt,
+               },
+       },
+}, {
        .cra_name               = "ecb(serpent)",
        .cra_driver_name        = "ecb-serpent-sse2",
        .cra_priority           = 400,
@@ -823,8 +812,8 @@ static struct crypto_alg ablk_ecb_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(ablk_ecb_alg.cra_list),
-       .cra_init               = ablk_ecb_init,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[5].cra_list),
+       .cra_init               = ablk_init,
        .cra_exit               = ablk_exit,
        .cra_u = {
                .ablkcipher = {
@@ -835,20 +824,7 @@ static struct crypto_alg ablk_ecb_alg = {
                        .decrypt        = ablk_decrypt,
                },
        },
-};
-
-static int ablk_cbc_init(struct crypto_tfm *tfm)
-{
-       struct cryptd_ablkcipher *cryptd_tfm;
-
-       cryptd_tfm = cryptd_alloc_ablkcipher("__driver-cbc-serpent-sse2", 0, 0);
-       if (IS_ERR(cryptd_tfm))
-               return PTR_ERR(cryptd_tfm);
-       ablk_init_common(tfm, cryptd_tfm);
-       return 0;
-}
-
-static struct crypto_alg ablk_cbc_alg = {
+}, {
        .cra_name               = "cbc(serpent)",
        .cra_driver_name        = "cbc-serpent-sse2",
        .cra_priority           = 400,
@@ -858,8 +834,8 @@ static struct crypto_alg ablk_cbc_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(ablk_cbc_alg.cra_list),
-       .cra_init               = ablk_cbc_init,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[6].cra_list),
+       .cra_init               = ablk_init,
        .cra_exit               = ablk_exit,
        .cra_u = {
                .ablkcipher = {
@@ -871,20 +847,7 @@ static struct crypto_alg ablk_cbc_alg = {
                        .decrypt        = ablk_decrypt,
                },
        },
-};
-
-static int ablk_ctr_init(struct crypto_tfm *tfm)
-{
-       struct cryptd_ablkcipher *cryptd_tfm;
-
-       cryptd_tfm = cryptd_alloc_ablkcipher("__driver-ctr-serpent-sse2", 0, 0);
-       if (IS_ERR(cryptd_tfm))
-               return PTR_ERR(cryptd_tfm);
-       ablk_init_common(tfm, cryptd_tfm);
-       return 0;
-}
-
-static struct crypto_alg ablk_ctr_alg = {
+}, {
        .cra_name               = "ctr(serpent)",
        .cra_driver_name        = "ctr-serpent-sse2",
        .cra_priority           = 400,
@@ -894,8 +857,8 @@ static struct crypto_alg ablk_ctr_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(ablk_ctr_alg.cra_list),
-       .cra_init               = ablk_ctr_init,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[7].cra_list),
+       .cra_init               = ablk_init,
        .cra_exit               = ablk_exit,
        .cra_u = {
                .ablkcipher = {
@@ -908,20 +871,7 @@ static struct crypto_alg ablk_ctr_alg = {
                        .geniv          = "chainiv",
                },
        },
-};
-
-static int ablk_lrw_init(struct crypto_tfm *tfm)
-{
-       struct cryptd_ablkcipher *cryptd_tfm;
-
-       cryptd_tfm = cryptd_alloc_ablkcipher("__driver-lrw-serpent-sse2", 0, 0);
-       if (IS_ERR(cryptd_tfm))
-               return PTR_ERR(cryptd_tfm);
-       ablk_init_common(tfm, cryptd_tfm);
-       return 0;
-}
-
-static struct crypto_alg ablk_lrw_alg = {
+}, {
        .cra_name               = "lrw(serpent)",
        .cra_driver_name        = "lrw-serpent-sse2",
        .cra_priority           = 400,
@@ -931,8 +881,8 @@ static struct crypto_alg ablk_lrw_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(ablk_lrw_alg.cra_list),
-       .cra_init               = ablk_lrw_init,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[8].cra_list),
+       .cra_init               = ablk_init,
        .cra_exit               = ablk_exit,
        .cra_u = {
                .ablkcipher = {
@@ -946,20 +896,7 @@ static struct crypto_alg ablk_lrw_alg = {
                        .decrypt        = ablk_decrypt,
                },
        },
-};
-
-static int ablk_xts_init(struct crypto_tfm *tfm)
-{
-       struct cryptd_ablkcipher *cryptd_tfm;
-
-       cryptd_tfm = cryptd_alloc_ablkcipher("__driver-xts-serpent-sse2", 0, 0);
-       if (IS_ERR(cryptd_tfm))
-               return PTR_ERR(cryptd_tfm);
-       ablk_init_common(tfm, cryptd_tfm);
-       return 0;
-}
-
-static struct crypto_alg ablk_xts_alg = {
+}, {
        .cra_name               = "xts(serpent)",
        .cra_driver_name        = "xts-serpent-sse2",
        .cra_priority           = 400,
@@ -969,8 +906,8 @@ static struct crypto_alg ablk_xts_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_ablkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(ablk_xts_alg.cra_list),
-       .cra_init               = ablk_xts_init,
+       .cra_list               = LIST_HEAD_INIT(serpent_algs[9].cra_list),
+       .cra_init               = ablk_init,
        .cra_exit               = ablk_exit,
        .cra_u = {
                .ablkcipher = {
@@ -982,84 +919,21 @@ static struct crypto_alg ablk_xts_alg = {
                        .decrypt        = ablk_decrypt,
                },
        },
-};
+} };
 
 static int __init serpent_sse2_init(void)
 {
-       int err;
-
        if (!cpu_has_xmm2) {
                printk(KERN_INFO "SSE2 instructions are not detected.\n");
                return -ENODEV;
        }
 
-       err = crypto_register_alg(&blk_ecb_alg);
-       if (err)
-               goto blk_ecb_err;
-       err = crypto_register_alg(&blk_cbc_alg);
-       if (err)
-               goto blk_cbc_err;
-       err = crypto_register_alg(&blk_ctr_alg);
-       if (err)
-               goto blk_ctr_err;
-       err = crypto_register_alg(&ablk_ecb_alg);
-       if (err)
-               goto ablk_ecb_err;
-       err = crypto_register_alg(&ablk_cbc_alg);
-       if (err)
-               goto ablk_cbc_err;
-       err = crypto_register_alg(&ablk_ctr_alg);
-       if (err)
-               goto ablk_ctr_err;
-       err = crypto_register_alg(&blk_lrw_alg);
-       if (err)
-               goto blk_lrw_err;
-       err = crypto_register_alg(&ablk_lrw_alg);
-       if (err)
-               goto ablk_lrw_err;
-       err = crypto_register_alg(&blk_xts_alg);
-       if (err)
-               goto blk_xts_err;
-       err = crypto_register_alg(&ablk_xts_alg);
-       if (err)
-               goto ablk_xts_err;
-       return err;
-
-       crypto_unregister_alg(&ablk_xts_alg);
-ablk_xts_err:
-       crypto_unregister_alg(&blk_xts_alg);
-blk_xts_err:
-       crypto_unregister_alg(&ablk_lrw_alg);
-ablk_lrw_err:
-       crypto_unregister_alg(&blk_lrw_alg);
-blk_lrw_err:
-       crypto_unregister_alg(&ablk_ctr_alg);
-ablk_ctr_err:
-       crypto_unregister_alg(&ablk_cbc_alg);
-ablk_cbc_err:
-       crypto_unregister_alg(&ablk_ecb_alg);
-ablk_ecb_err:
-       crypto_unregister_alg(&blk_ctr_alg);
-blk_ctr_err:
-       crypto_unregister_alg(&blk_cbc_alg);
-blk_cbc_err:
-       crypto_unregister_alg(&blk_ecb_alg);
-blk_ecb_err:
-       return err;
+       return crypto_register_algs(serpent_algs, ARRAY_SIZE(serpent_algs));
 }
 
 static void __exit serpent_sse2_exit(void)
 {
-       crypto_unregister_alg(&ablk_xts_alg);
-       crypto_unregister_alg(&blk_xts_alg);
-       crypto_unregister_alg(&ablk_lrw_alg);
-       crypto_unregister_alg(&blk_lrw_alg);
-       crypto_unregister_alg(&ablk_ctr_alg);
-       crypto_unregister_alg(&ablk_cbc_alg);
-       crypto_unregister_alg(&ablk_ecb_alg);
-       crypto_unregister_alg(&blk_ctr_alg);
-       crypto_unregister_alg(&blk_cbc_alg);
-       crypto_unregister_alg(&blk_ecb_alg);
+       crypto_unregister_algs(serpent_algs, ARRAY_SIZE(serpent_algs));
 }
 
 module_init(serpent_sse2_init);
index dc6b3fb..359ae08 100644 (file)
@@ -68,7 +68,7 @@ static struct crypto_alg alg = {
        .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
        .cra_blocksize          =       TF_BLOCK_SIZE,
        .cra_ctxsize            =       sizeof(struct twofish_ctx),
-       .cra_alignmask          =       3,
+       .cra_alignmask          =       0,
        .cra_module             =       THIS_MODULE,
        .cra_list               =       LIST_HEAD_INIT(alg.cra_list),
        .cra_u                  =       {
index 7fee8c1..408fc0c 100644 (file)
@@ -25,6 +25,7 @@
  *
  */
 
+#include <asm/processor.h>
 #include <linux/crypto.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -122,28 +123,6 @@ static int ecb_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return ecb_crypt(desc, &walk, twofish_dec_blk, twofish_dec_blk_3way);
 }
 
-static struct crypto_alg blk_ecb_alg = {
-       .cra_name               = "ecb(twofish)",
-       .cra_driver_name        = "ecb-twofish-3way",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = TF_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct twofish_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_ecb_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = TF_MIN_KEY_SIZE,
-                       .max_keysize    = TF_MAX_KEY_SIZE,
-                       .setkey         = twofish_setkey,
-                       .encrypt        = ecb_encrypt,
-                       .decrypt        = ecb_decrypt,
-               },
-       },
-};
-
 static unsigned int __cbc_encrypt(struct blkcipher_desc *desc,
                                  struct blkcipher_walk *walk)
 {
@@ -267,29 +246,6 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return err;
 }
 
-static struct crypto_alg blk_cbc_alg = {
-       .cra_name               = "cbc(twofish)",
-       .cra_driver_name        = "cbc-twofish-3way",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = TF_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct twofish_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_cbc_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = TF_MIN_KEY_SIZE,
-                       .max_keysize    = TF_MAX_KEY_SIZE,
-                       .ivsize         = TF_BLOCK_SIZE,
-                       .setkey         = twofish_setkey,
-                       .encrypt        = cbc_encrypt,
-                       .decrypt        = cbc_decrypt,
-               },
-       },
-};
-
 static inline void u128_to_be128(be128 *dst, const u128 *src)
 {
        dst->a = cpu_to_be64(src->a);
@@ -411,29 +367,6 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return err;
 }
 
-static struct crypto_alg blk_ctr_alg = {
-       .cra_name               = "ctr(twofish)",
-       .cra_driver_name        = "ctr-twofish-3way",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = 1,
-       .cra_ctxsize            = sizeof(struct twofish_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_ctr_alg.cra_list),
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = TF_MIN_KEY_SIZE,
-                       .max_keysize    = TF_MAX_KEY_SIZE,
-                       .ivsize         = TF_BLOCK_SIZE,
-                       .setkey         = twofish_setkey,
-                       .encrypt        = ctr_crypt,
-                       .decrypt        = ctr_crypt,
-               },
-       },
-};
-
 static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
 {
        const unsigned int bsize = TF_BLOCK_SIZE;
@@ -524,30 +457,6 @@ static void lrw_exit_tfm(struct crypto_tfm *tfm)
        lrw_free_table(&ctx->lrw_table);
 }
 
-static struct crypto_alg blk_lrw_alg = {
-       .cra_name               = "lrw(twofish)",
-       .cra_driver_name        = "lrw-twofish-3way",
-       .cra_priority           = 300,
-       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
-       .cra_blocksize          = TF_BLOCK_SIZE,
-       .cra_ctxsize            = sizeof(struct twofish_lrw_ctx),
-       .cra_alignmask          = 0,
-       .cra_type               = &crypto_blkcipher_type,
-       .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_lrw_alg.cra_list),
-       .cra_exit               = lrw_exit_tfm,
-       .cra_u = {
-               .blkcipher = {
-                       .min_keysize    = TF_MIN_KEY_SIZE + TF_BLOCK_SIZE,
-                       .max_keysize    = TF_MAX_KEY_SIZE + TF_BLOCK_SIZE,
-                       .ivsize         = TF_BLOCK_SIZE,
-                       .setkey         = lrw_twofish_setkey,
-                       .encrypt        = lrw_encrypt,
-                       .decrypt        = lrw_decrypt,
-               },
-       },
-};
-
 struct twofish_xts_ctx {
        struct twofish_ctx tweak_ctx;
        struct twofish_ctx crypt_ctx;
@@ -614,7 +523,91 @@ static int xts_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
        return xts_crypt(desc, dst, src, nbytes, &req);
 }
 
-static struct crypto_alg blk_xts_alg = {
+static struct crypto_alg tf_algs[5] = { {
+       .cra_name               = "ecb(twofish)",
+       .cra_driver_name        = "ecb-twofish-3way",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = TF_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct twofish_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(tf_algs[0].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = TF_MIN_KEY_SIZE,
+                       .max_keysize    = TF_MAX_KEY_SIZE,
+                       .setkey         = twofish_setkey,
+                       .encrypt        = ecb_encrypt,
+                       .decrypt        = ecb_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "cbc(twofish)",
+       .cra_driver_name        = "cbc-twofish-3way",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = TF_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct twofish_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(tf_algs[1].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = TF_MIN_KEY_SIZE,
+                       .max_keysize    = TF_MAX_KEY_SIZE,
+                       .ivsize         = TF_BLOCK_SIZE,
+                       .setkey         = twofish_setkey,
+                       .encrypt        = cbc_encrypt,
+                       .decrypt        = cbc_decrypt,
+               },
+       },
+}, {
+       .cra_name               = "ctr(twofish)",
+       .cra_driver_name        = "ctr-twofish-3way",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = 1,
+       .cra_ctxsize            = sizeof(struct twofish_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(tf_algs[2].cra_list),
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = TF_MIN_KEY_SIZE,
+                       .max_keysize    = TF_MAX_KEY_SIZE,
+                       .ivsize         = TF_BLOCK_SIZE,
+                       .setkey         = twofish_setkey,
+                       .encrypt        = ctr_crypt,
+                       .decrypt        = ctr_crypt,
+               },
+       },
+}, {
+       .cra_name               = "lrw(twofish)",
+       .cra_driver_name        = "lrw-twofish-3way",
+       .cra_priority           = 300,
+       .cra_flags              = CRYPTO_ALG_TYPE_BLKCIPHER,
+       .cra_blocksize          = TF_BLOCK_SIZE,
+       .cra_ctxsize            = sizeof(struct twofish_lrw_ctx),
+       .cra_alignmask          = 0,
+       .cra_type               = &crypto_blkcipher_type,
+       .cra_module             = THIS_MODULE,
+       .cra_list               = LIST_HEAD_INIT(tf_algs[3].cra_list),
+       .cra_exit               = lrw_exit_tfm,
+       .cra_u = {
+               .blkcipher = {
+                       .min_keysize    = TF_MIN_KEY_SIZE + TF_BLOCK_SIZE,
+                       .max_keysize    = TF_MAX_KEY_SIZE + TF_BLOCK_SIZE,
+                       .ivsize         = TF_BLOCK_SIZE,
+                       .setkey         = lrw_twofish_setkey,
+                       .encrypt        = lrw_encrypt,
+                       .decrypt        = lrw_decrypt,
+               },
+       },
+}, {
        .cra_name               = "xts(twofish)",
        .cra_driver_name        = "xts-twofish-3way",
        .cra_priority           = 300,
@@ -624,7 +617,7 @@ static struct crypto_alg blk_xts_alg = {
        .cra_alignmask          = 0,
        .cra_type               = &crypto_blkcipher_type,
        .cra_module             = THIS_MODULE,
-       .cra_list               = LIST_HEAD_INIT(blk_xts_alg.cra_list),
+       .cra_list               = LIST_HEAD_INIT(tf_algs[4].cra_list),
        .cra_u = {
                .blkcipher = {
                        .min_keysize    = TF_MIN_KEY_SIZE * 2,
@@ -635,50 +628,62 @@ static struct crypto_alg blk_xts_alg = {
                        .decrypt        = xts_decrypt,
                },
        },
-};
+} };
+
+static bool is_blacklisted_cpu(void)
+{
+       if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL)
+               return false;
+
+       if (boot_cpu_data.x86 == 0x06 &&
+               (boot_cpu_data.x86_model == 0x1c ||
+                boot_cpu_data.x86_model == 0x26 ||
+                boot_cpu_data.x86_model == 0x36)) {
+               /*
+                * On Atom, twofish-3way is slower than original assembler
+                * implementation. Twofish-3way trades off some performance in
+                * storing blocks in 64bit registers to allow three blocks to
+                * be processed parallel. Parallel operation then allows gaining
+                * more performance than was trade off, on out-of-order CPUs.
+                * However Atom does not benefit from this parallellism and
+                * should be blacklisted.
+                */
+               return true;
+       }
+
+       if (boot_cpu_data.x86 == 0x0f) {
+               /*
+                * On Pentium 4, twofish-3way is slower than original assembler
+                * implementation because excessive uses of 64bit rotate and
+                * left-shifts (which are really slow on P4) needed to store and
+                * handle 128bit block in two 64bit registers.
+                */
+               return true;
+       }
+
+       return false;
+}
+
+static int force;
+module_param(force, int, 0);
+MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist");
 
 int __init init(void)
 {
-       int err;
+       if (!force && is_blacklisted_cpu()) {
+               printk(KERN_INFO
+                       "twofish-x86_64-3way: performance on this CPU "
+                       "would be suboptimal: disabling "
+                       "twofish-x86_64-3way.\n");
+               return -ENODEV;
+       }
 
-       err = crypto_register_alg(&blk_ecb_alg);
-       if (err)
-               goto ecb_err;
-       err = crypto_register_alg(&blk_cbc_alg);
-       if (err)
-               goto cbc_err;
-       err = crypto_register_alg(&blk_ctr_alg);
-       if (err)
-               goto ctr_err;
-       err = crypto_register_alg(&blk_lrw_alg);
-       if (err)
-               goto blk_lrw_err;
-       err = crypto_register_alg(&blk_xts_alg);
-       if (err)
-               goto blk_xts_err;
-
-       return 0;
-
-       crypto_unregister_alg(&blk_xts_alg);
-blk_xts_err:
-       crypto_unregister_alg(&blk_lrw_alg);
-blk_lrw_err:
-       crypto_unregister_alg(&blk_ctr_alg);
-ctr_err:
-       crypto_unregister_alg(&blk_cbc_alg);
-cbc_err:
-       crypto_unregister_alg(&blk_ecb_alg);
-ecb_err:
-       return err;
+       return crypto_register_algs(tf_algs, ARRAY_SIZE(tf_algs));
 }
 
 void __exit fini(void)
 {
-       crypto_unregister_alg(&blk_xts_alg);
-       crypto_unregister_alg(&blk_lrw_alg);
-       crypto_unregister_alg(&blk_ctr_alg);
-       crypto_unregister_alg(&blk_cbc_alg);
-       crypto_unregister_alg(&blk_ecb_alg);
+       crypto_unregister_algs(tf_algs, ARRAY_SIZE(tf_algs));
 }
 
 module_init(init);
index e6cfe1a..6318edd 100644 (file)
@@ -654,6 +654,24 @@ config CRYPTO_CAMELLIA
          See also:
          <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
 
+config CRYPTO_CAMELLIA_X86_64
+       tristate "Camellia cipher algorithm (x86_64)"
+       depends on (X86 || UML_X86) && 64BIT
+       depends on CRYPTO
+       select CRYPTO_ALGAPI
+       select CRYPTO_LRW
+       select CRYPTO_XTS
+       help
+         Camellia cipher algorithm module (x86_64).
+
+         Camellia is a symmetric key block cipher developed jointly
+         at NTT and Mitsubishi Electric Corporation.
+
+         The Camellia specifies three key sizes: 128, 192 and 256 bits.
+
+         See also:
+         <https://info.isl.ntt.co.jp/crypt/eng/camellia/index_s.html>
+
 config CRYPTO_CAST5
        tristate "CAST5 (CAST-128) cipher algorithm"
        select CRYPTO_ALGAPI
index f638063..30f33d6 100644 (file)
@@ -67,7 +67,7 @@ obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o
 obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o
 obj-$(CONFIG_CRYPTO_SERPENT) += serpent_generic.o
 obj-$(CONFIG_CRYPTO_AES) += aes_generic.o
-obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia.o
+obj-$(CONFIG_CRYPTO_CAMELLIA) += camellia_generic.o
 obj-$(CONFIG_CRYPTO_CAST5) += cast5.o
 obj-$(CONFIG_CRYPTO_CAST6) += cast6.o
 obj-$(CONFIG_CRYPTO_ARC4) += arc4.o
index 9d4a9fe..056571b 100644 (file)
@@ -405,6 +405,41 @@ int crypto_unregister_alg(struct crypto_alg *alg)
 }
 EXPORT_SYMBOL_GPL(crypto_unregister_alg);
 
+int crypto_register_algs(struct crypto_alg *algs, int count)
+{
+       int i, ret;
+
+       for (i = 0; i < count; i++) {
+               ret = crypto_register_alg(&algs[i]);
+               if (ret)
+                       goto err;
+       }
+
+       return 0;
+
+err:
+       for (--i; i >= 0; --i)
+               crypto_unregister_alg(&algs[i]);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(crypto_register_algs);
+
+int crypto_unregister_algs(struct crypto_alg *algs, int count)
+{
+       int i, ret;
+
+       for (i = 0; i < count; i++) {
+               ret = crypto_unregister_alg(&algs[i]);
+               if (ret)
+                       pr_err("Failed to unregister %s %s: %d\n",
+                              algs[i].cra_driver_name, algs[i].cra_name, ret);
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(crypto_unregister_algs);
+
 int crypto_register_template(struct crypto_template *tmpl)
 {
        struct crypto_template *q;
diff --git a/crypto/camellia.c b/crypto/camellia.c
deleted file mode 100644 (file)
index 64cff46..0000000
+++ /dev/null
@@ -1,1116 +0,0 @@
-/*
- * Copyright (C) 2006
- * NTT (Nippon Telegraph and Telephone Corporation).
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-/*
- * Algorithm Specification
- *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
- */
-
-/*
- *
- * NOTE --- NOTE --- NOTE --- NOTE
- * This implementation assumes that all memory addresses passed
- * as parameters are four-byte aligned.
- *
- */
-
-#include <linux/crypto.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/bitops.h>
-#include <asm/unaligned.h>
-
-static const u32 camellia_sp1110[256] = {
-       0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00,
-       0xb3b3b300, 0x27272700, 0xc0c0c000, 0xe5e5e500,
-       0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
-       0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100,
-       0x23232300, 0xefefef00, 0x6b6b6b00, 0x93939300,
-       0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
-       0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00,
-       0x1d1d1d00, 0x65656500, 0x92929200, 0xbdbdbd00,
-       0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
-       0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00,
-       0x3e3e3e00, 0x30303000, 0xdcdcdc00, 0x5f5f5f00,
-       0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
-       0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00,
-       0xd5d5d500, 0x47474700, 0x5d5d5d00, 0x3d3d3d00,
-       0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
-       0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00,
-       0x8b8b8b00, 0x0d0d0d00, 0x9a9a9a00, 0x66666600,
-       0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
-       0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000,
-       0xf0f0f000, 0xb1b1b100, 0x84848400, 0x99999900,
-       0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
-       0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500,
-       0x6d6d6d00, 0xb7b7b700, 0xa9a9a900, 0x31313100,
-       0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
-       0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100,
-       0xdedede00, 0x1b1b1b00, 0x11111100, 0x1c1c1c00,
-       0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
-       0x53535300, 0x18181800, 0xf2f2f200, 0x22222200,
-       0xfefefe00, 0x44444400, 0xcfcfcf00, 0xb2b2b200,
-       0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
-       0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800,
-       0x60606000, 0xfcfcfc00, 0x69696900, 0x50505000,
-       0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
-       0xa1a1a100, 0x89898900, 0x62626200, 0x97979700,
-       0x54545400, 0x5b5b5b00, 0x1e1e1e00, 0x95959500,
-       0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
-       0x10101000, 0xc4c4c400, 0x00000000, 0x48484800,
-       0xa3a3a300, 0xf7f7f700, 0x75757500, 0xdbdbdb00,
-       0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
-       0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400,
-       0x87878700, 0x5c5c5c00, 0x83838300, 0x02020200,
-       0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
-       0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300,
-       0x9d9d9d00, 0x7f7f7f00, 0xbfbfbf00, 0xe2e2e200,
-       0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
-       0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00,
-       0x81818100, 0x96969600, 0x6f6f6f00, 0x4b4b4b00,
-       0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
-       0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00,
-       0x9f9f9f00, 0x6e6e6e00, 0xbcbcbc00, 0x8e8e8e00,
-       0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
-       0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900,
-       0x78787800, 0x98989800, 0x06060600, 0x6a6a6a00,
-       0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
-       0xd4d4d400, 0x25252500, 0xababab00, 0x42424200,
-       0x88888800, 0xa2a2a200, 0x8d8d8d00, 0xfafafa00,
-       0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
-       0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00,
-       0x36363600, 0x49494900, 0x2a2a2a00, 0x68686800,
-       0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
-       0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00,
-       0xbbbbbb00, 0xc9c9c900, 0x43434300, 0xc1c1c100,
-       0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
-       0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00,
-};
-
-static const u32 camellia_sp0222[256] = {
-       0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9,
-       0x00676767, 0x004e4e4e, 0x00818181, 0x00cbcbcb,
-       0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
-       0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282,
-       0x00464646, 0x00dfdfdf, 0x00d6d6d6, 0x00272727,
-       0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
-       0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c,
-       0x003a3a3a, 0x00cacaca, 0x00252525, 0x007b7b7b,
-       0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
-       0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d,
-       0x007c7c7c, 0x00606060, 0x00b9b9b9, 0x00bebebe,
-       0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
-       0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595,
-       0x00ababab, 0x008e8e8e, 0x00bababa, 0x007a7a7a,
-       0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
-       0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a,
-       0x00171717, 0x001a1a1a, 0x00353535, 0x00cccccc,
-       0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
-       0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040,
-       0x00e1e1e1, 0x00636363, 0x00090909, 0x00333333,
-       0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
-       0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a,
-       0x00dadada, 0x006f6f6f, 0x00535353, 0x00626262,
-       0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
-       0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2,
-       0x00bdbdbd, 0x00363636, 0x00222222, 0x00383838,
-       0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
-       0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444,
-       0x00fdfdfd, 0x00888888, 0x009f9f9f, 0x00656565,
-       0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
-       0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151,
-       0x00c0c0c0, 0x00f9f9f9, 0x00d2d2d2, 0x00a0a0a0,
-       0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
-       0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f,
-       0x00a8a8a8, 0x00b6b6b6, 0x003c3c3c, 0x002b2b2b,
-       0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
-       0x00202020, 0x00898989, 0x00000000, 0x00909090,
-       0x00474747, 0x00efefef, 0x00eaeaea, 0x00b7b7b7,
-       0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
-       0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929,
-       0x000f0f0f, 0x00b8b8b8, 0x00070707, 0x00040404,
-       0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
-       0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7,
-       0x003b3b3b, 0x00fefefe, 0x007f7f7f, 0x00c5c5c5,
-       0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
-       0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676,
-       0x00030303, 0x002d2d2d, 0x00dedede, 0x00969696,
-       0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
-       0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919,
-       0x003f3f3f, 0x00dcdcdc, 0x00797979, 0x001d1d1d,
-       0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
-       0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2,
-       0x00f0f0f0, 0x00313131, 0x000c0c0c, 0x00d4d4d4,
-       0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
-       0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484,
-       0x00111111, 0x00454545, 0x001b1b1b, 0x00f5f5f5,
-       0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
-       0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414,
-       0x006c6c6c, 0x00929292, 0x00545454, 0x00d0d0d0,
-       0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
-       0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6,
-       0x00777777, 0x00939393, 0x00868686, 0x00838383,
-       0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
-       0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d,
-};
-
-static const u32 camellia_sp3033[256] = {
-       0x38003838, 0x41004141, 0x16001616, 0x76007676,
-       0xd900d9d9, 0x93009393, 0x60006060, 0xf200f2f2,
-       0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
-       0x75007575, 0x06000606, 0x57005757, 0xa000a0a0,
-       0x91009191, 0xf700f7f7, 0xb500b5b5, 0xc900c9c9,
-       0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
-       0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727,
-       0x8e008e8e, 0xb200b2b2, 0x49004949, 0xde00dede,
-       0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
-       0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767,
-       0x1f001f1f, 0x18001818, 0x6e006e6e, 0xaf00afaf,
-       0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
-       0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565,
-       0xea00eaea, 0xa300a3a3, 0xae00aeae, 0x9e009e9e,
-       0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
-       0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6,
-       0xc500c5c5, 0x86008686, 0x4d004d4d, 0x33003333,
-       0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
-       0x3a003a3a, 0x09000909, 0x95009595, 0x10001010,
-       0x78007878, 0xd800d8d8, 0x42004242, 0xcc00cccc,
-       0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
-       0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282,
-       0xb600b6b6, 0xdb00dbdb, 0xd400d4d4, 0x98009898,
-       0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
-       0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0,
-       0x6f006f6f, 0x8d008d8d, 0x88008888, 0x0e000e0e,
-       0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
-       0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111,
-       0x7f007f7f, 0x22002222, 0xe700e7e7, 0x59005959,
-       0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
-       0x12001212, 0x04000404, 0x74007474, 0x54005454,
-       0x30003030, 0x7e007e7e, 0xb400b4b4, 0x28002828,
-       0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
-       0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb,
-       0x2a002a2a, 0xad00adad, 0x0f000f0f, 0xca00caca,
-       0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
-       0x08000808, 0x62006262, 0x00000000, 0x24002424,
-       0xd100d1d1, 0xfb00fbfb, 0xba00baba, 0xed00eded,
-       0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
-       0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a,
-       0xc300c3c3, 0x2e002e2e, 0xc100c1c1, 0x01000101,
-       0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
-       0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9,
-       0xce00cece, 0xbf00bfbf, 0xdf00dfdf, 0x71007171,
-       0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
-       0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d,
-       0xc000c0c0, 0x4b004b4b, 0xb700b7b7, 0xa500a5a5,
-       0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
-       0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646,
-       0xcf00cfcf, 0x37003737, 0x5e005e5e, 0x47004747,
-       0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
-       0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac,
-       0x3c003c3c, 0x4c004c4c, 0x03000303, 0x35003535,
-       0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
-       0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121,
-       0x44004444, 0x51005151, 0xc600c6c6, 0x7d007d7d,
-       0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
-       0x7c007c7c, 0x77007777, 0x56005656, 0x05000505,
-       0x1b001b1b, 0xa400a4a4, 0x15001515, 0x34003434,
-       0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
-       0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd,
-       0xdd00dddd, 0xe400e4e4, 0xa100a1a1, 0xe000e0e0,
-       0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
-       0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f,
-};
-
-static const u32 camellia_sp4404[256] = {
-       0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0,
-       0xe4e400e4, 0x57570057, 0xeaea00ea, 0xaeae00ae,
-       0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
-       0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092,
-       0x86860086, 0xafaf00af, 0x7c7c007c, 0x1f1f001f,
-       0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
-       0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d,
-       0xd9d900d9, 0x5a5a005a, 0x51510051, 0x6c6c006c,
-       0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
-       0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084,
-       0xdfdf00df, 0xcbcb00cb, 0x34340034, 0x76760076,
-       0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
-       0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011,
-       0x32320032, 0x9c9c009c, 0x53530053, 0xf2f200f2,
-       0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
-       0x24240024, 0xe8e800e8, 0x60600060, 0x69690069,
-       0xaaaa00aa, 0xa0a000a0, 0xa1a100a1, 0x62620062,
-       0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
-       0x10100010, 0x00000000, 0xa3a300a3, 0x75750075,
-       0x8a8a008a, 0xe6e600e6, 0x09090009, 0xdddd00dd,
-       0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
-       0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf,
-       0x52520052, 0xd8d800d8, 0xc8c800c8, 0xc6c600c6,
-       0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
-       0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc,
-       0x29290029, 0xf9f900f9, 0x2f2f002f, 0xb4b400b4,
-       0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
-       0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d,
-       0x72720072, 0xb9b900b9, 0xf8f800f8, 0xacac00ac,
-       0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
-       0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043,
-       0x15150015, 0xadad00ad, 0x77770077, 0x80800080,
-       0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
-       0x85850085, 0x35350035, 0x0c0c000c, 0x41410041,
-       0xefef00ef, 0x93930093, 0x19190019, 0x21210021,
-       0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
-       0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce,
-       0x30300030, 0x5f5f005f, 0xc5c500c5, 0x1a1a001a,
-       0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
-       0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d,
-       0x0d0d000d, 0x66660066, 0xcccc00cc, 0x2d2d002d,
-       0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
-       0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005,
-       0xb7b700b7, 0x31310031, 0x17170017, 0xd7d700d7,
-       0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
-       0x0f0f000f, 0x16160016, 0x18180018, 0x22220022,
-       0x44440044, 0xb2b200b2, 0xb5b500b5, 0x91910091,
-       0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
-       0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097,
-       0x5b5b005b, 0x95950095, 0xffff00ff, 0xd2d200d2,
-       0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
-       0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094,
-       0x5c5c005c, 0x02020002, 0x4a4a004a, 0x33330033,
-       0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
-       0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b,
-       0x96960096, 0x4b4b004b, 0xbebe00be, 0x2e2e002e,
-       0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
-       0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059,
-       0x98980098, 0x6a6a006a, 0x46460046, 0xbaba00ba,
-       0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
-       0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a,
-       0x49490049, 0x68680068, 0x38380038, 0xa4a400a4,
-       0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
-       0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e,
-};
-
-
-#define CAMELLIA_MIN_KEY_SIZE        16
-#define CAMELLIA_MAX_KEY_SIZE        32
-#define CAMELLIA_BLOCK_SIZE          16
-#define CAMELLIA_TABLE_BYTE_LEN     272
-
-/*
- * NB: L and R below stand for 'left' and 'right' as in written numbers.
- * That is, in (xxxL,xxxR) pair xxxL holds most significant digits,
- * _not_ least significant ones!
- */
-
-
-/* key constants */
-
-#define CAMELLIA_SIGMA1L (0xA09E667FL)
-#define CAMELLIA_SIGMA1R (0x3BCC908BL)
-#define CAMELLIA_SIGMA2L (0xB67AE858L)
-#define CAMELLIA_SIGMA2R (0x4CAA73B2L)
-#define CAMELLIA_SIGMA3L (0xC6EF372FL)
-#define CAMELLIA_SIGMA3R (0xE94F82BEL)
-#define CAMELLIA_SIGMA4L (0x54FF53A5L)
-#define CAMELLIA_SIGMA4R (0xF1D36F1CL)
-#define CAMELLIA_SIGMA5L (0x10E527FAL)
-#define CAMELLIA_SIGMA5R (0xDE682D1DL)
-#define CAMELLIA_SIGMA6L (0xB05688C2L)
-#define CAMELLIA_SIGMA6R (0xB3E6C1FDL)
-
-/*
- *  macros
- */
-#define ROLDQ(ll, lr, rl, rr, w0, w1, bits)            \
-    do {                                               \
-       w0 = ll;                                        \
-       ll = (ll << bits) + (lr >> (32 - bits));        \
-       lr = (lr << bits) + (rl >> (32 - bits));        \
-       rl = (rl << bits) + (rr >> (32 - bits));        \
-       rr = (rr << bits) + (w0 >> (32 - bits));        \
-    } while (0)
-
-#define ROLDQo32(ll, lr, rl, rr, w0, w1, bits)         \
-    do {                                               \
-       w0 = ll;                                        \
-       w1 = lr;                                        \
-       ll = (lr << (bits - 32)) + (rl >> (64 - bits)); \
-       lr = (rl << (bits - 32)) + (rr >> (64 - bits)); \
-       rl = (rr << (bits - 32)) + (w0 >> (64 - bits)); \
-       rr = (w0 << (bits - 32)) + (w1 >> (64 - bits)); \
-    } while (0)
-
-#define CAMELLIA_F(xl, xr, kl, kr, yl, yr, il, ir, t0, t1)     \
-    do {                                                       \
-       il = xl ^ kl;                                           \
-       ir = xr ^ kr;                                           \
-       t0 = il >> 16;                                          \
-       t1 = ir >> 16;                                          \
-       yl = camellia_sp1110[(u8)(ir     )]                     \
-          ^ camellia_sp0222[    (t1 >> 8)]                     \
-          ^ camellia_sp3033[(u8)(t1     )]                     \
-          ^ camellia_sp4404[(u8)(ir >> 8)];                    \
-       yr = camellia_sp1110[    (t0 >> 8)]                     \
-          ^ camellia_sp0222[(u8)(t0     )]                     \
-          ^ camellia_sp3033[(u8)(il >> 8)]                     \
-          ^ camellia_sp4404[(u8)(il     )];                    \
-       yl ^= yr;                                               \
-       yr = ror32(yr, 8);                                      \
-       yr ^= yl;                                               \
-    } while (0)
-
-#define SUBKEY_L(INDEX) (subkey[(INDEX)*2])
-#define SUBKEY_R(INDEX) (subkey[(INDEX)*2 + 1])
-
-static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)
-{
-       u32 dw, tl, tr;
-       u32 kw4l, kw4r;
-       int i;
-
-       /* absorb kw2 to other subkeys */
-       /* round 2 */
-       subL[3] ^= subL[1]; subR[3] ^= subR[1];
-       /* round 4 */
-       subL[5] ^= subL[1]; subR[5] ^= subR[1];
-       /* round 6 */
-       subL[7] ^= subL[1]; subR[7] ^= subR[1];
-       subL[1] ^= subR[1] & ~subR[9];
-       dw = subL[1] & subL[9],
-               subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl2) */
-       /* round 8 */
-       subL[11] ^= subL[1]; subR[11] ^= subR[1];
-       /* round 10 */
-       subL[13] ^= subL[1]; subR[13] ^= subR[1];
-       /* round 12 */
-       subL[15] ^= subL[1]; subR[15] ^= subR[1];
-       subL[1] ^= subR[1] & ~subR[17];
-       dw = subL[1] & subL[17],
-               subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl4) */
-       /* round 14 */
-       subL[19] ^= subL[1]; subR[19] ^= subR[1];
-       /* round 16 */
-       subL[21] ^= subL[1]; subR[21] ^= subR[1];
-       /* round 18 */
-       subL[23] ^= subL[1]; subR[23] ^= subR[1];
-       if (max == 24) {
-               /* kw3 */
-               subL[24] ^= subL[1]; subR[24] ^= subR[1];
-
-       /* absorb kw4 to other subkeys */
-               kw4l = subL[25]; kw4r = subR[25];
-       } else {
-               subL[1] ^= subR[1] & ~subR[25];
-               dw = subL[1] & subL[25],
-                       subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl6) */
-               /* round 20 */
-               subL[27] ^= subL[1]; subR[27] ^= subR[1];
-               /* round 22 */
-               subL[29] ^= subL[1]; subR[29] ^= subR[1];
-               /* round 24 */
-               subL[31] ^= subL[1]; subR[31] ^= subR[1];
-               /* kw3 */
-               subL[32] ^= subL[1]; subR[32] ^= subR[1];
-
-       /* absorb kw4 to other subkeys */
-               kw4l = subL[33]; kw4r = subR[33];
-               /* round 23 */
-               subL[30] ^= kw4l; subR[30] ^= kw4r;
-               /* round 21 */
-               subL[28] ^= kw4l; subR[28] ^= kw4r;
-               /* round 19 */
-               subL[26] ^= kw4l; subR[26] ^= kw4r;
-               kw4l ^= kw4r & ~subR[24];
-               dw = kw4l & subL[24],
-                       kw4r ^= rol32(dw, 1); /* modified for FL(kl5) */
-       }
-       /* round 17 */
-       subL[22] ^= kw4l; subR[22] ^= kw4r;
-       /* round 15 */
-       subL[20] ^= kw4l; subR[20] ^= kw4r;
-       /* round 13 */
-       subL[18] ^= kw4l; subR[18] ^= kw4r;
-       kw4l ^= kw4r & ~subR[16];
-       dw = kw4l & subL[16],
-               kw4r ^= rol32(dw, 1); /* modified for FL(kl3) */
-       /* round 11 */
-       subL[14] ^= kw4l; subR[14] ^= kw4r;
-       /* round 9 */
-       subL[12] ^= kw4l; subR[12] ^= kw4r;
-       /* round 7 */
-       subL[10] ^= kw4l; subR[10] ^= kw4r;
-       kw4l ^= kw4r & ~subR[8];
-       dw = kw4l & subL[8],
-               kw4r ^= rol32(dw, 1); /* modified for FL(kl1) */
-       /* round 5 */
-       subL[6] ^= kw4l; subR[6] ^= kw4r;
-       /* round 3 */
-       subL[4] ^= kw4l; subR[4] ^= kw4r;
-       /* round 1 */
-       subL[2] ^= kw4l; subR[2] ^= kw4r;
-       /* kw1 */
-       subL[0] ^= kw4l; subR[0] ^= kw4r;
-
-       /* key XOR is end of F-function */
-       SUBKEY_L(0) = subL[0] ^ subL[2];/* kw1 */
-       SUBKEY_R(0) = subR[0] ^ subR[2];
-       SUBKEY_L(2) = subL[3];       /* round 1 */
-       SUBKEY_R(2) = subR[3];
-       SUBKEY_L(3) = subL[2] ^ subL[4]; /* round 2 */
-       SUBKEY_R(3) = subR[2] ^ subR[4];
-       SUBKEY_L(4) = subL[3] ^ subL[5]; /* round 3 */
-       SUBKEY_R(4) = subR[3] ^ subR[5];
-       SUBKEY_L(5) = subL[4] ^ subL[6]; /* round 4 */
-       SUBKEY_R(5) = subR[4] ^ subR[6];
-       SUBKEY_L(6) = subL[5] ^ subL[7]; /* round 5 */
-       SUBKEY_R(6) = subR[5] ^ subR[7];
-       tl = subL[10] ^ (subR[10] & ~subR[8]);
-       dw = tl & subL[8],  /* FL(kl1) */
-               tr = subR[10] ^ rol32(dw, 1);
-       SUBKEY_L(7) = subL[6] ^ tl; /* round 6 */
-       SUBKEY_R(7) = subR[6] ^ tr;
-       SUBKEY_L(8) = subL[8];       /* FL(kl1) */
-       SUBKEY_R(8) = subR[8];
-       SUBKEY_L(9) = subL[9];       /* FLinv(kl2) */
-       SUBKEY_R(9) = subR[9];
-       tl = subL[7] ^ (subR[7] & ~subR[9]);
-       dw = tl & subL[9],  /* FLinv(kl2) */
-               tr = subR[7] ^ rol32(dw, 1);
-       SUBKEY_L(10) = tl ^ subL[11]; /* round 7 */
-       SUBKEY_R(10) = tr ^ subR[11];
-       SUBKEY_L(11) = subL[10] ^ subL[12]; /* round 8 */
-       SUBKEY_R(11) = subR[10] ^ subR[12];
-       SUBKEY_L(12) = subL[11] ^ subL[13]; /* round 9 */
-       SUBKEY_R(12) = subR[11] ^ subR[13];
-       SUBKEY_L(13) = subL[12] ^ subL[14]; /* round 10 */
-       SUBKEY_R(13) = subR[12] ^ subR[14];
-       SUBKEY_L(14) = subL[13] ^ subL[15]; /* round 11 */
-       SUBKEY_R(14) = subR[13] ^ subR[15];
-       tl = subL[18] ^ (subR[18] & ~subR[16]);
-       dw = tl & subL[16], /* FL(kl3) */
-               tr = subR[18] ^ rol32(dw, 1);
-       SUBKEY_L(15) = subL[14] ^ tl; /* round 12 */
-       SUBKEY_R(15) = subR[14] ^ tr;
-       SUBKEY_L(16) = subL[16];     /* FL(kl3) */
-       SUBKEY_R(16) = subR[16];
-       SUBKEY_L(17) = subL[17];     /* FLinv(kl4) */
-       SUBKEY_R(17) = subR[17];
-       tl = subL[15] ^ (subR[15] & ~subR[17]);
-       dw = tl & subL[17], /* FLinv(kl4) */
-               tr = subR[15] ^ rol32(dw, 1);
-       SUBKEY_L(18) = tl ^ subL[19]; /* round 13 */
-       SUBKEY_R(18) = tr ^ subR[19];
-       SUBKEY_L(19) = subL[18] ^ subL[20]; /* round 14 */
-       SUBKEY_R(19) = subR[18] ^ subR[20];
-       SUBKEY_L(20) = subL[19] ^ subL[21]; /* round 15 */
-       SUBKEY_R(20) = subR[19] ^ subR[21];
-       SUBKEY_L(21) = subL[20] ^ subL[22]; /* round 16 */
-       SUBKEY_R(21) = subR[20] ^ subR[22];
-       SUBKEY_L(22) = subL[21] ^ subL[23]; /* round 17 */
-       SUBKEY_R(22) = subR[21] ^ subR[23];
-       if (max == 24) {
-               SUBKEY_L(23) = subL[22];     /* round 18 */
-               SUBKEY_R(23) = subR[22];
-               SUBKEY_L(24) = subL[24] ^ subL[23]; /* kw3 */
-               SUBKEY_R(24) = subR[24] ^ subR[23];
-       } else {
-               tl = subL[26] ^ (subR[26] & ~subR[24]);
-               dw = tl & subL[24], /* FL(kl5) */
-                       tr = subR[26] ^ rol32(dw, 1);
-               SUBKEY_L(23) = subL[22] ^ tl; /* round 18 */
-               SUBKEY_R(23) = subR[22] ^ tr;
-               SUBKEY_L(24) = subL[24];     /* FL(kl5) */
-               SUBKEY_R(24) = subR[24];
-               SUBKEY_L(25) = subL[25];     /* FLinv(kl6) */
-               SUBKEY_R(25) = subR[25];
-               tl = subL[23] ^ (subR[23] & ~subR[25]);
-               dw = tl & subL[25], /* FLinv(kl6) */
-                       tr = subR[23] ^ rol32(dw, 1);
-               SUBKEY_L(26) = tl ^ subL[27]; /* round 19 */
-               SUBKEY_R(26) = tr ^ subR[27];
-               SUBKEY_L(27) = subL[26] ^ subL[28]; /* round 20 */
-               SUBKEY_R(27) = subR[26] ^ subR[28];
-               SUBKEY_L(28) = subL[27] ^ subL[29]; /* round 21 */
-               SUBKEY_R(28) = subR[27] ^ subR[29];
-               SUBKEY_L(29) = subL[28] ^ subL[30]; /* round 22 */
-               SUBKEY_R(29) = subR[28] ^ subR[30];
-               SUBKEY_L(30) = subL[29] ^ subL[31]; /* round 23 */
-               SUBKEY_R(30) = subR[29] ^ subR[31];
-               SUBKEY_L(31) = subL[30];     /* round 24 */
-               SUBKEY_R(31) = subR[30];
-               SUBKEY_L(32) = subL[32] ^ subL[31]; /* kw3 */
-               SUBKEY_R(32) = subR[32] ^ subR[31];
-       }
-
-       /* apply the inverse of the last half of P-function */
-       i = 2;
-       do {
-               dw = SUBKEY_L(i + 0) ^ SUBKEY_R(i + 0); dw = rol32(dw, 8);/* round 1 */
-               SUBKEY_R(i + 0) = SUBKEY_L(i + 0) ^ dw; SUBKEY_L(i + 0) = dw;
-               dw = SUBKEY_L(i + 1) ^ SUBKEY_R(i + 1); dw = rol32(dw, 8);/* round 2 */
-               SUBKEY_R(i + 1) = SUBKEY_L(i + 1) ^ dw; SUBKEY_L(i + 1) = dw;
-               dw = SUBKEY_L(i + 2) ^ SUBKEY_R(i + 2); dw = rol32(dw, 8);/* round 3 */
-               SUBKEY_R(i + 2) = SUBKEY_L(i + 2) ^ dw; SUBKEY_L(i + 2) = dw;
-               dw = SUBKEY_L(i + 3) ^ SUBKEY_R(i + 3); dw = rol32(dw, 8);/* round 4 */
-               SUBKEY_R(i + 3) = SUBKEY_L(i + 3) ^ dw; SUBKEY_L(i + 3) = dw;
-               dw = SUBKEY_L(i + 4) ^ SUBKEY_R(i + 4); dw = rol32(dw, 8);/* round 5 */
-               SUBKEY_R(i + 4) = SUBKEY_L(i + 4) ^ dw; SUBKEY_L(i + 4) = dw;
-               dw = SUBKEY_L(i + 5) ^ SUBKEY_R(i + 5); dw = rol32(dw, 8);/* round 6 */
-               SUBKEY_R(i + 5) = SUBKEY_L(i + 5) ^ dw; SUBKEY_L(i + 5) = dw;
-               i += 8;
-       } while (i < max);
-}
-
-static void camellia_setup128(const unsigned char *key, u32 *subkey)
-{
-       u32 kll, klr, krl, krr;
-       u32 il, ir, t0, t1, w0, w1;
-       u32 subL[26];
-       u32 subR[26];
-
-       /**
-        *  k == kll || klr || krl || krr (|| is concatenation)
-        */
-       kll = get_unaligned_be32(key);
-       klr = get_unaligned_be32(key + 4);
-       krl = get_unaligned_be32(key + 8);
-       krr = get_unaligned_be32(key + 12);
-
-       /* generate KL dependent subkeys */
-       /* kw1 */
-       subL[0] = kll; subR[0] = klr;
-       /* kw2 */
-       subL[1] = krl; subR[1] = krr;
-       /* rotation left shift 15bit */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* k3 */
-       subL[4] = kll; subR[4] = klr;
-       /* k4 */
-       subL[5] = krl; subR[5] = krr;
-       /* rotation left shift 15+30bit */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 30);
-       /* k7 */
-       subL[10] = kll; subR[10] = klr;
-       /* k8 */
-       subL[11] = krl; subR[11] = krr;
-       /* rotation left shift 15+30+15bit */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* k10 */
-       subL[13] = krl; subR[13] = krr;
-       /* rotation left shift 15+30+15+17 bit */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
-       /* kl3 */
-       subL[16] = kll; subR[16] = klr;
-       /* kl4 */
-       subL[17] = krl; subR[17] = krr;
-       /* rotation left shift 15+30+15+17+17 bit */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
-       /* k13 */
-       subL[18] = kll; subR[18] = klr;
-       /* k14 */
-       subL[19] = krl; subR[19] = krr;
-       /* rotation left shift 15+30+15+17+17+17 bit */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
-       /* k17 */
-       subL[22] = kll; subR[22] = klr;
-       /* k18 */
-       subL[23] = krl; subR[23] = krr;
-
-       /* generate KA */
-       kll = subL[0]; klr = subR[0];
-       krl = subL[1]; krr = subR[1];
-       CAMELLIA_F(kll, klr,
-                  CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R,
-                  w0, w1, il, ir, t0, t1);
-       krl ^= w0; krr ^= w1;
-       CAMELLIA_F(krl, krr,
-                  CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R,
-                  kll, klr, il, ir, t0, t1);
-       /* current status == (kll, klr, w0, w1) */
-       CAMELLIA_F(kll, klr,
-                  CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R,
-                  krl, krr, il, ir, t0, t1);
-       krl ^= w0; krr ^= w1;
-       CAMELLIA_F(krl, krr,
-                  CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R,
-                  w0, w1, il, ir, t0, t1);
-       kll ^= w0; klr ^= w1;
-
-       /* generate KA dependent subkeys */
-       /* k1, k2 */
-       subL[2] = kll; subR[2] = klr;
-       subL[3] = krl; subR[3] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* k5,k6 */
-       subL[6] = kll; subR[6] = klr;
-       subL[7] = krl; subR[7] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* kl1, kl2 */
-       subL[8] = kll; subR[8] = klr;
-       subL[9] = krl; subR[9] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* k9 */
-       subL[12] = kll; subR[12] = klr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* k11, k12 */
-       subL[14] = kll; subR[14] = klr;
-       subL[15] = krl; subR[15] = krr;
-       ROLDQo32(kll, klr, krl, krr, w0, w1, 34);
-       /* k15, k16 */
-       subL[20] = kll; subR[20] = klr;
-       subL[21] = krl; subR[21] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
-       /* kw3, kw4 */
-       subL[24] = kll; subR[24] = klr;
-       subL[25] = krl; subR[25] = krr;
-
-       camellia_setup_tail(subkey, subL, subR, 24);
-}
-
-static void camellia_setup256(const unsigned char *key, u32 *subkey)
-{
-       u32 kll, klr, krl, krr;        /* left half of key */
-       u32 krll, krlr, krrl, krrr;    /* right half of key */
-       u32 il, ir, t0, t1, w0, w1;    /* temporary variables */
-       u32 subL[34];
-       u32 subR[34];
-
-       /**
-        *  key = (kll || klr || krl || krr || krll || krlr || krrl || krrr)
-        *  (|| is concatenation)
-        */
-       kll = get_unaligned_be32(key);
-       klr = get_unaligned_be32(key + 4);
-       krl = get_unaligned_be32(key + 8);
-       krr = get_unaligned_be32(key + 12);
-       krll = get_unaligned_be32(key + 16);
-       krlr = get_unaligned_be32(key + 20);
-       krrl = get_unaligned_be32(key + 24);
-       krrr = get_unaligned_be32(key + 28);
-
-       /* generate KL dependent subkeys */
-       /* kw1 */
-       subL[0] = kll; subR[0] = klr;
-       /* kw2 */
-       subL[1] = krl; subR[1] = krr;
-       ROLDQo32(kll, klr, krl, krr, w0, w1, 45);
-       /* k9 */
-       subL[12] = kll; subR[12] = klr;
-       /* k10 */
-       subL[13] = krl; subR[13] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* kl3 */
-       subL[16] = kll; subR[16] = klr;
-       /* kl4 */
-       subL[17] = krl; subR[17] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
-       /* k17 */
-       subL[22] = kll; subR[22] = klr;
-       /* k18 */
-       subL[23] = krl; subR[23] = krr;
-       ROLDQo32(kll, klr, krl, krr, w0, w1, 34);
-       /* k23 */
-       subL[30] = kll; subR[30] = klr;
-       /* k24 */
-       subL[31] = krl; subR[31] = krr;
-
-       /* generate KR dependent subkeys */
-       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15);
-       /* k3 */
-       subL[4] = krll; subR[4] = krlr;
-       /* k4 */
-       subL[5] = krrl; subR[5] = krrr;
-       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15);
-       /* kl1 */
-       subL[8] = krll; subR[8] = krlr;
-       /* kl2 */
-       subL[9] = krrl; subR[9] = krrr;
-       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
-       /* k13 */
-       subL[18] = krll; subR[18] = krlr;
-       /* k14 */
-       subL[19] = krrl; subR[19] = krrr;
-       ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34);
-       /* k19 */
-       subL[26] = krll; subR[26] = krlr;
-       /* k20 */
-       subL[27] = krrl; subR[27] = krrr;
-       ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34);
-
-       /* generate KA */
-       kll = subL[0] ^ krll; klr = subR[0] ^ krlr;
-       krl = subL[1] ^ krrl; krr = subR[1] ^ krrr;
-       CAMELLIA_F(kll, klr,
-                  CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R,
-                  w0, w1, il, ir, t0, t1);
-       krl ^= w0; krr ^= w1;
-       CAMELLIA_F(krl, krr,
-                  CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R,
-                  kll, klr, il, ir, t0, t1);
-       kll ^= krll; klr ^= krlr;
-       CAMELLIA_F(kll, klr,
-                  CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R,
-                  krl, krr, il, ir, t0, t1);
-       krl ^= w0 ^ krrl; krr ^= w1 ^ krrr;
-       CAMELLIA_F(krl, krr,
-                  CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R,
-                  w0, w1, il, ir, t0, t1);
-       kll ^= w0; klr ^= w1;
-
-       /* generate KB */
-       krll ^= kll; krlr ^= klr;
-       krrl ^= krl; krrr ^= krr;
-       CAMELLIA_F(krll, krlr,
-                  CAMELLIA_SIGMA5L, CAMELLIA_SIGMA5R,
-                  w0, w1, il, ir, t0, t1);
-       krrl ^= w0; krrr ^= w1;
-       CAMELLIA_F(krrl, krrr,
-                  CAMELLIA_SIGMA6L, CAMELLIA_SIGMA6R,
-                  w0, w1, il, ir, t0, t1);
-       krll ^= w0; krlr ^= w1;
-
-       /* generate KA dependent subkeys */
-       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
-       /* k5 */
-       subL[6] = kll; subR[6] = klr;
-       /* k6 */
-       subL[7] = krl; subR[7] = krr;
-       ROLDQ(kll, klr, krl, krr, w0, w1, 30);
-       /* k11 */
-       subL[14] = kll; subR[14] = klr;
-       /* k12 */
-       subL[15] = krl; subR[15] = krr;
-       /* rotation left shift 32bit */
-       /* kl5 */
-       subL[24] = klr; subR[24] = krl;
-       /* kl6 */
-       subL[25] = krr; subR[25] = kll;
-       /* rotation left shift 49 from k11,k12 -> k21,k22 */
-       ROLDQo32(kll, klr, krl, krr, w0, w1, 49);
-       /* k21 */
-       subL[28] = kll; subR[28] = klr;
-       /* k22 */
-       subL[29] = krl; subR[29] = krr;
-
-       /* generate KB dependent subkeys */
-       /* k1 */
-       subL[2] = krll; subR[2] = krlr;
-       /* k2 */
-       subL[3] = krrl; subR[3] = krrr;
-       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
-       /* k7 */
-       subL[10] = krll; subR[10] = krlr;
-       /* k8 */
-       subL[11] = krrl; subR[11] = krrr;
-       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
-       /* k15 */
-       subL[20] = krll; subR[20] = krlr;
-       /* k16 */
-       subL[21] = krrl; subR[21] = krrr;
-       ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 51);
-       /* kw3 */
-       subL[32] = krll; subR[32] = krlr;
-       /* kw4 */
-       subL[33] = krrl; subR[33] = krrr;
-
-       camellia_setup_tail(subkey, subL, subR, 32);
-}
-
-static void camellia_setup192(const unsigned char *key, u32 *subkey)
-{
-       unsigned char kk[32];
-       u32 krll, krlr, krrl, krrr;
-
-       memcpy(kk, key, 24);
-       memcpy((unsigned char *)&krll, key+16, 4);
-       memcpy((unsigned char *)&krlr, key+20, 4);
-       krrl = ~krll;
-       krrr = ~krlr;
-       memcpy(kk+24, (unsigned char *)&krrl, 4);
-       memcpy(kk+28, (unsigned char *)&krrr, 4);
-       camellia_setup256(kk, subkey);
-}
-
-
-/*
- * Encrypt/decrypt
- */
-#define CAMELLIA_FLS(ll, lr, rl, rr, kll, klr, krl, krr, t0, t1, t2, t3) \
-    do {                                                               \
-       t0 = kll;                                                       \
-       t2 = krr;                                                       \
-       t0 &= ll;                                                       \
-       t2 |= rr;                                                       \
-       rl ^= t2;                                                       \
-       lr ^= rol32(t0, 1);                                             \
-       t3 = krl;                                                       \
-       t1 = klr;                                                       \
-       t3 &= rl;                                                       \
-       t1 |= lr;                                                       \
-       ll ^= t1;                                                       \
-       rr ^= rol32(t3, 1);                                             \
-    } while (0)
-
-#define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir)               \
-    do {                                                               \
-       ir =  camellia_sp1110[(u8)xr];                                  \
-       il =  camellia_sp1110[    (xl >> 24)];                          \
-       ir ^= camellia_sp0222[    (xr >> 24)];                          \
-       il ^= camellia_sp0222[(u8)(xl >> 16)];                          \
-       ir ^= camellia_sp3033[(u8)(xr >> 16)];                          \
-       il ^= camellia_sp3033[(u8)(xl >> 8)];                           \
-       ir ^= camellia_sp4404[(u8)(xr >> 8)];                           \
-       il ^= camellia_sp4404[(u8)xl];                                  \
-       il ^= kl;                                                       \
-       ir ^= il ^ kr;                                                  \
-       yl ^= ir;                                                       \
-       yr ^= ror32(il, 8) ^ ir;                                                \
-    } while (0)
-
-/* max = 24: 128bit encrypt, max = 32: 256bit encrypt */
-static void camellia_do_encrypt(const u32 *subkey, u32 *io, unsigned max)
-{
-       u32 il, ir, t0, t1;            /* temporary variables */
-
-       /* pre whitening but absorb kw2 */
-       io[0] ^= SUBKEY_L(0);
-       io[1] ^= SUBKEY_R(0);
-
-       /* main iteration */
-#define ROUNDS(i) do { \
-       CAMELLIA_ROUNDSM(io[0], io[1], \
-                        SUBKEY_L(i + 2), SUBKEY_R(i + 2), \
-                        io[2], io[3], il, ir); \
-       CAMELLIA_ROUNDSM(io[2], io[3], \
-                        SUBKEY_L(i + 3), SUBKEY_R(i + 3), \
-                        io[0], io[1], il, ir); \
-       CAMELLIA_ROUNDSM(io[0], io[1], \
-                        SUBKEY_L(i + 4), SUBKEY_R(i + 4), \
-                        io[2], io[3], il, ir); \
-       CAMELLIA_ROUNDSM(io[2], io[3], \
-                        SUBKEY_L(i + 5), SUBKEY_R(i + 5), \
-                        io[0], io[1], il, ir); \
-       CAMELLIA_ROUNDSM(io[0], io[1], \
-                        SUBKEY_L(i + 6), SUBKEY_R(i + 6), \
-                        io[2], io[3], il, ir); \
-       CAMELLIA_ROUNDSM(io[2], io[3], \
-                        SUBKEY_L(i + 7), SUBKEY_R(i + 7), \
-                        io[0], io[1], il, ir); \
-} while (0)
-#define FLS(i) do { \
-       CAMELLIA_FLS(io[0], io[1], io[2], io[3], \
-                    SUBKEY_L(i + 0), SUBKEY_R(i + 0), \
-                    SUBKEY_L(i + 1), SUBKEY_R(i + 1), \
-                    t0, t1, il, ir); \
-} while (0)
-
-       ROUNDS(0);
-       FLS(8);
-       ROUNDS(8);
-       FLS(16);
-       ROUNDS(16);
-       if (max == 32) {
-               FLS(24);
-               ROUNDS(24);
-       }
-
-#undef ROUNDS
-#undef FLS
-
-       /* post whitening but kw4 */
-       io[2] ^= SUBKEY_L(max);
-       io[3] ^= SUBKEY_R(max);
-       /* NB: io[0],[1] should be swapped with [2],[3] by caller! */
-}
-
-static void camellia_do_decrypt(const u32 *subkey, u32 *io, unsigned i)
-{
-       u32 il, ir, t0, t1;            /* temporary variables */
-
-       /* pre whitening but absorb kw2 */
-       io[0] ^= SUBKEY_L(i);
-       io[1] ^= SUBKEY_R(i);
-
-       /* main iteration */
-#define ROUNDS(i) do { \
-       CAMELLIA_ROUNDSM(io[0], io[1], \
-                        SUBKEY_L(i + 7), SUBKEY_R(i + 7), \
-                        io[2], io[3], il, ir); \
-       CAMELLIA_ROUNDSM(io[2], io[3], \
-                        SUBKEY_L(i + 6), SUBKEY_R(i + 6), \
-                        io[0], io[1], il, ir); \
-       CAMELLIA_ROUNDSM(io[0], io[1], \
-                        SUBKEY_L(i + 5), SUBKEY_R(i + 5), \
-                        io[2], io[3], il, ir); \
-       CAMELLIA_ROUNDSM(io[2], io[3], \
-                        SUBKEY_L(i + 4), SUBKEY_R(i + 4), \
-                        io[0], io[1], il, ir); \
-       CAMELLIA_ROUNDSM(io[0], io[1], \
-                        SUBKEY_L(i + 3), SUBKEY_R(i + 3), \
-                        io[2], io[3], il, ir); \
-       CAMELLIA_ROUNDSM(io[2], io[3], \
-                        SUBKEY_L(i + 2), SUBKEY_R(i + 2), \
-                        io[0], io[1], il, ir); \
-} while (0)
-#define FLS(i) do { \
-       CAMELLIA_FLS(io[0], io[1], io[2], io[3], \
-                    SUBKEY_L(i + 1), SUBKEY_R(i + 1), \
-                    SUBKEY_L(i + 0), SUBKEY_R(i + 0), \
-                    t0, t1, il, ir); \
-} while (0)
-
-       if (i == 32) {
-               ROUNDS(24);
-               FLS(24);
-       }
-       ROUNDS(16);
-       FLS(16);
-       ROUNDS(8);
-       FLS(8);
-       ROUNDS(0);
-
-#undef ROUNDS
-#undef FLS
-
-       /* post whitening but kw4 */
-       io[2] ^= SUBKEY_L(0);
-       io[3] ^= SUBKEY_R(0);
-       /* NB: 0,1 should be swapped with 2,3 by caller! */
-}
-
-
-struct camellia_ctx {
-       int key_length;
-       u32 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u32)];
-};
-
-static int
-camellia_set_key(struct crypto_tfm *tfm, const u8 *in_key,
-                unsigned int key_len)
-{
-       struct camellia_ctx *cctx = crypto_tfm_ctx(tfm);
-       const unsigned char *key = (const unsigned char *)in_key;
-       u32 *flags = &tfm->crt_flags;
-
-       if (key_len != 16 && key_len != 24 && key_len != 32) {
-               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-               return -EINVAL;
-       }
-
-       cctx->key_length = key_len;
-
-       switch (key_len) {
-       case 16:
-               camellia_setup128(key, cctx->key_table);
-               break;
-       case 24:
-               camellia_setup192(key, cctx->key_table);
-               break;
-       case 32:
-               camellia_setup256(key, cctx->key_table);
-               break;
-       }
-
-       return 0;
-}
-
-static void camellia_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-       const struct camellia_ctx *cctx = crypto_tfm_ctx(tfm);
-       const __be32 *src = (const __be32 *)in;
-       __be32 *dst = (__be32 *)out;
-
-       u32 tmp[4];
-
-       tmp[0] = be32_to_cpu(src[0]);
-       tmp[1] = be32_to_cpu(src[1]);
-       tmp[2] = be32_to_cpu(src[2]);
-       tmp[3] = be32_to_cpu(src[3]);
-
-       camellia_do_encrypt(cctx->key_table, tmp,
-               cctx->key_length == 16 ? 24 : 32 /* for key lengths of 24 and 32 */
-       );
-
-       /* do_encrypt returns 0,1 swapped with 2,3 */
-       dst[0] = cpu_to_be32(tmp[2]);
-       dst[1] = cpu_to_be32(tmp[3]);
-       dst[2] = cpu_to_be32(tmp[0]);
-       dst[3] = cpu_to_be32(tmp[1]);
-}
-
-static void camellia_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
-{
-       const struct camellia_ctx *cctx = crypto_tfm_ctx(tfm);
-       const __be32 *src = (const __be32 *)in;
-       __be32 *dst = (__be32 *)out;
-
-       u32 tmp[4];
-
-       tmp[0] = be32_to_cpu(src[0]);
-       tmp[1] = be32_to_cpu(src[1]);
-       tmp[2] = be32_to_cpu(src[2]);
-       tmp[3] = be32_to_cpu(src[3]);
-
-       camellia_do_decrypt(cctx->key_table, tmp,
-               cctx->key_length == 16 ? 24 : 32 /* for key lengths of 24 and 32 */
-       );
-
-       /* do_decrypt returns 0,1 swapped with 2,3 */
-       dst[0] = cpu_to_be32(tmp[2]);
-       dst[1] = cpu_to_be32(tmp[3]);
-       dst[2] = cpu_to_be32(tmp[0]);
-       dst[3] = cpu_to_be32(tmp[1]);
-}
-
-static struct crypto_alg camellia_alg = {
-       .cra_name               =       "camellia",
-       .cra_driver_name        =       "camellia-generic",
-       .cra_priority           =       100,
-       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
-       .cra_blocksize          =       CAMELLIA_BLOCK_SIZE,
-       .cra_ctxsize            =       sizeof(struct camellia_ctx),
-       .cra_alignmask          =       3,
-       .cra_module             =       THIS_MODULE,
-       .cra_list               =       LIST_HEAD_INIT(camellia_alg.cra_list),
-       .cra_u                  =       {
-               .cipher = {
-                       .cia_min_keysize        =       CAMELLIA_MIN_KEY_SIZE,
-                       .cia_max_keysize        =       CAMELLIA_MAX_KEY_SIZE,
-                       .cia_setkey             =       camellia_set_key,
-                       .cia_encrypt            =       camellia_encrypt,
-                       .cia_decrypt            =       camellia_decrypt
-               }
-       }
-};
-
-static int __init camellia_init(void)
-{
-       return crypto_register_alg(&camellia_alg);
-}
-
-static void __exit camellia_fini(void)
-{
-       crypto_unregister_alg(&camellia_alg);
-}
-
-module_init(camellia_init);
-module_exit(camellia_fini);
-
-MODULE_DESCRIPTION("Camellia Cipher Algorithm");
-MODULE_LICENSE("GPL");
diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c
new file mode 100644 (file)
index 0000000..f7aaaaf
--- /dev/null
@@ -0,0 +1,1102 @@
+/*
+ * Copyright (C) 2006
+ * NTT (Nippon Telegraph and Telephone Corporation).
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/*
+ * Algorithm Specification
+ *  http://info.isl.ntt.co.jp/crypt/eng/camellia/specifications.html
+ */
+
+/*
+ *
+ * NOTE --- NOTE --- NOTE --- NOTE
+ * This implementation assumes that all memory addresses passed
+ * as parameters are four-byte aligned.
+ *
+ */
+
+#include <linux/crypto.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/bitops.h>
+#include <asm/unaligned.h>
+
+static const u32 camellia_sp1110[256] = {
+       0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00,
+       0xb3b3b300, 0x27272700, 0xc0c0c000, 0xe5e5e500,
+       0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
+       0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100,
+       0x23232300, 0xefefef00, 0x6b6b6b00, 0x93939300,
+       0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
+       0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00,
+       0x1d1d1d00, 0x65656500, 0x92929200, 0xbdbdbd00,
+       0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
+       0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00,
+       0x3e3e3e00, 0x30303000, 0xdcdcdc00, 0x5f5f5f00,
+       0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
+       0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00,
+       0xd5d5d500, 0x47474700, 0x5d5d5d00, 0x3d3d3d00,
+       0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
+       0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00,
+       0x8b8b8b00, 0x0d0d0d00, 0x9a9a9a00, 0x66666600,
+       0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
+       0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000,
+       0xf0f0f000, 0xb1b1b100, 0x84848400, 0x99999900,
+       0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
+       0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500,
+       0x6d6d6d00, 0xb7b7b700, 0xa9a9a900, 0x31313100,
+       0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
+       0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100,
+       0xdedede00, 0x1b1b1b00, 0x11111100, 0x1c1c1c00,
+       0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
+       0x53535300, 0x18181800, 0xf2f2f200, 0x22222200,
+       0xfefefe00, 0x44444400, 0xcfcfcf00, 0xb2b2b200,
+       0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
+       0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800,
+       0x60606000, 0xfcfcfc00, 0x69696900, 0x50505000,
+       0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
+       0xa1a1a100, 0x89898900, 0x62626200, 0x97979700,
+       0x54545400, 0x5b5b5b00, 0x1e1e1e00, 0x95959500,
+       0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
+       0x10101000, 0xc4c4c400, 0x00000000, 0x48484800,
+       0xa3a3a300, 0xf7f7f700, 0x75757500, 0xdbdbdb00,
+       0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
+       0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400,
+       0x87878700, 0x5c5c5c00, 0x83838300, 0x02020200,
+       0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
+       0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300,
+       0x9d9d9d00, 0x7f7f7f00, 0xbfbfbf00, 0xe2e2e200,
+       0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
+       0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00,
+       0x81818100, 0x96969600, 0x6f6f6f00, 0x4b4b4b00,
+       0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
+       0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00,
+       0x9f9f9f00, 0x6e6e6e00, 0xbcbcbc00, 0x8e8e8e00,
+       0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
+       0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900,
+       0x78787800, 0x98989800, 0x06060600, 0x6a6a6a00,
+       0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
+       0xd4d4d400, 0x25252500, 0xababab00, 0x42424200,
+       0x88888800, 0xa2a2a200, 0x8d8d8d00, 0xfafafa00,
+       0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
+       0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00,
+       0x36363600, 0x49494900, 0x2a2a2a00, 0x68686800,
+       0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
+       0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00,
+       0xbbbbbb00, 0xc9c9c900, 0x43434300, 0xc1c1c100,
+       0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
+       0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00,
+};
+
+static const u32 camellia_sp0222[256] = {
+       0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9,
+       0x00676767, 0x004e4e4e, 0x00818181, 0x00cbcbcb,
+       0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
+       0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282,
+       0x00464646, 0x00dfdfdf, 0x00d6d6d6, 0x00272727,
+       0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
+       0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c,
+       0x003a3a3a, 0x00cacaca, 0x00252525, 0x007b7b7b,
+       0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
+       0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d,
+       0x007c7c7c, 0x00606060, 0x00b9b9b9, 0x00bebebe,
+       0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
+       0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595,
+       0x00ababab, 0x008e8e8e, 0x00bababa, 0x007a7a7a,
+       0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
+       0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a,
+       0x00171717, 0x001a1a1a, 0x00353535, 0x00cccccc,
+       0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
+       0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040,
+       0x00e1e1e1, 0x00636363, 0x00090909, 0x00333333,
+       0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
+       0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a,
+       0x00dadada, 0x006f6f6f, 0x00535353, 0x00626262,
+       0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
+       0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2,
+       0x00bdbdbd, 0x00363636, 0x00222222, 0x00383838,
+       0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
+       0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444,
+       0x00fdfdfd, 0x00888888, 0x009f9f9f, 0x00656565,
+       0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
+       0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151,
+       0x00c0c0c0, 0x00f9f9f9, 0x00d2d2d2, 0x00a0a0a0,
+       0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
+       0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f,
+       0x00a8a8a8, 0x00b6b6b6, 0x003c3c3c, 0x002b2b2b,
+       0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
+       0x00202020, 0x00898989, 0x00000000, 0x00909090,
+       0x00474747, 0x00efefef, 0x00eaeaea, 0x00b7b7b7,
+       0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
+       0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929,
+       0x000f0f0f, 0x00b8b8b8, 0x00070707, 0x00040404,
+       0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
+       0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7,
+       0x003b3b3b, 0x00fefefe, 0x007f7f7f, 0x00c5c5c5,
+       0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
+       0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676,
+       0x00030303, 0x002d2d2d, 0x00dedede, 0x00969696,
+       0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
+       0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919,
+       0x003f3f3f, 0x00dcdcdc, 0x00797979, 0x001d1d1d,
+       0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
+       0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2,
+       0x00f0f0f0, 0x00313131, 0x000c0c0c, 0x00d4d4d4,
+       0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
+       0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484,
+       0x00111111, 0x00454545, 0x001b1b1b, 0x00f5f5f5,
+       0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
+       0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414,
+       0x006c6c6c, 0x00929292, 0x00545454, 0x00d0d0d0,
+       0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
+       0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6,
+       0x00777777, 0x00939393, 0x00868686, 0x00838383,
+       0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
+       0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d,
+};
+
+static const u32 camellia_sp3033[256] = {
+       0x38003838, 0x41004141, 0x16001616, 0x76007676,
+       0xd900d9d9, 0x93009393, 0x60006060, 0xf200f2f2,
+       0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
+       0x75007575, 0x06000606, 0x57005757, 0xa000a0a0,
+       0x91009191, 0xf700f7f7, 0xb500b5b5, 0xc900c9c9,
+       0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
+       0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727,
+       0x8e008e8e, 0xb200b2b2, 0x49004949, 0xde00dede,
+       0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
+       0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767,
+       0x1f001f1f, 0x18001818, 0x6e006e6e, 0xaf00afaf,
+       0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
+       0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565,
+       0xea00eaea, 0xa300a3a3, 0xae00aeae, 0x9e009e9e,
+       0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
+       0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6,
+       0xc500c5c5, 0x86008686, 0x4d004d4d, 0x33003333,
+       0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
+       0x3a003a3a, 0x09000909, 0x95009595, 0x10001010,
+       0x78007878, 0xd800d8d8, 0x42004242, 0xcc00cccc,
+       0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
+       0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282,
+       0xb600b6b6, 0xdb00dbdb, 0xd400d4d4, 0x98009898,
+       0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
+       0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0,
+       0x6f006f6f, 0x8d008d8d, 0x88008888, 0x0e000e0e,
+       0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
+       0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111,
+       0x7f007f7f, 0x22002222, 0xe700e7e7, 0x59005959,
+       0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
+       0x12001212, 0x04000404, 0x74007474, 0x54005454,
+       0x30003030, 0x7e007e7e, 0xb400b4b4, 0x28002828,
+       0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
+       0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb,
+       0x2a002a2a, 0xad00adad, 0x0f000f0f, 0xca00caca,
+       0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
+       0x08000808, 0x62006262, 0x00000000, 0x24002424,
+       0xd100d1d1, 0xfb00fbfb, 0xba00baba, 0xed00eded,
+       0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
+       0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a,
+       0xc300c3c3, 0x2e002e2e, 0xc100c1c1, 0x01000101,
+       0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
+       0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9,
+       0xce00cece, 0xbf00bfbf, 0xdf00dfdf, 0x71007171,
+       0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
+       0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d,
+       0xc000c0c0, 0x4b004b4b, 0xb700b7b7, 0xa500a5a5,
+       0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
+       0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646,
+       0xcf00cfcf, 0x37003737, 0x5e005e5e, 0x47004747,
+       0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
+       0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac,
+       0x3c003c3c, 0x4c004c4c, 0x03000303, 0x35003535,
+       0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
+       0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121,
+       0x44004444, 0x51005151, 0xc600c6c6, 0x7d007d7d,
+       0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
+       0x7c007c7c, 0x77007777, 0x56005656, 0x05000505,
+       0x1b001b1b, 0xa400a4a4, 0x15001515, 0x34003434,
+       0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
+       0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd,
+       0xdd00dddd, 0xe400e4e4, 0xa100a1a1, 0xe000e0e0,
+       0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
+       0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f,
+};
+
+static const u32 camellia_sp4404[256] = {
+       0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0,
+       0xe4e400e4, 0x57570057, 0xeaea00ea, 0xaeae00ae,
+       0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
+       0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092,
+       0x86860086, 0xafaf00af, 0x7c7c007c, 0x1f1f001f,
+       0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
+       0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d,
+       0xd9d900d9, 0x5a5a005a, 0x51510051, 0x6c6c006c,
+       0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
+       0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084,
+       0xdfdf00df, 0xcbcb00cb, 0x34340034, 0x76760076,
+       0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
+       0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011,
+       0x32320032, 0x9c9c009c, 0x53530053, 0xf2f200f2,
+       0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
+       0x24240024, 0xe8e800e8, 0x60600060, 0x69690069,
+       0xaaaa00aa, 0xa0a000a0, 0xa1a100a1, 0x62620062,
+       0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
+       0x10100010, 0x00000000, 0xa3a300a3, 0x75750075,
+       0x8a8a008a, 0xe6e600e6, 0x09090009, 0xdddd00dd,
+       0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
+       0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf,
+       0x52520052, 0xd8d800d8, 0xc8c800c8, 0xc6c600c6,
+       0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
+       0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc,
+       0x29290029, 0xf9f900f9, 0x2f2f002f, 0xb4b400b4,
+       0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
+       0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d,
+       0x72720072, 0xb9b900b9, 0xf8f800f8, 0xacac00ac,
+       0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
+       0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043,
+       0x15150015, 0xadad00ad, 0x77770077, 0x80800080,
+       0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
+       0x85850085, 0x35350035, 0x0c0c000c, 0x41410041,
+       0xefef00ef, 0x93930093, 0x19190019, 0x21210021,
+       0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
+       0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce,
+       0x30300030, 0x5f5f005f, 0xc5c500c5, 0x1a1a001a,
+       0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
+       0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d,
+       0x0d0d000d, 0x66660066, 0xcccc00cc, 0x2d2d002d,
+       0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
+       0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005,
+       0xb7b700b7, 0x31310031, 0x17170017, 0xd7d700d7,
+       0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
+       0x0f0f000f, 0x16160016, 0x18180018, 0x22220022,
+       0x44440044, 0xb2b200b2, 0xb5b500b5, 0x91910091,
+       0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
+       0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097,
+       0x5b5b005b, 0x95950095, 0xffff00ff, 0xd2d200d2,
+       0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
+       0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094,
+       0x5c5c005c, 0x02020002, 0x4a4a004a, 0x33330033,
+       0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
+       0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b,
+       0x96960096, 0x4b4b004b, 0xbebe00be, 0x2e2e002e,
+       0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
+       0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059,
+       0x98980098, 0x6a6a006a, 0x46460046, 0xbaba00ba,
+       0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
+       0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a,
+       0x49490049, 0x68680068, 0x38380038, 0xa4a400a4,
+       0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
+       0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e,
+};
+
+
+#define CAMELLIA_MIN_KEY_SIZE        16
+#define CAMELLIA_MAX_KEY_SIZE        32
+#define CAMELLIA_BLOCK_SIZE          16
+#define CAMELLIA_TABLE_BYTE_LEN     272
+
+/*
+ * NB: L and R below stand for 'left' and 'right' as in written numbers.
+ * That is, in (xxxL,xxxR) pair xxxL holds most significant digits,
+ * _not_ least significant ones!
+ */
+
+
+/* key constants */
+
+#define CAMELLIA_SIGMA1L (0xA09E667FL)
+#define CAMELLIA_SIGMA1R (0x3BCC908BL)
+#define CAMELLIA_SIGMA2L (0xB67AE858L)
+#define CAMELLIA_SIGMA2R (0x4CAA73B2L)
+#define CAMELLIA_SIGMA3L (0xC6EF372FL)
+#define CAMELLIA_SIGMA3R (0xE94F82BEL)
+#define CAMELLIA_SIGMA4L (0x54FF53A5L)
+#define CAMELLIA_SIGMA4R (0xF1D36F1CL)
+#define CAMELLIA_SIGMA5L (0x10E527FAL)
+#define CAMELLIA_SIGMA5R (0xDE682D1DL)
+#define CAMELLIA_SIGMA6L (0xB05688C2L)
+#define CAMELLIA_SIGMA6R (0xB3E6C1FDL)
+
+/*
+ *  macros
+ */
+#define ROLDQ(ll, lr, rl, rr, w0, w1, bits) ({         \
+       w0 = ll;                                        \
+       ll = (ll << bits) + (lr >> (32 - bits));        \
+       lr = (lr << bits) + (rl >> (32 - bits));        \
+       rl = (rl << bits) + (rr >> (32 - bits));        \
+       rr = (rr << bits) + (w0 >> (32 - bits));        \
+})
+
+#define ROLDQo32(ll, lr, rl, rr, w0, w1, bits) ({      \
+       w0 = ll;                                        \
+       w1 = lr;                                        \
+       ll = (lr << (bits - 32)) + (rl >> (64 - bits)); \
+       lr = (rl << (bits - 32)) + (rr >> (64 - bits)); \
+       rl = (rr << (bits - 32)) + (w0 >> (64 - bits)); \
+       rr = (w0 << (bits - 32)) + (w1 >> (64 - bits)); \
+})
+
+#define CAMELLIA_F(xl, xr, kl, kr, yl, yr, il, ir, t0, t1) ({  \
+       il = xl ^ kl;                                           \
+       ir = xr ^ kr;                                           \
+       t0 = il >> 16;                                          \
+       t1 = ir >> 16;                                          \
+       yl = camellia_sp1110[(u8)(ir)]                          \
+          ^ camellia_sp0222[(u8)(t1 >> 8)]                     \
+          ^ camellia_sp3033[(u8)(t1)]                          \
+          ^ camellia_sp4404[(u8)(ir >> 8)];                    \
+       yr = camellia_sp1110[(u8)(t0 >> 8)]                     \
+          ^ camellia_sp0222[(u8)(t0)]                          \
+          ^ camellia_sp3033[(u8)(il >> 8)]                     \
+          ^ camellia_sp4404[(u8)(il)];                         \
+       yl ^= yr;                                               \
+       yr = ror32(yr, 8);                                      \
+       yr ^= yl;                                               \
+})
+
+#define SUBKEY_L(INDEX) (subkey[(INDEX)*2])
+#define SUBKEY_R(INDEX) (subkey[(INDEX)*2 + 1])
+
+static void camellia_setup_tail(u32 *subkey, u32 *subL, u32 *subR, int max)
+{
+       u32 dw, tl, tr;
+       u32 kw4l, kw4r;
+
+       /* absorb kw2 to other subkeys */
+       /* round 2 */
+       subL[3] ^= subL[1]; subR[3] ^= subR[1];
+       /* round 4 */
+       subL[5] ^= subL[1]; subR[5] ^= subR[1];
+       /* round 6 */
+       subL[7] ^= subL[1]; subR[7] ^= subR[1];
+       subL[1] ^= subR[1] & ~subR[9];
+       dw = subL[1] & subL[9],
+               subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl2) */
+       /* round 8 */
+       subL[11] ^= subL[1]; subR[11] ^= subR[1];
+       /* round 10 */
+       subL[13] ^= subL[1]; subR[13] ^= subR[1];
+       /* round 12 */
+       subL[15] ^= subL[1]; subR[15] ^= subR[1];
+       subL[1] ^= subR[1] & ~subR[17];
+       dw = subL[1] & subL[17],
+               subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl4) */
+       /* round 14 */
+       subL[19] ^= subL[1]; subR[19] ^= subR[1];
+       /* round 16 */
+       subL[21] ^= subL[1]; subR[21] ^= subR[1];
+       /* round 18 */
+       subL[23] ^= subL[1]; subR[23] ^= subR[1];
+       if (max == 24) {
+               /* kw3 */
+               subL[24] ^= subL[1]; subR[24] ^= subR[1];
+
+       /* absorb kw4 to other subkeys */
+               kw4l = subL[25]; kw4r = subR[25];
+       } else {
+               subL[1] ^= subR[1] & ~subR[25];
+               dw = subL[1] & subL[25],
+                       subR[1] ^= rol32(dw, 1); /* modified for FLinv(kl6) */
+               /* round 20 */
+               subL[27] ^= subL[1]; subR[27] ^= subR[1];
+               /* round 22 */
+               subL[29] ^= subL[1]; subR[29] ^= subR[1];
+               /* round 24 */
+               subL[31] ^= subL[1]; subR[31] ^= subR[1];
+               /* kw3 */
+               subL[32] ^= subL[1]; subR[32] ^= subR[1];
+
+       /* absorb kw4 to other subkeys */
+               kw4l = subL[33]; kw4r = subR[33];
+               /* round 23 */
+               subL[30] ^= kw4l; subR[30] ^= kw4r;
+               /* round 21 */
+               subL[28] ^= kw4l; subR[28] ^= kw4r;
+               /* round 19 */
+               subL[26] ^= kw4l; subR[26] ^= kw4r;
+               kw4l ^= kw4r & ~subR[24];
+               dw = kw4l & subL[24],
+                       kw4r ^= rol32(dw, 1); /* modified for FL(kl5) */
+       }
+       /* round 17 */
+       subL[22] ^= kw4l; subR[22] ^= kw4r;
+       /* round 15 */
+       subL[20] ^= kw4l; subR[20] ^= kw4r;
+       /* round 13 */
+       subL[18] ^= kw4l; subR[18] ^= kw4r;
+       kw4l ^= kw4r & ~subR[16];
+       dw = kw4l & subL[16],
+               kw4r ^= rol32(dw, 1); /* modified for FL(kl3) */
+       /* round 11 */
+       subL[14] ^= kw4l; subR[14] ^= kw4r;
+       /* round 9 */
+       subL[12] ^= kw4l; subR[12] ^= kw4r;
+       /* round 7 */
+       subL[10] ^= kw4l; subR[10] ^= kw4r;
+       kw4l ^= kw4r & ~subR[8];
+       dw = kw4l & subL[8],
+               kw4r ^= rol32(dw, 1); /* modified for FL(kl1) */
+       /* round 5 */
+       subL[6] ^= kw4l; subR[6] ^= kw4r;
+       /* round 3 */
+       subL[4] ^= kw4l; subR[4] ^= kw4r;
+       /* round 1 */
+       subL[2] ^= kw4l; subR[2] ^= kw4r;
+       /* kw1 */
+       subL[0] ^= kw4l; subR[0] ^= kw4r;
+
+       /* key XOR is end of F-function */
+       SUBKEY_L(0) = subL[0] ^ subL[2];/* kw1 */
+       SUBKEY_R(0) = subR[0] ^ subR[2];
+       SUBKEY_L(2) = subL[3];       /* round 1 */
+       SUBKEY_R(2) = subR[3];
+       SUBKEY_L(3) = subL[2] ^ subL[4]; /* round 2 */
+       SUBKEY_R(3) = subR[2] ^ subR[4];
+       SUBKEY_L(4) = subL[3] ^ subL[5]; /* round 3 */
+       SUBKEY_R(4) = subR[3] ^ subR[5];
+       SUBKEY_L(5) = subL[4] ^ subL[6]; /* round 4 */
+       SUBKEY_R(5) = subR[4] ^ subR[6];
+       SUBKEY_L(6) = subL[5] ^ subL[7]; /* round 5 */
+       SUBKEY_R(6) = subR[5] ^ subR[7];
+       tl = subL[10] ^ (subR[10] & ~subR[8]);
+       dw = tl & subL[8],  /* FL(kl1) */
+               tr = subR[10] ^ rol32(dw, 1);
+       SUBKEY_L(7) = subL[6] ^ tl; /* round 6 */
+       SUBKEY_R(7) = subR[6] ^ tr;
+       SUBKEY_L(8) = subL[8];       /* FL(kl1) */
+       SUBKEY_R(8) = subR[8];
+       SUBKEY_L(9) = subL[9];       /* FLinv(kl2) */
+       SUBKEY_R(9) = subR[9];
+       tl = subL[7] ^ (subR[7] & ~subR[9]);
+       dw = tl & subL[9],  /* FLinv(kl2) */
+               tr = subR[7] ^ rol32(dw, 1);
+       SUBKEY_L(10) = tl ^ subL[11]; /* round 7 */
+       SUBKEY_R(10) = tr ^ subR[11];
+       SUBKEY_L(11) = subL[10] ^ subL[12]; /* round 8 */
+       SUBKEY_R(11) = subR[10] ^ subR[12];
+       SUBKEY_L(12) = subL[11] ^ subL[13]; /* round 9 */
+       SUBKEY_R(12) = subR[11] ^ subR[13];
+       SUBKEY_L(13) = subL[12] ^ subL[14]; /* round 10 */
+       SUBKEY_R(13) = subR[12] ^ subR[14];
+       SUBKEY_L(14) = subL[13] ^ subL[15]; /* round 11 */
+       SUBKEY_R(14) = subR[13] ^ subR[15];
+       tl = subL[18] ^ (subR[18] & ~subR[16]);
+       dw = tl & subL[16], /* FL(kl3) */
+               tr = subR[18] ^ rol32(dw, 1);
+       SUBKEY_L(15) = subL[14] ^ tl; /* round 12 */
+       SUBKEY_R(15) = subR[14] ^ tr;
+       SUBKEY_L(16) = subL[16];     /* FL(kl3) */
+       SUBKEY_R(16) = subR[16];
+       SUBKEY_L(17) = subL[17];     /* FLinv(kl4) */
+       SUBKEY_R(17) = subR[17];
+       tl = subL[15] ^ (subR[15] & ~subR[17]);
+       dw = tl & subL[17], /* FLinv(kl4) */
+               tr = subR[15] ^ rol32(dw, 1);
+       SUBKEY_L(18) = tl ^ subL[19]; /* round 13 */
+       SUBKEY_R(18) = tr ^ subR[19];
+       SUBKEY_L(19) = subL[18] ^ subL[20]; /* round 14 */
+       SUBKEY_R(19) = subR[18] ^ subR[20];
+       SUBKEY_L(20) = subL[19] ^ subL[21]; /* round 15 */
+       SUBKEY_R(20) = subR[19] ^ subR[21];
+       SUBKEY_L(21) = subL[20] ^ subL[22]; /* round 16 */
+       SUBKEY_R(21) = subR[20] ^ subR[22];
+       SUBKEY_L(22) = subL[21] ^ subL[23]; /* round 17 */
+       SUBKEY_R(22) = subR[21] ^ subR[23];
+       if (max == 24) {
+               SUBKEY_L(23) = subL[22];     /* round 18 */
+               SUBKEY_R(23) = subR[22];
+               SUBKEY_L(24) = subL[24] ^ subL[23]; /* kw3 */
+               SUBKEY_R(24) = subR[24] ^ subR[23];
+       } else {
+               tl = subL[26] ^ (subR[26] & ~subR[24]);
+               dw = tl & subL[24], /* FL(kl5) */
+                       tr = subR[26] ^ rol32(dw, 1);
+               SUBKEY_L(23) = subL[22] ^ tl; /* round 18 */
+               SUBKEY_R(23) = subR[22] ^ tr;
+               SUBKEY_L(24) = subL[24];     /* FL(kl5) */
+               SUBKEY_R(24) = subR[24];
+               SUBKEY_L(25) = subL[25];     /* FLinv(kl6) */
+               SUBKEY_R(25) = subR[25];
+               tl = subL[23] ^ (subR[23] & ~subR[25]);
+               dw = tl & subL[25], /* FLinv(kl6) */
+                       tr = subR[23] ^ rol32(dw, 1);
+               SUBKEY_L(26) = tl ^ subL[27]; /* round 19 */
+               SUBKEY_R(26) = tr ^ subR[27];
+               SUBKEY_L(27) = subL[26] ^ subL[28]; /* round 20 */
+               SUBKEY_R(27) = subR[26] ^ subR[28];
+               SUBKEY_L(28) = subL[27] ^ subL[29]; /* round 21 */
+               SUBKEY_R(28) = subR[27] ^ subR[29];
+               SUBKEY_L(29) = subL[28] ^ subL[30]; /* round 22 */
+               SUBKEY_R(29) = subR[28] ^ subR[30];
+               SUBKEY_L(30) = subL[29] ^ subL[31]; /* round 23 */
+               SUBKEY_R(30) = subR[29] ^ subR[31];
+               SUBKEY_L(31) = subL[30];     /* round 24 */
+               SUBKEY_R(31) = subR[30];
+               SUBKEY_L(32) = subL[32] ^ subL[31]; /* kw3 */
+               SUBKEY_R(32) = subR[32] ^ subR[31];
+       }
+}
+
+static void camellia_setup128(const unsigned char *key, u32 *subkey)
+{
+       u32 kll, klr, krl, krr;
+       u32 il, ir, t0, t1, w0, w1;
+       u32 subL[26];
+       u32 subR[26];
+
+       /**
+        *  k == kll || klr || krl || krr (|| is concatenation)
+        */
+       kll = get_unaligned_be32(key);
+       klr = get_unaligned_be32(key + 4);
+       krl = get_unaligned_be32(key + 8);
+       krr = get_unaligned_be32(key + 12);
+
+       /* generate KL dependent subkeys */
+       /* kw1 */
+       subL[0] = kll; subR[0] = klr;
+       /* kw2 */
+       subL[1] = krl; subR[1] = krr;
+       /* rotation left shift 15bit */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* k3 */
+       subL[4] = kll; subR[4] = klr;
+       /* k4 */
+       subL[5] = krl; subR[5] = krr;
+       /* rotation left shift 15+30bit */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 30);
+       /* k7 */
+       subL[10] = kll; subR[10] = klr;
+       /* k8 */
+       subL[11] = krl; subR[11] = krr;
+       /* rotation left shift 15+30+15bit */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* k10 */
+       subL[13] = krl; subR[13] = krr;
+       /* rotation left shift 15+30+15+17 bit */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+       /* kl3 */
+       subL[16] = kll; subR[16] = klr;
+       /* kl4 */
+       subL[17] = krl; subR[17] = krr;
+       /* rotation left shift 15+30+15+17+17 bit */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+       /* k13 */
+       subL[18] = kll; subR[18] = klr;
+       /* k14 */
+       subL[19] = krl; subR[19] = krr;
+       /* rotation left shift 15+30+15+17+17+17 bit */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+       /* k17 */
+       subL[22] = kll; subR[22] = klr;
+       /* k18 */
+       subL[23] = krl; subR[23] = krr;
+
+       /* generate KA */
+       kll = subL[0]; klr = subR[0];
+       krl = subL[1]; krr = subR[1];
+       CAMELLIA_F(kll, klr,
+                  CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R,
+                  w0, w1, il, ir, t0, t1);
+       krl ^= w0; krr ^= w1;
+       CAMELLIA_F(krl, krr,
+                  CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R,
+                  kll, klr, il, ir, t0, t1);
+       /* current status == (kll, klr, w0, w1) */
+       CAMELLIA_F(kll, klr,
+                  CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R,
+                  krl, krr, il, ir, t0, t1);
+       krl ^= w0; krr ^= w1;
+       CAMELLIA_F(krl, krr,
+                  CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R,
+                  w0, w1, il, ir, t0, t1);
+       kll ^= w0; klr ^= w1;
+
+       /* generate KA dependent subkeys */
+       /* k1, k2 */
+       subL[2] = kll; subR[2] = klr;
+       subL[3] = krl; subR[3] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* k5,k6 */
+       subL[6] = kll; subR[6] = klr;
+       subL[7] = krl; subR[7] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* kl1, kl2 */
+       subL[8] = kll; subR[8] = klr;
+       subL[9] = krl; subR[9] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* k9 */
+       subL[12] = kll; subR[12] = klr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* k11, k12 */
+       subL[14] = kll; subR[14] = klr;
+       subL[15] = krl; subR[15] = krr;
+       ROLDQo32(kll, klr, krl, krr, w0, w1, 34);
+       /* k15, k16 */
+       subL[20] = kll; subR[20] = klr;
+       subL[21] = krl; subR[21] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+       /* kw3, kw4 */
+       subL[24] = kll; subR[24] = klr;
+       subL[25] = krl; subR[25] = krr;
+
+       camellia_setup_tail(subkey, subL, subR, 24);
+}
+
+static void camellia_setup256(const unsigned char *key, u32 *subkey)
+{
+       u32 kll, klr, krl, krr;        /* left half of key */
+       u32 krll, krlr, krrl, krrr;    /* right half of key */
+       u32 il, ir, t0, t1, w0, w1;    /* temporary variables */
+       u32 subL[34];
+       u32 subR[34];
+
+       /**
+        *  key = (kll || klr || krl || krr || krll || krlr || krrl || krrr)
+        *  (|| is concatenation)
+        */
+       kll = get_unaligned_be32(key);
+       klr = get_unaligned_be32(key + 4);
+       krl = get_unaligned_be32(key + 8);
+       krr = get_unaligned_be32(key + 12);
+       krll = get_unaligned_be32(key + 16);
+       krlr = get_unaligned_be32(key + 20);
+       krrl = get_unaligned_be32(key + 24);
+       krrr = get_unaligned_be32(key + 28);
+
+       /* generate KL dependent subkeys */
+       /* kw1 */
+       subL[0] = kll; subR[0] = klr;
+       /* kw2 */
+       subL[1] = krl; subR[1] = krr;
+       ROLDQo32(kll, klr, krl, krr, w0, w1, 45);
+       /* k9 */
+       subL[12] = kll; subR[12] = klr;
+       /* k10 */
+       subL[13] = krl; subR[13] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* kl3 */
+       subL[16] = kll; subR[16] = klr;
+       /* kl4 */
+       subL[17] = krl; subR[17] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 17);
+       /* k17 */
+       subL[22] = kll; subR[22] = klr;
+       /* k18 */
+       subL[23] = krl; subR[23] = krr;
+       ROLDQo32(kll, klr, krl, krr, w0, w1, 34);
+       /* k23 */
+       subL[30] = kll; subR[30] = klr;
+       /* k24 */
+       subL[31] = krl; subR[31] = krr;
+
+       /* generate KR dependent subkeys */
+       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15);
+       /* k3 */
+       subL[4] = krll; subR[4] = krlr;
+       /* k4 */
+       subL[5] = krrl; subR[5] = krrr;
+       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 15);
+       /* kl1 */
+       subL[8] = krll; subR[8] = krlr;
+       /* kl2 */
+       subL[9] = krrl; subR[9] = krrr;
+       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
+       /* k13 */
+       subL[18] = krll; subR[18] = krlr;
+       /* k14 */
+       subL[19] = krrl; subR[19] = krrr;
+       ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34);
+       /* k19 */
+       subL[26] = krll; subR[26] = krlr;
+       /* k20 */
+       subL[27] = krrl; subR[27] = krrr;
+       ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 34);
+
+       /* generate KA */
+       kll = subL[0] ^ krll; klr = subR[0] ^ krlr;
+       krl = subL[1] ^ krrl; krr = subR[1] ^ krrr;
+       CAMELLIA_F(kll, klr,
+                  CAMELLIA_SIGMA1L, CAMELLIA_SIGMA1R,
+                  w0, w1, il, ir, t0, t1);
+       krl ^= w0; krr ^= w1;
+       CAMELLIA_F(krl, krr,
+                  CAMELLIA_SIGMA2L, CAMELLIA_SIGMA2R,
+                  kll, klr, il, ir, t0, t1);
+       kll ^= krll; klr ^= krlr;
+       CAMELLIA_F(kll, klr,
+                  CAMELLIA_SIGMA3L, CAMELLIA_SIGMA3R,
+                  krl, krr, il, ir, t0, t1);
+       krl ^= w0 ^ krrl; krr ^= w1 ^ krrr;
+       CAMELLIA_F(krl, krr,
+                  CAMELLIA_SIGMA4L, CAMELLIA_SIGMA4R,
+                  w0, w1, il, ir, t0, t1);
+       kll ^= w0; klr ^= w1;
+
+       /* generate KB */
+       krll ^= kll; krlr ^= klr;
+       krrl ^= krl; krrr ^= krr;
+       CAMELLIA_F(krll, krlr,
+                  CAMELLIA_SIGMA5L, CAMELLIA_SIGMA5R,
+                  w0, w1, il, ir, t0, t1);
+       krrl ^= w0; krrr ^= w1;
+       CAMELLIA_F(krrl, krrr,
+                  CAMELLIA_SIGMA6L, CAMELLIA_SIGMA6R,
+                  w0, w1, il, ir, t0, t1);
+       krll ^= w0; krlr ^= w1;
+
+       /* generate KA dependent subkeys */
+       ROLDQ(kll, klr, krl, krr, w0, w1, 15);
+       /* k5 */
+       subL[6] = kll; subR[6] = klr;
+       /* k6 */
+       subL[7] = krl; subR[7] = krr;
+       ROLDQ(kll, klr, krl, krr, w0, w1, 30);
+       /* k11 */
+       subL[14] = kll; subR[14] = klr;
+       /* k12 */
+       subL[15] = krl; subR[15] = krr;
+       /* rotation left shift 32bit */
+       /* kl5 */
+       subL[24] = klr; subR[24] = krl;
+       /* kl6 */
+       subL[25] = krr; subR[25] = kll;
+       /* rotation left shift 49 from k11,k12 -> k21,k22 */
+       ROLDQo32(kll, klr, krl, krr, w0, w1, 49);
+       /* k21 */
+       subL[28] = kll; subR[28] = klr;
+       /* k22 */
+       subL[29] = krl; subR[29] = krr;
+
+       /* generate KB dependent subkeys */
+       /* k1 */
+       subL[2] = krll; subR[2] = krlr;
+       /* k2 */
+       subL[3] = krrl; subR[3] = krrr;
+       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
+       /* k7 */
+       subL[10] = krll; subR[10] = krlr;
+       /* k8 */
+       subL[11] = krrl; subR[11] = krrr;
+       ROLDQ(krll, krlr, krrl, krrr, w0, w1, 30);
+       /* k15 */
+       subL[20] = krll; subR[20] = krlr;
+       /* k16 */
+       subL[21] = krrl; subR[21] = krrr;
+       ROLDQo32(krll, krlr, krrl, krrr, w0, w1, 51);
+       /* kw3 */
+       subL[32] = krll; subR[32] = krlr;
+       /* kw4 */
+       subL[33] = krrl; subR[33] = krrr;
+
+       camellia_setup_tail(subkey, subL, subR, 32);
+}
+
+static void camellia_setup192(const unsigned char *key, u32 *subkey)
+{
+       unsigned char kk[32];
+       u32 krll, krlr, krrl, krrr;
+
+       memcpy(kk, key, 24);
+       memcpy((unsigned char *)&krll, key+16, 4);
+       memcpy((unsigned char *)&krlr, key+20, 4);
+       krrl = ~krll;
+       krrr = ~krlr;
+       memcpy(kk+24, (unsigned char *)&krrl, 4);
+       memcpy(kk+28, (unsigned char *)&krrr, 4);
+       camellia_setup256(kk, subkey);
+}
+
+
+/*
+ * Encrypt/decrypt
+ */
+#define CAMELLIA_FLS(ll, lr, rl, rr, kll, klr, krl, krr, t0, t1, t2, t3) ({ \
+       t0 = kll;                                                       \
+       t2 = krr;                                                       \
+       t0 &= ll;                                                       \
+       t2 |= rr;                                                       \
+       rl ^= t2;                                                       \
+       lr ^= rol32(t0, 1);                                             \
+       t3 = krl;                                                       \
+       t1 = klr;                                                       \
+       t3 &= rl;                                                       \
+       t1 |= lr;                                                       \
+       ll ^= t1;                                                       \
+       rr ^= rol32(t3, 1);                                             \
+})
+
+#define CAMELLIA_ROUNDSM(xl, xr, kl, kr, yl, yr, il, ir) ({            \
+       yl ^= kl;                                                       \
+       yr ^= kr;                                                       \
+       ir =  camellia_sp1110[(u8)xr];                                  \
+       il =  camellia_sp1110[(u8)(xl >> 24)];                          \
+       ir ^= camellia_sp0222[(u8)(xr >> 24)];                          \
+       il ^= camellia_sp0222[(u8)(xl >> 16)];                          \
+       ir ^= camellia_sp3033[(u8)(xr >> 16)];                          \
+       il ^= camellia_sp3033[(u8)(xl >> 8)];                           \
+       ir ^= camellia_sp4404[(u8)(xr >> 8)];                           \
+       il ^= camellia_sp4404[(u8)xl];                                  \
+       ir ^= il;                                                       \
+       yl ^= ir;                                                       \
+       yr ^= ror32(il, 8) ^ ir;                                        \
+})
+
+/* max = 24: 128bit encrypt, max = 32: 256bit encrypt */
+static void camellia_do_encrypt(const u32 *subkey, u32 *io, unsigned max)
+{
+       u32 il, ir, t0, t1;            /* temporary variables */
+
+       /* pre whitening but absorb kw2 */
+       io[0] ^= SUBKEY_L(0);
+       io[1] ^= SUBKEY_R(0);
+
+       /* main iteration */
+#define ROUNDS(i) ({ \
+       CAMELLIA_ROUNDSM(io[0], io[1], \
+                        SUBKEY_L(i + 2), SUBKEY_R(i + 2), \
+                        io[2], io[3], il, ir); \
+       CAMELLIA_ROUNDSM(io[2], io[3], \
+                        SUBKEY_L(i + 3), SUBKEY_R(i + 3), \
+                        io[0], io[1], il, ir); \
+       CAMELLIA_ROUNDSM(io[0], io[1], \
+                        SUBKEY_L(i + 4), SUBKEY_R(i + 4), \
+                        io[2], io[3], il, ir); \
+       CAMELLIA_ROUNDSM(io[2], io[3], \
+                        SUBKEY_L(i + 5), SUBKEY_R(i + 5), \
+                        io[0], io[1], il, ir); \
+       CAMELLIA_ROUNDSM(io[0], io[1], \
+                        SUBKEY_L(i + 6), SUBKEY_R(i + 6), \
+                        io[2], io[3], il, ir); \
+       CAMELLIA_ROUNDSM(io[2], io[3], \
+                        SUBKEY_L(i + 7), SUBKEY_R(i + 7), \
+                        io[0], io[1], il, ir); \
+})
+#define FLS(i) ({ \
+       CAMELLIA_FLS(io[0], io[1], io[2], io[3], \
+                    SUBKEY_L(i + 0), SUBKEY_R(i + 0), \
+                    SUBKEY_L(i + 1), SUBKEY_R(i + 1), \
+                    t0, t1, il, ir); \
+})
+
+       ROUNDS(0);
+       FLS(8);
+       ROUNDS(8);
+       FLS(16);
+       ROUNDS(16);
+       if (max == 32) {
+               FLS(24);
+               ROUNDS(24);
+       }
+
+#undef ROUNDS
+#undef FLS
+
+       /* post whitening but kw4 */
+       io[2] ^= SUBKEY_L(max);
+       io[3] ^= SUBKEY_R(max);
+       /* NB: io[0],[1] should be swapped with [2],[3] by caller! */
+}
+
+static void camellia_do_decrypt(const u32 *subkey, u32 *io, unsigned i)
+{
+       u32 il, ir, t0, t1;            /* temporary variables */
+
+       /* pre whitening but absorb kw2 */
+       io[0] ^= SUBKEY_L(i);
+       io[1] ^= SUBKEY_R(i);
+
+       /* main iteration */
+#define ROUNDS(i) ({ \
+       CAMELLIA_ROUNDSM(io[0], io[1], \
+                        SUBKEY_L(i + 7), SUBKEY_R(i + 7), \
+                        io[2], io[3], il, ir); \
+       CAMELLIA_ROUNDSM(io[2], io[3], \
+                        SUBKEY_L(i + 6), SUBKEY_R(i + 6), \
+                        io[0], io[1], il, ir); \
+       CAMELLIA_ROUNDSM(io[0], io[1], \
+                        SUBKEY_L(i + 5), SUBKEY_R(i + 5), \
+                        io[2], io[3], il, ir); \
+       CAMELLIA_ROUNDSM(io[2], io[3], \
+                        SUBKEY_L(i + 4), SUBKEY_R(i + 4), \
+                        io[0], io[1], il, ir); \
+       CAMELLIA_ROUNDSM(io[0], io[1], \
+                        SUBKEY_L(i + 3), SUBKEY_R(i + 3), \
+                        io[2], io[3], il, ir); \
+       CAMELLIA_ROUNDSM(io[2], io[3], \
+                        SUBKEY_L(i + 2), SUBKEY_R(i + 2), \
+                        io[0], io[1], il, ir); \
+})
+#define FLS(i) ({ \
+       CAMELLIA_FLS(io[0], io[1], io[2], io[3], \
+                    SUBKEY_L(i + 1), SUBKEY_R(i + 1), \
+                    SUBKEY_L(i + 0), SUBKEY_R(i + 0), \
+                    t0, t1, il, ir); \
+})
+
+       if (i == 32) {
+               ROUNDS(24);
+               FLS(24);
+       }
+       ROUNDS(16);
+       FLS(16);
+       ROUNDS(8);
+       FLS(8);
+       ROUNDS(0);
+
+#undef ROUNDS
+#undef FLS
+
+       /* post whitening but kw4 */
+       io[2] ^= SUBKEY_L(0);
+       io[3] ^= SUBKEY_R(0);
+       /* NB: 0,1 should be swapped with 2,3 by caller! */
+}
+
+
+struct camellia_ctx {
+       int key_length;
+       u32 key_table[CAMELLIA_TABLE_BYTE_LEN / sizeof(u32)];
+};
+
+static int
+camellia_set_key(struct crypto_tfm *tfm, const u8 *in_key,
+                unsigned int key_len)
+{
+       struct camellia_ctx *cctx = crypto_tfm_ctx(tfm);
+       const unsigned char *key = (const unsigned char *)in_key;
+       u32 *flags = &tfm->crt_flags;
+
+       if (key_len != 16 && key_len != 24 && key_len != 32) {
+               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+               return -EINVAL;
+       }
+
+       cctx->key_length = key_len;
+
+       switch (key_len) {
+       case 16:
+               camellia_setup128(key, cctx->key_table);
+               break;
+       case 24:
+               camellia_setup192(key, cctx->key_table);
+               break;
+       case 32:
+               camellia_setup256(key, cctx->key_table);
+               break;
+       }
+
+       return 0;
+}
+
+static void camellia_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+{
+       const struct camellia_ctx *cctx = crypto_tfm_ctx(tfm);
+       const __be32 *src = (const __be32 *)in;
+       __be32 *dst = (__be32 *)out;
+       unsigned int max;
+
+       u32 tmp[4];
+
+       tmp[0] = be32_to_cpu(src[0]);
+       tmp[1] = be32_to_cpu(src[1]);
+       tmp[2] = be32_to_cpu(src[2]);
+       tmp[3] = be32_to_cpu(src[3]);
+
+       if (cctx->key_length == 16)
+               max = 24;
+       else
+               max = 32; /* for key lengths of 24 and 32 */
+
+       camellia_do_encrypt(cctx->key_table, tmp, max);
+
+       /* do_encrypt returns 0,1 swapped with 2,3 */
+       dst[0] = cpu_to_be32(tmp[2]);
+       dst[1] = cpu_to_be32(tmp[3]);
+       dst[2] = cpu_to_be32(tmp[0]);
+       dst[3] = cpu_to_be32(tmp[1]);
+}
+
+static void camellia_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
+{
+       const struct camellia_ctx *cctx = crypto_tfm_ctx(tfm);
+       const __be32 *src = (const __be32 *)in;
+       __be32 *dst = (__be32 *)out;
+       unsigned int max;
+
+       u32 tmp[4];
+
+       tmp[0] = be32_to_cpu(src[0]);
+       tmp[1] = be32_to_cpu(src[1]);
+       tmp[2] = be32_to_cpu(src[2]);
+       tmp[3] = be32_to_cpu(src[3]);
+
+       if (cctx->key_length == 16)
+               max = 24;
+       else
+               max = 32; /* for key lengths of 24 and 32 */
+
+       camellia_do_decrypt(cctx->key_table, tmp, max);
+
+       /* do_decrypt returns 0,1 swapped with 2,3 */
+       dst[0] = cpu_to_be32(tmp[2]);
+       dst[1] = cpu_to_be32(tmp[3]);
+       dst[2] = cpu_to_be32(tmp[0]);
+       dst[3] = cpu_to_be32(tmp[1]);
+}
+
+static struct crypto_alg camellia_alg = {
+       .cra_name               =       "camellia",
+       .cra_driver_name        =       "camellia-generic",
+       .cra_priority           =       100,
+       .cra_flags              =       CRYPTO_ALG_TYPE_CIPHER,
+       .cra_blocksize          =       CAMELLIA_BLOCK_SIZE,
+       .cra_ctxsize            =       sizeof(struct camellia_ctx),
+       .cra_alignmask          =       3,
+       .cra_module             =       THIS_MODULE,
+       .cra_list               =       LIST_HEAD_INIT(camellia_alg.cra_list),
+       .cra_u                  =       {
+               .cipher = {
+                       .cia_min_keysize        =       CAMELLIA_MIN_KEY_SIZE,
+                       .cia_max_keysize        =       CAMELLIA_MAX_KEY_SIZE,
+                       .cia_setkey             =       camellia_set_key,
+                       .cia_encrypt            =       camellia_encrypt,
+                       .cia_decrypt            =       camellia_decrypt
+               }
+       }
+};
+
+static int __init camellia_init(void)
+{
+       return crypto_register_alg(&camellia_alg);
+}
+
+static void __exit camellia_fini(void)
+{
+       crypto_unregister_alg(&camellia_alg);
+}
+
+module_init(camellia_init);
+module_exit(camellia_fini);
+
+MODULE_DESCRIPTION("Camellia Cipher Algorithm");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("camellia");
index b6ac138..f76e42b 100644 (file)
@@ -304,7 +304,7 @@ static int crypto_del_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
 static int crypto_add_alg(struct sk_buff *skb, struct nlmsghdr *nlh,
                          struct nlattr **attrs)
 {
-       int exact;
+       int exact = 0;
        const char *name;
        struct crypto_alg *alg;
        struct crypto_user_alg *p = nlmsg_data(nlh);
index 7736a9f..8f147bf 100644 (file)
@@ -1297,6 +1297,18 @@ static int do_test(int m)
                                speed_template_16_24_32);
                test_cipher_speed("cbc(camellia)", DECRYPT, sec, NULL, 0,
                                speed_template_16_24_32);
+               test_cipher_speed("ctr(camellia)", ENCRYPT, sec, NULL, 0,
+                               speed_template_16_24_32);
+               test_cipher_speed("ctr(camellia)", DECRYPT, sec, NULL, 0,
+                               speed_template_16_24_32);
+               test_cipher_speed("lrw(camellia)", ENCRYPT, sec, NULL, 0,
+                               speed_template_32_40_48);
+               test_cipher_speed("lrw(camellia)", DECRYPT, sec, NULL, 0,
+                               speed_template_32_40_48);
+               test_cipher_speed("xts(camellia)", ENCRYPT, sec, NULL, 0,
+                               speed_template_32_48_64);
+               test_cipher_speed("xts(camellia)", DECRYPT, sec, NULL, 0,
+                               speed_template_32_48_64);
                break;
 
        case 206:
index bb54b88..5674878 100644 (file)
@@ -1846,6 +1846,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                        }
                }
        }, {
+               .alg = "ctr(camellia)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = camellia_ctr_enc_tv_template,
+                                       .count = CAMELLIA_CTR_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = camellia_ctr_dec_tv_template,
+                                       .count = CAMELLIA_CTR_DEC_TEST_VECTORS
+                               }
+                       }
+               }
+       }, {
                .alg = "ctr(serpent)",
                .test = alg_test_skcipher,
                .suite = {
@@ -2297,6 +2312,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                        }
                }
        }, {
+               .alg = "lrw(camellia)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = camellia_lrw_enc_tv_template,
+                                       .count = CAMELLIA_LRW_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = camellia_lrw_dec_tv_template,
+                                       .count = CAMELLIA_LRW_DEC_TEST_VECTORS
+                               }
+                       }
+               }
+       }, {
                .alg = "lrw(serpent)",
                .test = alg_test_skcipher,
                .suite = {
@@ -2634,6 +2664,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                        }
                }
        }, {
+               .alg = "xts(camellia)",
+               .test = alg_test_skcipher,
+               .suite = {
+                       .cipher = {
+                               .enc = {
+                                       .vecs = camellia_xts_enc_tv_template,
+                                       .count = CAMELLIA_XTS_ENC_TEST_VECTORS
+                               },
+                               .dec = {
+                                       .vecs = camellia_xts_dec_tv_template,
+                                       .count = CAMELLIA_XTS_DEC_TEST_VECTORS
+                               }
+                       }
+               }
+       }, {
                .alg = "xts(serpent)",
                .test = alg_test_skcipher,
                .suite = {
index 43e84d3..36e5a8e 100644 (file)
@@ -11332,10 +11332,16 @@ static struct cipher_testvec fcrypt_pcbc_dec_tv_template[] = {
 /*
  * CAMELLIA test vectors.
  */
-#define CAMELLIA_ENC_TEST_VECTORS 3
-#define CAMELLIA_DEC_TEST_VECTORS 3
-#define CAMELLIA_CBC_ENC_TEST_VECTORS 2
-#define CAMELLIA_CBC_DEC_TEST_VECTORS 2
+#define CAMELLIA_ENC_TEST_VECTORS 4
+#define CAMELLIA_DEC_TEST_VECTORS 4
+#define CAMELLIA_CBC_ENC_TEST_VECTORS 3
+#define CAMELLIA_CBC_DEC_TEST_VECTORS 3
+#define CAMELLIA_CTR_ENC_TEST_VECTORS 2
+#define CAMELLIA_CTR_DEC_TEST_VECTORS 2
+#define CAMELLIA_LRW_ENC_TEST_VECTORS 8
+#define CAMELLIA_LRW_DEC_TEST_VECTORS 8
+#define CAMELLIA_XTS_ENC_TEST_VECTORS 5
+#define CAMELLIA_XTS_DEC_TEST_VECTORS 5
 
 static struct cipher_testvec camellia_enc_tv_template[] = {
        {
@@ -11372,6 +11378,27 @@ static struct cipher_testvec camellia_enc_tv_template[] = {
                          "\x20\xef\x7c\x91\x9e\x3a\x75\x09",
                .rlen   = 16,
        },
+       { /* Generated with Crypto++ */
+               .key    = "\x3F\x85\x62\x3F\x1C\xF9\xD6\x1C"
+                         "\xF9\xD6\xB3\x90\x6D\x4A\x90\x6D"
+                         "\x4A\x27\x04\xE1\x27\x04\xE1\xBE"
+                         "\x9B\x78\xBE\x9B\x78\x55\x32\x0F",
+               .klen   = 32,
+               .input  = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48",
+               .ilen   = 48,
+               .result = "\xED\xCD\xDB\xB8\x68\xCE\xBD\xEA"
+                         "\x9D\x9D\xCD\x9F\x4F\xFC\x4D\xB7"
+                         "\xA5\xFF\x6F\x43\x0F\xBA\x32\x04"
+                         "\xB3\xC2\xB9\x03\xAA\x91\x56\x29"
+                         "\x0D\xD0\xFD\xC4\x65\xA5\x69\xB9"
+                         "\xF1\xF6\xB1\xA5\xB2\x75\x4F\x8A",
+               .rlen   = 48,
+       },
 };
 
 static struct cipher_testvec camellia_dec_tv_template[] = {
@@ -11409,6 +11436,27 @@ static struct cipher_testvec camellia_dec_tv_template[] = {
                          "\xfe\xdc\xba\x98\x76\x54\x32\x10",
                .rlen   = 16,
        },
+       { /* Generated with Crypto++ */
+               .key    = "\x3F\x85\x62\x3F\x1C\xF9\xD6\x1C"
+                         "\xF9\xD6\xB3\x90\x6D\x4A\x90\x6D"
+                         "\x4A\x27\x04\xE1\x27\x04\xE1\xBE"
+                         "\x9B\x78\xBE\x9B\x78\x55\x32\x0F",
+               .klen   = 32,
+               .input  = "\xED\xCD\xDB\xB8\x68\xCE\xBD\xEA"
+                         "\x9D\x9D\xCD\x9F\x4F\xFC\x4D\xB7"
+                         "\xA5\xFF\x6F\x43\x0F\xBA\x32\x04"
+                         "\xB3\xC2\xB9\x03\xAA\x91\x56\x29"
+                         "\x0D\xD0\xFD\xC4\x65\xA5\x69\xB9"
+                         "\xF1\xF6\xB1\xA5\xB2\x75\x4F\x8A",
+               .ilen   = 48,
+               .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48",
+               .rlen   = 48,
+       },
 };
 
 static struct cipher_testvec camellia_cbc_enc_tv_template[] = {
@@ -11440,6 +11488,29 @@ static struct cipher_testvec camellia_cbc_enc_tv_template[] = {
                          "\x15\x78\xe0\x5e\xf2\xcb\x87\x16",
                .rlen   = 32,
        },
+       { /* Generated with Crypto++ */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48",
+               .ilen   = 48,
+               .result = "\xCD\x3E\x2A\x3B\x3E\x94\xC5\x77"
+                         "\xBA\xBB\x5B\xB1\xDE\x7B\xA4\x40"
+                         "\x88\x39\xE3\xFD\x94\x4B\x25\x58"
+                         "\xE1\x4B\xC4\x18\x7A\xFD\x17\x2B"
+                         "\xB9\xF9\xC2\x27\x6A\xB6\x31\x27"
+                         "\xA6\xAD\xEF\xE5\x5D\xE4\x02\x01",
+               .rlen   = 48,
+       },
 };
 
 static struct cipher_testvec camellia_cbc_dec_tv_template[] = {
@@ -11471,6 +11542,1310 @@ static struct cipher_testvec camellia_cbc_dec_tv_template[] = {
                          "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
                .rlen   = 32,
        },
+       { /* Generated with Crypto++ */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\xCD\x3E\x2A\x3B\x3E\x94\xC5\x77"
+                         "\xBA\xBB\x5B\xB1\xDE\x7B\xA4\x40"
+                         "\x88\x39\xE3\xFD\x94\x4B\x25\x58"
+                         "\xE1\x4B\xC4\x18\x7A\xFD\x17\x2B"
+                         "\xB9\xF9\xC2\x27\x6A\xB6\x31\x27"
+                         "\xA6\xAD\xEF\xE5\x5D\xE4\x02\x01",
+               .ilen   = 48,
+               .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48",
+               .rlen   = 48,
+       },
+};
+
+static struct cipher_testvec camellia_ctr_enc_tv_template[] = {
+       { /* Generated with Crypto++ */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48",
+               .ilen   = 48,
+               .result = "\xF3\x06\x3A\x84\xCD\xBA\x8E\x11"
+                         "\xB7\x74\x6F\x5C\x97\xFB\x36\xFE"
+                         "\xDE\x71\x58\xD4\x15\xD1\xC1\xA4"
+                         "\xC9\x28\x74\xA6\x6B\xC7\x95\xA6"
+                         "\x6C\x77\xF7\x2F\xDF\xC7\xBB\x85"
+                         "\x60\xFC\xE8\x94\xE8\xB5\x09\x2C",
+               .rlen   = 48,
+       },
+       { /* Generated with Crypto++ */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
+                         "\xDF\x76\x0D",
+               .ilen   = 51,
+               .result = "\xF3\x06\x3A\x84\xCD\xBA\x8E\x11"
+                         "\xB7\x74\x6F\x5C\x97\xFB\x36\xFE"
+                         "\xDE\x71\x58\xD4\x15\xD1\xC1\xA4"
+                         "\xC9\x28\x74\xA6\x6B\xC7\x95\xA6"
+                         "\x6C\x77\xF7\x2F\xDF\xC7\xBB\x85"
+                         "\x60\xFC\xE8\x94\xE8\xB5\x09\x2C"
+                         "\x1E\x43\xEF",
+               .rlen   = 51,
+       },
+};
+
+static struct cipher_testvec camellia_ctr_dec_tv_template[] = {
+       { /* Generated with Crypto++ */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\xF3\x06\x3A\x84\xCD\xBA\x8E\x11"
+                         "\xB7\x74\x6F\x5C\x97\xFB\x36\xFE"
+                         "\xDE\x71\x58\xD4\x15\xD1\xC1\xA4"
+                         "\xC9\x28\x74\xA6\x6B\xC7\x95\xA6"
+                         "\x6C\x77\xF7\x2F\xDF\xC7\xBB\x85"
+                         "\x60\xFC\xE8\x94\xE8\xB5\x09\x2C",
+               .ilen   = 48,
+               .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48",
+               .rlen   = 48,
+       },
+       { /* Generated with Crypto++ */
+               .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
+                         "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
+                         "\x27\x04\xE1\x27\x04\xE1\xBE\x9B"
+                         "\x78\xBE\x9B\x78\x55\x32\x0F\x55",
+               .klen   = 32,
+               .iv     = "\xE2\x24\x89\xEE\x53\xB8\x1D\x5F"
+                         "\xC4\x29\x8E\xF3\x35\x9A\xFF\x64",
+               .input  = "\xF3\x06\x3A\x84\xCD\xBA\x8E\x11"
+                         "\xB7\x74\x6F\x5C\x97\xFB\x36\xFE"
+                         "\xDE\x71\x58\xD4\x15\xD1\xC1\xA4"
+                         "\xC9\x28\x74\xA6\x6B\xC7\x95\xA6"
+                         "\x6C\x77\xF7\x2F\xDF\xC7\xBB\x85"
+                         "\x60\xFC\xE8\x94\xE8\xB5\x09\x2C"
+                         "\x1E\x43\xEF",
+               .ilen   = 51,
+               .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
+                         "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
+                         "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
+                         "\xAC\x20\xB7\x4E\xE5\x59\xF0\x87"
+                         "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
+                         "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
+                         "\xDF\x76\x0D",
+               .rlen   = 51,
+       },
+
+};
+
+static struct cipher_testvec camellia_lrw_enc_tv_template[] = {
+       /* Generated from AES-LRW test vectors */
+       {
+               .key    = "\x45\x62\xac\x25\xf8\x28\x17\x6d"
+                         "\x4c\x26\x84\x14\xb5\x68\x01\x85"
+                         "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"
+                         "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x92\x68\x19\xd7\xb7\x5b\x0a\x31"
+                         "\x97\xcc\x72\xbe\x99\x17\xeb\x3e",
+               .rlen   = 16,
+       }, {
+               .key    = "\x59\x70\x47\x14\xf5\x57\x47\x8c"
+                         "\xd7\x79\xe8\x0f\x54\x88\x79\x44"
+                         "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"
+                         "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x02",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x73\x09\xb7\x50\xb6\x77\x30\x50"
+                         "\x5c\x8a\x9c\x26\x77\x9d\xfc\x4a",
+               .rlen   = 16,
+       }, {
+               .key    = "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"
+                         "\x30\xfe\x69\xe2\x37\x7f\x98\x47"
+                         "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"
+                         "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x02\x00\x00\x00\x00",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x90\xae\x83\xe0\x22\xb9\x60\x91"
+                         "\xfa\xa9\xb7\x98\xe3\xed\x87\x01",
+               .rlen   = 16,
+       }, {
+               .key    = "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"
+                         "\x25\x83\xf7\x3c\x1f\x01\x28\x74"
+                         "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"
+                         "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"
+                         "\xad\xe4\x94\xc5\x4a\x29\xae\x70",
+               .klen   = 40,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x99\xe9\x6e\xd4\xc9\x21\xa5\xf0"
+                         "\xd8\x83\xef\xd9\x07\x16\x5f\x35",
+               .rlen   = 16,
+       }, {
+               .key    = "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"
+                         "\xf8\x86\xce\xac\x93\xc5\xad\xc6"
+                         "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"
+                         "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"
+                         "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",
+               .klen   = 40,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x02\x00\x00\x00\x00",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x42\x88\xf4\xcb\x21\x11\x6d\x8e"
+                         "\xde\x1a\xf2\x29\xf1\x4a\xe0\x15",
+               .rlen   = 16,
+       }, {
+               .key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"
+                         "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"
+                         "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"
+                         "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"
+                         "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"
+                         "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",
+               .klen   = 48,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x40\xaa\x34\x86\x4a\x8f\x78\xb9"
+                         "\xdb\xdb\x0f\x3d\x48\x70\xbe\x8d",
+               .rlen   = 16,
+       }, {
+               .key    = "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"
+                         "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"
+                         "\xb2\xfb\x64\xce\x60\x97\x87\x8d"
+                         "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"
+                         "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"
+                         "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",
+               .klen   = 48,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x02\x00\x00\x00\x00",
+               .input  = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .ilen   = 16,
+               .result = "\x04\xab\x28\x37\x31\x7a\x26\xab"
+                         "\xa1\x70\x1b\x9c\xe7\xdd\x83\xff",
+               .rlen   = 16,
+       }, {
+               .key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"
+                         "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"
+                         "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"
+                         "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"
+                         "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"
+                         "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",
+               .klen   = 48,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x05\x11\xb7\x18\xab\xc6\x2d\xac"
+                         "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"
+                         "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"
+                         "\x50\x38\x1f\x71\x49\xb6\x57\xd6"
+                         "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"
+                         "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"
+                         "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"
+                         "\xda\x10\x8e\xed\xa2\xa4\x87\xab"
+                         "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"
+                         "\xc9\xac\x42\x31\x95\x7c\xc9\x04"
+                         "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"
+                         "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"
+                         "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"
+                         "\x4c\x96\x12\xed\x7c\x92\x03\x01"
+                         "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"
+                         "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"
+                         "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"
+                         "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"
+                         "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"
+                         "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"
+                         "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"
+                         "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"
+                         "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"
+                         "\x76\x12\x73\x44\x1a\x56\xd7\x72"
+                         "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"
+                         "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"
+                         "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"
+                         "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"
+                         "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"
+                         "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"
+                         "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"
+                         "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"
+                         "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"
+                         "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"
+                         "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"
+                         "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"
+                         "\x8d\x23\x31\x74\x84\xeb\x88\x6e"
+                         "\xcc\xb9\xbc\x22\x83\x19\x07\x22"
+                         "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"
+                         "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"
+                         "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"
+                         "\x3c\xce\x8f\x42\x60\x71\xa7\x75"
+                         "\x08\x40\x65\x8a\x82\xbf\xf5\x43"
+                         "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"
+                         "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"
+                         "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"
+                         "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"
+                         "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"
+                         "\x62\x73\x65\xfd\x46\x63\x25\x3d"
+                         "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"
+                         "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"
+                         "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"
+                         "\xc5\x68\x77\x84\x32\x2b\xcc\x85"
+                         "\x74\x96\xf0\x12\x77\x61\xb9\xeb"
+                         "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"
+                         "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"
+                         "\xda\x39\x87\x45\xc0\x2b\xbb\x01"
+                         "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"
+                         "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"
+                         "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"
+                         "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"
+                         "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"
+                         "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"
+                         "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
+               .ilen   = 512,
+               .result = "\x90\x69\x8e\xf2\x14\x86\x59\xf9"
+                         "\xec\xe7\xfa\x3f\x48\x9d\x7f\x96"
+                         "\x67\x76\xac\x2c\xd2\x63\x18\x93"
+                         "\x13\xf8\xf1\xf6\x71\x77\xb3\xee"
+                         "\x93\xb2\xcc\xf3\x26\xc1\x16\x4f"
+                         "\xd4\xe8\x43\xc1\x68\xa3\x3e\x06"
+                         "\x38\x51\xff\xa8\xb9\xa4\xeb\xb1"
+                         "\x62\xdd\x78\x81\xea\x1d\xef\x04"
+                         "\x1d\x07\xc1\x67\xc8\xd6\x77\xa1"
+                         "\x84\x95\xf4\x9a\xd9\xbc\x2d\xe2"
+                         "\xf6\x80\xfc\x91\x2a\xbc\x42\xa0"
+                         "\x40\x41\x69\xaa\x71\xc0\x37\xec"
+                         "\x39\xf3\xf2\xec\x82\xc3\x88\x79"
+                         "\xbc\xc3\xaa\xb7\xcf\x6a\x72\x80"
+                         "\x4c\xf4\x84\x8f\x13\x9e\x94\x5c"
+                         "\xe5\xb2\x91\xbb\x92\x51\x4d\xf1"
+                         "\xd6\x0d\x71\x6b\x7a\xc2\x2f\x12"
+                         "\x6f\x75\xc7\x80\x99\x50\x84\xcf"
+                         "\xa8\xeb\xd6\xe1\x1c\x59\x81\x7e"
+                         "\xb9\xb3\xde\x7a\x93\x14\x12\xa2"
+                         "\xf7\x43\xb3\x9d\x1a\x87\x65\x91"
+                         "\x42\x08\x40\x82\x06\x1c\x2d\x55"
+                         "\x6e\x48\xd5\x74\x07\x6e\x9d\x80"
+                         "\xeb\xb4\x97\xa1\x36\xdf\xfa\x74"
+                         "\x79\x7f\x5a\x75\xe7\x71\xc8\x8c"
+                         "\x7e\xf8\x3a\x77\xcd\x32\x05\xf9"
+                         "\x3d\xd4\xe9\xa2\xbb\xc4\x8b\x83"
+                         "\x42\x5c\x82\xfa\xe9\x4b\x96\x3b"
+                         "\x7f\x89\x8b\xf9\xf1\x87\xda\xf0"
+                         "\x87\xef\x13\x5d\xf0\xe2\xc5\xc1"
+                         "\xed\x14\xa9\x57\x19\x63\x40\x04"
+                         "\x24\xeb\x6e\x19\xd1\x3d\x70\x78"
+                         "\xeb\xda\x55\x70\x2c\x4f\x41\x5b"
+                         "\x56\x9f\x1a\xd3\xac\xf1\xc0\xc3"
+                         "\x21\xec\xd7\xd2\x55\x32\x7c\x2e"
+                         "\x3c\x48\x8e\xb4\x85\x35\x47\xfe"
+                         "\xe2\x88\x79\x98\x6a\xc9\x8d\xff"
+                         "\xe9\x89\x6e\xb8\xe2\x97\x00\xbd"
+                         "\xa4\x8f\xba\xd0\x8c\xcb\x79\x99"
+                         "\xb3\xb2\xb2\x7a\xc3\xb7\xef\x75"
+                         "\x23\x52\x76\xc3\x50\x6e\x66\xf8"
+                         "\xa2\xe2\xce\xba\x40\x21\x3f\xc9"
+                         "\x0a\x32\x7f\xf7\x08\x8c\x66\xcf"
+                         "\xd3\xdf\x57\x59\x83\xb8\xe1\x85"
+                         "\xd6\x8f\xfb\x48\x1f\x3a\xc4\x2f"
+                         "\xb4\x2d\x58\xab\xd8\x7f\x5e\x3a"
+                         "\xbc\x62\x3e\xe2\x6a\x52\x0d\x76"
+                         "\x2f\x1c\x1a\x30\xed\x95\x2a\x44"
+                         "\x35\xa5\x83\x04\x84\x01\x99\x56"
+                         "\xb7\xe3\x10\x96\xfa\xdc\x19\xdd"
+                         "\xe2\x7f\xcb\xa0\x49\x1b\xff\x4c"
+                         "\x73\xf6\xbb\x94\x00\xe8\xa9\x3d"
+                         "\xe2\x20\xe9\x3f\xfa\x07\x5d\x77"
+                         "\x06\xd5\x4f\x4d\x02\xb8\x40\x1b"
+                         "\x30\xed\x1a\x50\x19\xef\xc4\x2c"
+                         "\x02\xd9\xc5\xd3\x11\x33\x37\xe5"
+                         "\x2b\xa3\x95\xa6\xee\xd8\x74\x1d"
+                         "\x68\xa0\xeb\xbf\xdd\x5e\x99\x96"
+                         "\x91\xc3\x94\x24\xa5\x12\xa2\x37"
+                         "\xb3\xac\xcf\x2a\xfd\x55\x34\xfe"
+                         "\x79\x92\x3e\xe6\x1b\x49\x57\x5d"
+                         "\x93\x6c\x01\xf7\xcc\x4e\x20\xd1"
+                         "\xb2\x1a\xd8\x4c\xbd\x1d\x10\xe9"
+                         "\x5a\xa8\x92\x7f\xba\xe6\x0c\x95",
+               .rlen   = 512,
+       },
+};
+
+static struct cipher_testvec camellia_lrw_dec_tv_template[] = {
+       /* Generated from AES-LRW test vectors */
+       /* same as enc vectors with input and result reversed */
+       {
+               .key    = "\x45\x62\xac\x25\xf8\x28\x17\x6d"
+                         "\x4c\x26\x84\x14\xb5\x68\x01\x85"
+                         "\x25\x8e\x2a\x05\xe7\x3e\x9d\x03"
+                         "\xee\x5a\x83\x0c\xcc\x09\x4c\x87",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x92\x68\x19\xd7\xb7\x5b\x0a\x31"
+                         "\x97\xcc\x72\xbe\x99\x17\xeb\x3e",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\x59\x70\x47\x14\xf5\x57\x47\x8c"
+                         "\xd7\x79\xe8\x0f\x54\x88\x79\x44"
+                         "\x0d\x48\xf0\xb7\xb1\x5a\x53\xea"
+                         "\x1c\xaa\x6b\x29\xc2\xca\xfb\xaf",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x02",
+               .input  = "\x73\x09\xb7\x50\xb6\x77\x30\x50"
+                         "\x5c\x8a\x9c\x26\x77\x9d\xfc\x4a",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\xd8\x2a\x91\x34\xb2\x6a\x56\x50"
+                         "\x30\xfe\x69\xe2\x37\x7f\x98\x47"
+                         "\xcd\xf9\x0b\x16\x0c\x64\x8f\xb6"
+                         "\xb0\x0d\x0d\x1b\xae\x85\x87\x1f",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x02\x00\x00\x00\x00",
+               .input  = "\x90\xae\x83\xe0\x22\xb9\x60\x91"
+                         "\xfa\xa9\xb7\x98\xe3\xed\x87\x01",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\x0f\x6a\xef\xf8\xd3\xd2\xbb\x15"
+                         "\x25\x83\xf7\x3c\x1f\x01\x28\x74"
+                         "\xca\xc6\xbc\x35\x4d\x4a\x65\x54"
+                         "\x90\xae\x61\xcf\x7b\xae\xbd\xcc"
+                         "\xad\xe4\x94\xc5\x4a\x29\xae\x70",
+               .klen   = 40,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x99\xe9\x6e\xd4\xc9\x21\xa5\xf0"
+                         "\xd8\x83\xef\xd9\x07\x16\x5f\x35",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\x8a\xd4\xee\x10\x2f\xbd\x81\xff"
+                         "\xf8\x86\xce\xac\x93\xc5\xad\xc6"
+                         "\xa0\x19\x07\xc0\x9d\xf7\xbb\xdd"
+                         "\x52\x13\xb2\xb7\xf0\xff\x11\xd8"
+                         "\xd6\x08\xd0\xcd\x2e\xb1\x17\x6f",
+               .klen   = 40,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x02\x00\x00\x00\x00",
+               .input  = "\x42\x88\xf4\xcb\x21\x11\x6d\x8e"
+                         "\xde\x1a\xf2\x29\xf1\x4a\xe0\x15",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"
+                         "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"
+                         "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"
+                         "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"
+                         "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"
+                         "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",
+               .klen   = 48,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x40\xaa\x34\x86\x4a\x8f\x78\xb9"
+                         "\xdb\xdb\x0f\x3d\x48\x70\xbe\x8d",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\xfb\x76\x15\xb2\x3d\x80\x89\x1d"
+                         "\xd4\x70\x98\x0b\xc7\x95\x84\xc8"
+                         "\xb2\xfb\x64\xce\x60\x97\x87\x8d"
+                         "\x17\xfc\xe4\x5a\x49\xe8\x30\xb7"
+                         "\x6e\x78\x17\xe7\x2d\x5e\x12\xd4"
+                         "\x60\x64\x04\x7a\xf1\x2f\x9e\x0c",
+               .klen   = 48,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x02\x00\x00\x00\x00",
+               .input  = "\x04\xab\x28\x37\x31\x7a\x26\xab"
+                         "\xa1\x70\x1b\x9c\xe7\xdd\x83\xff",
+               .ilen   = 16,
+               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x41\x42\x43\x44\x45\x46",
+               .rlen   = 16,
+       }, {
+               .key    = "\xf8\xd4\x76\xff\xd6\x46\xee\x6c"
+                         "\x23\x84\xcb\x1c\x77\xd6\x19\x5d"
+                         "\xfe\xf1\xa9\xf3\x7b\xbc\x8d\x21"
+                         "\xa7\x9c\x21\xf8\xcb\x90\x02\x89"
+                         "\xa8\x45\x34\x8e\xc8\xc5\xb5\xf1"
+                         "\x26\xf5\x0e\x76\xfe\xfd\x1b\x1e",
+               .klen   = 48,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .input  = "\x90\x69\x8e\xf2\x14\x86\x59\xf9"
+                         "\xec\xe7\xfa\x3f\x48\x9d\x7f\x96"
+                         "\x67\x76\xac\x2c\xd2\x63\x18\x93"
+                         "\x13\xf8\xf1\xf6\x71\x77\xb3\xee"
+                         "\x93\xb2\xcc\xf3\x26\xc1\x16\x4f"
+                         "\xd4\xe8\x43\xc1\x68\xa3\x3e\x06"
+                         "\x38\x51\xff\xa8\xb9\xa4\xeb\xb1"
+                         "\x62\xdd\x78\x81\xea\x1d\xef\x04"
+                         "\x1d\x07\xc1\x67\xc8\xd6\x77\xa1"
+                         "\x84\x95\xf4\x9a\xd9\xbc\x2d\xe2"
+                         "\xf6\x80\xfc\x91\x2a\xbc\x42\xa0"
+                         "\x40\x41\x69\xaa\x71\xc0\x37\xec"
+                         "\x39\xf3\xf2\xec\x82\xc3\x88\x79"
+                         "\xbc\xc3\xaa\xb7\xcf\x6a\x72\x80"
+                         "\x4c\xf4\x84\x8f\x13\x9e\x94\x5c"
+                         "\xe5\xb2\x91\xbb\x92\x51\x4d\xf1"
+                         "\xd6\x0d\x71\x6b\x7a\xc2\x2f\x12"
+                         "\x6f\x75\xc7\x80\x99\x50\x84\xcf"
+                         "\xa8\xeb\xd6\xe1\x1c\x59\x81\x7e"
+                         "\xb9\xb3\xde\x7a\x93\x14\x12\xa2"
+                         "\xf7\x43\xb3\x9d\x1a\x87\x65\x91"
+                         "\x42\x08\x40\x82\x06\x1c\x2d\x55"
+                         "\x6e\x48\xd5\x74\x07\x6e\x9d\x80"
+                         "\xeb\xb4\x97\xa1\x36\xdf\xfa\x74"
+                         "\x79\x7f\x5a\x75\xe7\x71\xc8\x8c"
+                         "\x7e\xf8\x3a\x77\xcd\x32\x05\xf9"
+                         "\x3d\xd4\xe9\xa2\xbb\xc4\x8b\x83"
+                         "\x42\x5c\x82\xfa\xe9\x4b\x96\x3b"
+                         "\x7f\x89\x8b\xf9\xf1\x87\xda\xf0"
+                         "\x87\xef\x13\x5d\xf0\xe2\xc5\xc1"
+                         "\xed\x14\xa9\x57\x19\x63\x40\x04"
+                         "\x24\xeb\x6e\x19\xd1\x3d\x70\x78"
+                         "\xeb\xda\x55\x70\x2c\x4f\x41\x5b"
+                         "\x56\x9f\x1a\xd3\xac\xf1\xc0\xc3"
+                         "\x21\xec\xd7\xd2\x55\x32\x7c\x2e"
+                         "\x3c\x48\x8e\xb4\x85\x35\x47\xfe"
+                         "\xe2\x88\x79\x98\x6a\xc9\x8d\xff"
+                         "\xe9\x89\x6e\xb8\xe2\x97\x00\xbd"
+                         "\xa4\x8f\xba\xd0\x8c\xcb\x79\x99"
+                         "\xb3\xb2\xb2\x7a\xc3\xb7\xef\x75"
+                         "\x23\x52\x76\xc3\x50\x6e\x66\xf8"
+                         "\xa2\xe2\xce\xba\x40\x21\x3f\xc9"
+                         "\x0a\x32\x7f\xf7\x08\x8c\x66\xcf"
+                         "\xd3\xdf\x57\x59\x83\xb8\xe1\x85"
+                         "\xd6\x8f\xfb\x48\x1f\x3a\xc4\x2f"
+                         "\xb4\x2d\x58\xab\xd8\x7f\x5e\x3a"
+                         "\xbc\x62\x3e\xe2\x6a\x52\x0d\x76"
+                         "\x2f\x1c\x1a\x30\xed\x95\x2a\x44"
+                         "\x35\xa5\x83\x04\x84\x01\x99\x56"
+                         "\xb7\xe3\x10\x96\xfa\xdc\x19\xdd"
+                         "\xe2\x7f\xcb\xa0\x49\x1b\xff\x4c"
+                         "\x73\xf6\xbb\x94\x00\xe8\xa9\x3d"
+                         "\xe2\x20\xe9\x3f\xfa\x07\x5d\x77"
+                         "\x06\xd5\x4f\x4d\x02\xb8\x40\x1b"
+                         "\x30\xed\x1a\x50\x19\xef\xc4\x2c"
+                         "\x02\xd9\xc5\xd3\x11\x33\x37\xe5"
+                         "\x2b\xa3\x95\xa6\xee\xd8\x74\x1d"
+                         "\x68\xa0\xeb\xbf\xdd\x5e\x99\x96"
+                         "\x91\xc3\x94\x24\xa5\x12\xa2\x37"
+                         "\xb3\xac\xcf\x2a\xfd\x55\x34\xfe"
+                         "\x79\x92\x3e\xe6\x1b\x49\x57\x5d"
+                         "\x93\x6c\x01\xf7\xcc\x4e\x20\xd1"
+                         "\xb2\x1a\xd8\x4c\xbd\x1d\x10\xe9"
+                         "\x5a\xa8\x92\x7f\xba\xe6\x0c\x95",
+               .ilen   = 512,
+               .result = "\x05\x11\xb7\x18\xab\xc6\x2d\xac"
+                         "\x70\x5d\xf6\x22\x94\xcd\xe5\x6c"
+                         "\x17\x6b\xf6\x1c\xf0\xf3\x6e\xf8"
+                         "\x50\x38\x1f\x71\x49\xb6\x57\xd6"
+                         "\x8f\xcb\x8d\x6b\xe3\xa6\x29\x90"
+                         "\xfe\x2a\x62\x82\xae\x6d\x8b\xf6"
+                         "\xad\x1e\x9e\x20\x5f\x38\xbe\x04"
+                         "\xda\x10\x8e\xed\xa2\xa4\x87\xab"
+                         "\xda\x6b\xb4\x0c\x75\xba\xd3\x7c"
+                         "\xc9\xac\x42\x31\x95\x7c\xc9\x04"
+                         "\xeb\xd5\x6e\x32\x69\x8a\xdb\xa6"
+                         "\x15\xd7\x3f\x4f\x2f\x66\x69\x03"
+                         "\x9c\x1f\x54\x0f\xde\x1f\xf3\x65"
+                         "\x4c\x96\x12\xed\x7c\x92\x03\x01"
+                         "\x6f\xbc\x35\x93\xac\xf1\x27\xf1"
+                         "\xb4\x96\x82\x5a\x5f\xb0\xa0\x50"
+                         "\x89\xa4\x8e\x66\x44\x85\xcc\xfd"
+                         "\x33\x14\x70\xe3\x96\xb2\xc3\xd3"
+                         "\xbb\x54\x5a\x1a\xf9\x74\xa2\xc5"
+                         "\x2d\x64\x75\xdd\xb4\x54\xe6\x74"
+                         "\x8c\xd3\x9d\x9e\x86\xab\x51\x53"
+                         "\xb7\x93\x3e\x6f\xd0\x4e\x2c\x40"
+                         "\xf6\xa8\x2e\x3e\x9d\xf4\x66\xa5"
+                         "\x76\x12\x73\x44\x1a\x56\xd7\x72"
+                         "\x88\xcd\x21\x8c\x4c\x0f\xfe\xda"
+                         "\x95\xe0\x3a\xa6\xa5\x84\x46\xcd"
+                         "\xd5\x3e\x9d\x3a\xe2\x67\xe6\x60"
+                         "\x1a\xe2\x70\x85\x58\xc2\x1b\x09"
+                         "\xe1\xd7\x2c\xca\xad\xa8\x8f\xf9"
+                         "\xac\xb3\x0e\xdb\xca\x2e\xe2\xb8"
+                         "\x51\x71\xd9\x3c\x6c\xf1\x56\xf8"
+                         "\xea\x9c\xf1\xfb\x0c\xe6\xb7\x10"
+                         "\x1c\xf8\xa9\x7c\xe8\x53\x35\xc1"
+                         "\x90\x3e\x76\x4a\x74\xa4\x21\x2c"
+                         "\xf6\x2c\x4e\x0f\x94\x3a\x88\x2e"
+                         "\x41\x09\x6a\x33\x7d\xf6\xdd\x3f"
+                         "\x8d\x23\x31\x74\x84\xeb\x88\x6e"
+                         "\xcc\xb9\xbc\x22\x83\x19\x07\x22"
+                         "\xa5\x2d\xdf\xa5\xf3\x80\x85\x78"
+                         "\x84\x39\x6a\x6d\x6a\x99\x4f\xa5"
+                         "\x15\xfe\x46\xb0\xe4\x6c\xa5\x41"
+                         "\x3c\xce\x8f\x42\x60\x71\xa7\x75"
+                         "\x08\x40\x65\x8a\x82\xbf\xf5\x43"
+                         "\x71\x96\xa9\x4d\x44\x8a\x20\xbe"
+                         "\xfa\x4d\xbb\xc0\x7d\x31\x96\x65"
+                         "\xe7\x75\xe5\x3e\xfd\x92\x3b\xc9"
+                         "\x55\xbb\x16\x7e\xf7\xc2\x8c\xa4"
+                         "\x40\x1d\xe5\xef\x0e\xdf\xe4\x9a"
+                         "\x62\x73\x65\xfd\x46\x63\x25\x3d"
+                         "\x2b\xaf\xe5\x64\xfe\xa5\x5c\xcf"
+                         "\x24\xf3\xb4\xac\x64\xba\xdf\x4b"
+                         "\xc6\x96\x7d\x81\x2d\x8d\x97\xf7"
+                         "\xc5\x68\x77\x84\x32\x2b\xcc\x85"
+                         "\x74\x96\xf0\x12\x77\x61\xb9\xeb"
+                         "\x71\xaa\x82\xcb\x1c\xdb\x89\xc8"
+                         "\xc6\xb5\xe3\x5c\x7d\x39\x07\x24"
+                         "\xda\x39\x87\x45\xc0\x2b\xbb\x01"
+                         "\xac\xbc\x2a\x5c\x7f\xfc\xe8\xce"
+                         "\x6d\x9c\x6f\xed\xd3\xc1\xa1\xd6"
+                         "\xc5\x55\xa9\x66\x2f\xe1\xc8\x32"
+                         "\xa6\x5d\xa4\x3a\x98\x73\xe8\x45"
+                         "\xa4\xc7\xa8\xb4\xf6\x13\x03\xf6"
+                         "\xe9\x2e\xc4\x29\x0f\x84\xdb\xc4"
+                         "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
+               .rlen   = 512,
+       },
+};
+
+static struct cipher_testvec camellia_xts_enc_tv_template[] = {
+       /* Generated from AES-XTS test vectors */
+       {
+               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .ilen   = 32,
+               .result = "\x06\xcb\xa5\xf1\x04\x63\xb2\x41"
+                         "\xdc\xca\xfa\x09\xba\x74\xb9\x05"
+                         "\x78\xba\xa4\xf8\x67\x4d\x7e\xad"
+                         "\x20\x18\xf5\x0c\x41\x16\x2a\x61",
+               .rlen   = 32,
+       }, {
+               .key    = "\x11\x11\x11\x11\x11\x11\x11\x11"
+                         "\x11\x11\x11\x11\x11\x11\x11\x11"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22",
+               .klen   = 32,
+               .iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44",
+               .ilen   = 32,
+               .result = "\xc2\xb9\xdc\x44\x1d\xdf\xf2\x86"
+                         "\x8d\x35\x42\x0a\xa5\x5e\x3d\x4f"
+                         "\xb5\x37\x06\xff\xbd\xd4\x91\x70"
+                         "\x80\x1f\xb2\x39\x10\x89\x44\xf5",
+               .rlen   = 32,
+       }, {
+               .key    = "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"
+                         "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22",
+               .klen   = 32,
+               .iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44",
+               .ilen   = 32,
+               .result = "\x52\x1f\x9d\xf5\x5a\x58\x5a\x7e"
+                         "\x9f\xd0\x8e\x02\x9c\x9a\x6a\xa7"
+                         "\xb4\x3b\xce\xe7\x17\xaa\x89\x6a"
+                         "\x35\x3c\x6b\xb5\x61\x1c\x79\x38",
+               .rlen   = 32,
+       }, {
+               .key    = "\x27\x18\x28\x18\x28\x45\x90\x45"
+                         "\x23\x53\x60\x28\x74\x71\x35\x26"
+                         "\x31\x41\x59\x26\x53\x58\x97\x93"
+                         "\x23\x84\x62\x64\x33\x83\x27\x95",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
+                         "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+               .ilen   = 512,
+               .result = "\xc7\xf9\x0a\xaa\xcb\xb5\x8f\x33"
+                         "\x60\xc3\xe9\x47\x90\xb7\x50\x57"
+                         "\xa3\xad\x81\x2f\xf5\x22\x96\x02"
+                         "\xaa\x7f\xea\xac\x29\x78\xca\x2a"
+                         "\x7c\xcd\x31\x1a\x3c\x40\x0a\x73"
+                         "\x09\x66\xad\x72\x0e\x4d\x5d\x77"
+                         "\xbc\xb8\x76\x80\x37\x59\xa9\x01"
+                         "\x9e\xfb\xdb\x6c\x93\xef\xb6\x8d"
+                         "\x1e\xc1\x94\xa8\xd4\xb5\xb0\x01"
+                         "\xd5\x01\x97\x28\xcd\x7a\x1f\xe8"
+                         "\x08\xda\x76\x00\x65\xcf\x7b\x31"
+                         "\xc6\xfa\xf2\x3b\x00\xa7\x6a\x9e"
+                         "\x6c\x43\x80\x87\xe0\xbb\x4e\xe5"
+                         "\xdc\x8a\xdf\xc3\x1d\x1b\x41\x04"
+                         "\xfb\x54\xdd\x29\x27\xc2\x65\x17"
+                         "\x36\x88\xb0\x85\x8d\x73\x7e\x4b"
+                         "\x1d\x16\x8a\x52\xbc\xa6\xbc\xa4"
+                         "\x8c\xd1\x04\x16\xbf\x8c\x01\x0f"
+                         "\x7e\x6b\x59\x15\x29\xd1\x9b\xd3"
+                         "\x6c\xee\xac\xdc\x45\x58\xca\x5b"
+                         "\x70\x0e\x6a\x12\x86\x82\x79\x9f"
+                         "\x16\xd4\x9d\x67\xcd\x70\x65\x26"
+                         "\x21\x72\x1e\xa1\x94\x8a\x83\x0c"
+                         "\x92\x42\x58\x5e\xa2\xc5\x31\xf3"
+                         "\x7b\xd1\x31\xd4\x15\x80\x31\x61"
+                         "\x5c\x53\x10\xdd\xea\xc8\x83\x5c"
+                         "\x7d\xa7\x05\x66\xcc\x1e\xbb\x05"
+                         "\x47\xae\xb4\x0f\x84\xd8\xf6\xb5"
+                         "\xa1\xc6\x52\x00\x52\xe8\xdc\xd9"
+                         "\x16\x31\xb2\x47\x91\x67\xaa\x28"
+                         "\x2c\x29\x85\xa3\xf7\xf2\x24\x93"
+                         "\x23\x80\x1f\xa8\x1b\x82\x8d\xdc"
+                         "\x9f\x0b\xcd\xb4\x3c\x20\xbc\xec"
+                         "\x4f\xc7\xee\xf8\xfd\xd9\xfb\x7e"
+                         "\x3f\x0d\x23\xfa\x3f\xa7\xcc\x66"
+                         "\x1c\xfe\xa6\x86\xf6\xf7\x85\xc7"
+                         "\x43\xc1\xd4\xfc\xe4\x79\xc9\x1d"
+                         "\xf8\x89\xcd\x20\x27\x84\x5d\x5c"
+                         "\x8e\x4f\x1f\xeb\x08\x21\x4f\xa3"
+                         "\xe0\x7e\x0b\x9c\xe7\x42\xcf\xb7"
+                         "\x3f\x43\xcc\x86\x71\x34\x6a\xd9"
+                         "\x5e\xec\x8f\x36\xc9\x0a\x03\xfe"
+                         "\x18\x41\xdc\x9e\x2e\x75\x20\x3e"
+                         "\xcc\x77\xe0\x8f\xe8\x43\x37\x4c"
+                         "\xed\x1a\x5a\xb3\xfa\x43\xc9\x71"
+                         "\x9f\xc5\xce\xcf\xff\xe7\x77\x1e"
+                         "\x35\x93\xde\x6b\xc0\x6a\x7e\xa9"
+                         "\x34\xb8\x27\x74\x08\xda\xf2\x4a"
+                         "\x23\x5b\x9f\x55\x3a\x57\x82\x52"
+                         "\xea\x6d\xc3\xc7\xf2\xc8\xb5\xdc"
+                         "\xc5\xb9\xbb\xaa\xf2\x29\x9f\x49"
+                         "\x7a\xef\xfe\xdc\x9f\xc9\x28\xe2"
+                         "\x96\x0b\x35\x84\x05\x0d\xd6\x2a"
+                         "\xea\x5a\xbf\x69\xde\xee\x4f\x8f"
+                         "\x84\xb9\xcf\xa7\x57\xea\xe0\xe8"
+                         "\x96\xef\x0f\x0e\xec\xc7\xa6\x74"
+                         "\xb1\xfe\x7a\x6d\x11\xdd\x0e\x15"
+                         "\x4a\x1e\x73\x7f\x55\xea\xf6\xe1"
+                         "\x5b\xb6\x71\xda\xb0\x0c\xba\x26"
+                         "\x5c\x48\x38\x6d\x1c\x32\xb2\x7d"
+                         "\x05\x87\xc2\x1e\x7e\x2d\xd4\x33"
+                         "\xcc\x06\xdb\xe7\x82\x29\x63\xd1"
+                         "\x52\x84\x4f\xee\x27\xe8\x02\xd4"
+                         "\x34\x3c\x69\xc2\xbd\x20\xe6\x7a",
+               .rlen   = 512,
+       }, {
+               .key    = "\x27\x18\x28\x18\x28\x45\x90\x45"
+                         "\x23\x53\x60\x28\x74\x71\x35\x26"
+                         "\x62\x49\x77\x57\x24\x70\x93\x69"
+                         "\x99\x59\x57\x49\x66\x96\x76\x27"
+                         "\x31\x41\x59\x26\x53\x58\x97\x93"
+                         "\x23\x84\x62\x64\x33\x83\x27\x95"
+                         "\x02\x88\x41\x97\x16\x93\x99\x37"
+                         "\x51\x05\x82\x09\x74\x94\x45\x92",
+               .klen   = 64,
+               .iv     = "\xff\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
+                         "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+               .ilen   = 512,
+               .result = "\x49\xcd\xb8\xbf\x2f\x73\x37\x28"
+                         "\x9a\x7f\x6e\x57\x55\xb8\x07\x88"
+                         "\x4a\x0d\x8b\x55\x60\xed\xb6\x7b"
+                         "\xf1\x74\xac\x96\x05\x7b\x32\xca"
+                         "\xd1\x4e\xf1\x58\x29\x16\x24\x6c"
+                         "\xf2\xb3\xe4\x88\x84\xac\x4d\xee"
+                         "\x97\x07\x82\xf0\x07\x12\x38\x0a"
+                         "\x67\x62\xaf\xfd\x85\x9f\x0a\x55"
+                         "\xa5\x20\xc5\x60\xe4\x68\x53\xa4"
+                         "\x0e\x2e\x65\xe3\xe4\x0c\x30\x7c"
+                         "\x1c\x01\x4f\x55\xa9\x13\xeb\x25"
+                         "\x21\x87\xbc\xd3\xe7\x67\x4f\x38"
+                         "\xa8\x14\x25\x71\xe9\x2e\x4c\x21"
+                         "\x41\x82\x0c\x45\x39\x35\xa8\x75"
+                         "\x03\x29\x01\x84\x8c\xab\x48\xbe"
+                         "\x11\x56\x22\x67\xb7\x67\x1a\x09"
+                         "\xa1\x72\x25\x41\x3c\x39\x65\x80"
+                         "\x7d\x2f\xf8\x2c\x73\x04\x58\x9d"
+                         "\xdd\x16\x8b\x63\x70\x4e\xc5\x17"
+                         "\x21\xe0\x84\x51\x4b\x6f\x05\x52"
+                         "\xe3\x63\x34\xfa\xa4\xaf\x33\x20"
+                         "\xc1\xae\x32\xc4\xb8\x2b\xdb\x76"
+                         "\xd9\x02\x31\x2f\xa3\xc6\xd0\x7b"
+                         "\xaf\x1b\x84\xe3\x9b\xbf\xa6\xe0"
+                         "\xb8\x8a\x13\x88\x71\xf4\x11\xa5"
+                         "\xe9\xa9\x10\x33\xe0\xbe\x49\x89"
+                         "\x41\x22\xf5\x9d\x80\x3e\x3b\x76"
+                         "\x01\x16\x50\x6e\x7c\x6a\x81\xe9"
+                         "\x13\x2c\xde\xb2\x5f\x79\xba\xb2"
+                         "\xb1\x75\xae\xd2\x07\x98\x4b\x69"
+                         "\xae\x7d\x5b\x90\xc2\x6c\xe6\x98"
+                         "\xd3\x4c\xa1\xa3\x9c\xc9\x33\x6a"
+                         "\x0d\x23\xb1\x79\x25\x13\x4b\xe5"
+                         "\xaf\x93\x20\x5c\x7f\x06\x7a\x34"
+                         "\x0b\x78\xe3\x67\x26\xe0\xad\x95"
+                         "\xc5\x4e\x26\x22\xcf\x73\x77\x62"
+                         "\x3e\x10\xd7\x90\x4b\x52\x1c\xc9"
+                         "\xef\x38\x52\x18\x0e\x29\x7e\xef"
+                         "\x34\xfe\x31\x95\xc5\xbc\xa8\xe2"
+                         "\xa8\x4e\x9f\xea\xa6\xf0\xfe\x5d"
+                         "\xc5\x39\x86\xed\x2f\x6d\xa0\xfe"
+                         "\x96\xcd\x41\x10\x78\x4e\x0c\xc9"
+                         "\xc3\x6d\x0f\xb7\xe8\xe0\x62\xab"
+                         "\x8b\xf1\x21\x89\xa1\x12\xaa\xfa"
+                         "\x9d\x70\xbe\x4c\xa8\x98\x89\x01"
+                         "\xb9\xe2\x61\xde\x0c\x4a\x0b\xaa"
+                         "\x89\xf5\x14\x79\x18\x8f\x3b\x0d"
+                         "\x21\x17\xf8\x59\x15\x24\x64\x22"
+                         "\x57\x48\x80\xd5\x3d\x92\x30\x07"
+                         "\xd9\xa1\x4a\x23\x16\x43\x48\x0e"
+                         "\x2b\x2d\x1b\x87\xef\x7e\xbd\xfa"
+                         "\x49\xbc\x7e\x68\x6e\xa8\x46\x95"
+                         "\xad\x5e\xfe\x0a\xa8\xd3\x1a\x5d"
+                         "\x6b\x84\xf3\x00\xba\x52\x05\x02"
+                         "\xe3\x96\x4e\xb6\x79\x3f\x43\xd3"
+                         "\x4d\x3f\xd6\xab\x0a\xc4\x75\x2d"
+                         "\xd1\x08\xc3\x6a\xc8\x37\x29\xa0"
+                         "\xcc\x9a\x05\xdd\x5c\xe1\xff\x66"
+                         "\xf2\x7a\x1d\xf2\xaf\xa9\x48\x89"
+                         "\xf5\x21\x0f\x02\x48\x83\x74\xbf"
+                         "\x2e\xe6\x93\x7b\xa0\xf4\xb1\x2b"
+                         "\xb1\x02\x0a\x5c\x79\x19\x3b\x75"
+                         "\xb7\x16\xd8\x12\x5c\xcd\x7d\x4e"
+                         "\xd5\xc6\x99\xcc\x4e\x6c\x94\x95",
+               .rlen   = 512,
+       },
+};
+
+static struct cipher_testvec camellia_xts_dec_tv_template[] = {
+       /* Generated from AES-XTS test vectors */
+       /* same as enc vectors with input and result reversed */
+       {
+               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x06\xcb\xa5\xf1\x04\x63\xb2\x41"
+                         "\xdc\xca\xfa\x09\xba\x74\xb9\x05"
+                         "\x78\xba\xa4\xf8\x67\x4d\x7e\xad"
+                         "\x20\x18\xf5\x0c\x41\x16\x2a\x61",
+               .ilen   = 32,
+               .result = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .rlen   = 32,
+       }, {
+               .key    = "\x11\x11\x11\x11\x11\x11\x11\x11"
+                         "\x11\x11\x11\x11\x11\x11\x11\x11"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22",
+               .klen   = 32,
+               .iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\xc2\xb9\xdc\x44\x1d\xdf\xf2\x86"
+                         "\x8d\x35\x42\x0a\xa5\x5e\x3d\x4f"
+                         "\xb5\x37\x06\xff\xbd\xd4\x91\x70"
+                         "\x80\x1f\xb2\x39\x10\x89\x44\xf5",
+               .ilen   = 32,
+               .result = "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44",
+               .rlen   = 32,
+       }, {
+               .key    = "\xff\xfe\xfd\xfc\xfb\xfa\xf9\xf8"
+                         "\xf7\xf6\xf5\xf4\xf3\xf2\xf1\xf0"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22"
+                         "\x22\x22\x22\x22\x22\x22\x22\x22",
+               .klen   = 32,
+               .iv     = "\x33\x33\x33\x33\x33\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x52\x1f\x9d\xf5\x5a\x58\x5a\x7e"
+                         "\x9f\xd0\x8e\x02\x9c\x9a\x6a\xa7"
+                         "\xb4\x3b\xce\xe7\x17\xaa\x89\x6a"
+                         "\x35\x3c\x6b\xb5\x61\x1c\x79\x38",
+               .ilen   = 32,
+               .result = "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44"
+                         "\x44\x44\x44\x44\x44\x44\x44\x44",
+               .rlen   = 32,
+       }, {
+               .key    = "\x27\x18\x28\x18\x28\x45\x90\x45"
+                         "\x23\x53\x60\x28\x74\x71\x35\x26"
+                         "\x31\x41\x59\x26\x53\x58\x97\x93"
+                         "\x23\x84\x62\x64\x33\x83\x27\x95",
+               .klen   = 32,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\xc7\xf9\x0a\xaa\xcb\xb5\x8f\x33"
+                         "\x60\xc3\xe9\x47\x90\xb7\x50\x57"
+                         "\xa3\xad\x81\x2f\xf5\x22\x96\x02"
+                         "\xaa\x7f\xea\xac\x29\x78\xca\x2a"
+                         "\x7c\xcd\x31\x1a\x3c\x40\x0a\x73"
+                         "\x09\x66\xad\x72\x0e\x4d\x5d\x77"
+                         "\xbc\xb8\x76\x80\x37\x59\xa9\x01"
+                         "\x9e\xfb\xdb\x6c\x93\xef\xb6\x8d"
+                         "\x1e\xc1\x94\xa8\xd4\xb5\xb0\x01"
+                         "\xd5\x01\x97\x28\xcd\x7a\x1f\xe8"
+                         "\x08\xda\x76\x00\x65\xcf\x7b\x31"
+                         "\xc6\xfa\xf2\x3b\x00\xa7\x6a\x9e"
+                         "\x6c\x43\x80\x87\xe0\xbb\x4e\xe5"
+                         "\xdc\x8a\xdf\xc3\x1d\x1b\x41\x04"
+                         "\xfb\x54\xdd\x29\x27\xc2\x65\x17"
+                         "\x36\x88\xb0\x85\x8d\x73\x7e\x4b"
+                         "\x1d\x16\x8a\x52\xbc\xa6\xbc\xa4"
+                         "\x8c\xd1\x04\x16\xbf\x8c\x01\x0f"
+                         "\x7e\x6b\x59\x15\x29\xd1\x9b\xd3"
+                         "\x6c\xee\xac\xdc\x45\x58\xca\x5b"
+                         "\x70\x0e\x6a\x12\x86\x82\x79\x9f"
+                         "\x16\xd4\x9d\x67\xcd\x70\x65\x26"
+                         "\x21\x72\x1e\xa1\x94\x8a\x83\x0c"
+                         "\x92\x42\x58\x5e\xa2\xc5\x31\xf3"
+                         "\x7b\xd1\x31\xd4\x15\x80\x31\x61"
+                         "\x5c\x53\x10\xdd\xea\xc8\x83\x5c"
+                         "\x7d\xa7\x05\x66\xcc\x1e\xbb\x05"
+                         "\x47\xae\xb4\x0f\x84\xd8\xf6\xb5"
+                         "\xa1\xc6\x52\x00\x52\xe8\xdc\xd9"
+                         "\x16\x31\xb2\x47\x91\x67\xaa\x28"
+                         "\x2c\x29\x85\xa3\xf7\xf2\x24\x93"
+                         "\x23\x80\x1f\xa8\x1b\x82\x8d\xdc"
+                         "\x9f\x0b\xcd\xb4\x3c\x20\xbc\xec"
+                         "\x4f\xc7\xee\xf8\xfd\xd9\xfb\x7e"
+                         "\x3f\x0d\x23\xfa\x3f\xa7\xcc\x66"
+                         "\x1c\xfe\xa6\x86\xf6\xf7\x85\xc7"
+                         "\x43\xc1\xd4\xfc\xe4\x79\xc9\x1d"
+                         "\xf8\x89\xcd\x20\x27\x84\x5d\x5c"
+                         "\x8e\x4f\x1f\xeb\x08\x21\x4f\xa3"
+                         "\xe0\x7e\x0b\x9c\xe7\x42\xcf\xb7"
+                         "\x3f\x43\xcc\x86\x71\x34\x6a\xd9"
+                         "\x5e\xec\x8f\x36\xc9\x0a\x03\xfe"
+                         "\x18\x41\xdc\x9e\x2e\x75\x20\x3e"
+                         "\xcc\x77\xe0\x8f\xe8\x43\x37\x4c"
+                         "\xed\x1a\x5a\xb3\xfa\x43\xc9\x71"
+                         "\x9f\xc5\xce\xcf\xff\xe7\x77\x1e"
+                         "\x35\x93\xde\x6b\xc0\x6a\x7e\xa9"
+                         "\x34\xb8\x27\x74\x08\xda\xf2\x4a"
+                         "\x23\x5b\x9f\x55\x3a\x57\x82\x52"
+                         "\xea\x6d\xc3\xc7\xf2\xc8\xb5\xdc"
+                         "\xc5\xb9\xbb\xaa\xf2\x29\x9f\x49"
+                         "\x7a\xef\xfe\xdc\x9f\xc9\x28\xe2"
+                         "\x96\x0b\x35\x84\x05\x0d\xd6\x2a"
+                         "\xea\x5a\xbf\x69\xde\xee\x4f\x8f"
+                         "\x84\xb9\xcf\xa7\x57\xea\xe0\xe8"
+                         "\x96\xef\x0f\x0e\xec\xc7\xa6\x74"
+                         "\xb1\xfe\x7a\x6d\x11\xdd\x0e\x15"
+                         "\x4a\x1e\x73\x7f\x55\xea\xf6\xe1"
+                         "\x5b\xb6\x71\xda\xb0\x0c\xba\x26"
+                         "\x5c\x48\x38\x6d\x1c\x32\xb2\x7d"
+                         "\x05\x87\xc2\x1e\x7e\x2d\xd4\x33"
+                         "\xcc\x06\xdb\xe7\x82\x29\x63\xd1"
+                         "\x52\x84\x4f\xee\x27\xe8\x02\xd4"
+                         "\x34\x3c\x69\xc2\xbd\x20\xe6\x7a",
+               .ilen   = 512,
+               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
+                         "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+               .rlen   = 512,
+       }, {
+               .key    = "\x27\x18\x28\x18\x28\x45\x90\x45"
+                         "\x23\x53\x60\x28\x74\x71\x35\x26"
+                         "\x62\x49\x77\x57\x24\x70\x93\x69"
+                         "\x99\x59\x57\x49\x66\x96\x76\x27"
+                         "\x31\x41\x59\x26\x53\x58\x97\x93"
+                         "\x23\x84\x62\x64\x33\x83\x27\x95"
+                         "\x02\x88\x41\x97\x16\x93\x99\x37"
+                         "\x51\x05\x82\x09\x74\x94\x45\x92",
+               .klen   = 64,
+               .iv     = "\xff\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .input  = "\x49\xcd\xb8\xbf\x2f\x73\x37\x28"
+                         "\x9a\x7f\x6e\x57\x55\xb8\x07\x88"
+                         "\x4a\x0d\x8b\x55\x60\xed\xb6\x7b"
+                         "\xf1\x74\xac\x96\x05\x7b\x32\xca"
+                         "\xd1\x4e\xf1\x58\x29\x16\x24\x6c"
+                         "\xf2\xb3\xe4\x88\x84\xac\x4d\xee"
+                         "\x97\x07\x82\xf0\x07\x12\x38\x0a"
+                         "\x67\x62\xaf\xfd\x85\x9f\x0a\x55"
+                         "\xa5\x20\xc5\x60\xe4\x68\x53\xa4"
+                         "\x0e\x2e\x65\xe3\xe4\x0c\x30\x7c"
+                         "\x1c\x01\x4f\x55\xa9\x13\xeb\x25"
+                         "\x21\x87\xbc\xd3\xe7\x67\x4f\x38"
+                         "\xa8\x14\x25\x71\xe9\x2e\x4c\x21"
+                         "\x41\x82\x0c\x45\x39\x35\xa8\x75"
+                         "\x03\x29\x01\x84\x8c\xab\x48\xbe"
+                         "\x11\x56\x22\x67\xb7\x67\x1a\x09"
+                         "\xa1\x72\x25\x41\x3c\x39\x65\x80"
+                         "\x7d\x2f\xf8\x2c\x73\x04\x58\x9d"
+                         "\xdd\x16\x8b\x63\x70\x4e\xc5\x17"
+                         "\x21\xe0\x84\x51\x4b\x6f\x05\x52"
+                         "\xe3\x63\x34\xfa\xa4\xaf\x33\x20"
+                         "\xc1\xae\x32\xc4\xb8\x2b\xdb\x76"
+                         "\xd9\x02\x31\x2f\xa3\xc6\xd0\x7b"
+                         "\xaf\x1b\x84\xe3\x9b\xbf\xa6\xe0"
+                         "\xb8\x8a\x13\x88\x71\xf4\x11\xa5"
+                         "\xe9\xa9\x10\x33\xe0\xbe\x49\x89"
+                         "\x41\x22\xf5\x9d\x80\x3e\x3b\x76"
+                         "\x01\x16\x50\x6e\x7c\x6a\x81\xe9"
+                         "\x13\x2c\xde\xb2\x5f\x79\xba\xb2"
+                         "\xb1\x75\xae\xd2\x07\x98\x4b\x69"
+                         "\xae\x7d\x5b\x90\xc2\x6c\xe6\x98"
+                         "\xd3\x4c\xa1\xa3\x9c\xc9\x33\x6a"
+                         "\x0d\x23\xb1\x79\x25\x13\x4b\xe5"
+                         "\xaf\x93\x20\x5c\x7f\x06\x7a\x34"
+                         "\x0b\x78\xe3\x67\x26\xe0\xad\x95"
+                         "\xc5\x4e\x26\x22\xcf\x73\x77\x62"
+                         "\x3e\x10\xd7\x90\x4b\x52\x1c\xc9"
+                         "\xef\x38\x52\x18\x0e\x29\x7e\xef"
+                         "\x34\xfe\x31\x95\xc5\xbc\xa8\xe2"
+                         "\xa8\x4e\x9f\xea\xa6\xf0\xfe\x5d"
+                         "\xc5\x39\x86\xed\x2f\x6d\xa0\xfe"
+                         "\x96\xcd\x41\x10\x78\x4e\x0c\xc9"
+                         "\xc3\x6d\x0f\xb7\xe8\xe0\x62\xab"
+                         "\x8b\xf1\x21\x89\xa1\x12\xaa\xfa"
+                         "\x9d\x70\xbe\x4c\xa8\x98\x89\x01"
+                         "\xb9\xe2\x61\xde\x0c\x4a\x0b\xaa"
+                         "\x89\xf5\x14\x79\x18\x8f\x3b\x0d"
+                         "\x21\x17\xf8\x59\x15\x24\x64\x22"
+                         "\x57\x48\x80\xd5\x3d\x92\x30\x07"
+                         "\xd9\xa1\x4a\x23\x16\x43\x48\x0e"
+                         "\x2b\x2d\x1b\x87\xef\x7e\xbd\xfa"
+                         "\x49\xbc\x7e\x68\x6e\xa8\x46\x95"
+                         "\xad\x5e\xfe\x0a\xa8\xd3\x1a\x5d"
+                         "\x6b\x84\xf3\x00\xba\x52\x05\x02"
+                         "\xe3\x96\x4e\xb6\x79\x3f\x43\xd3"
+                         "\x4d\x3f\xd6\xab\x0a\xc4\x75\x2d"
+                         "\xd1\x08\xc3\x6a\xc8\x37\x29\xa0"
+                         "\xcc\x9a\x05\xdd\x5c\xe1\xff\x66"
+                         "\xf2\x7a\x1d\xf2\xaf\xa9\x48\x89"
+                         "\xf5\x21\x0f\x02\x48\x83\x74\xbf"
+                         "\x2e\xe6\x93\x7b\xa0\xf4\xb1\x2b"
+                         "\xb1\x02\x0a\x5c\x79\x19\x3b\x75"
+                         "\xb7\x16\xd8\x12\x5c\xcd\x7d\x4e"
+                         "\xd5\xc6\x99\xcc\x4e\x6c\x94\x95",
+               .ilen   = 512,
+               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"
+                         "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\x60\x61\x62\x63\x64\x65\x66\x67"
+                         "\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f"
+                         "\x70\x71\x72\x73\x74\x75\x76\x77"
+                         "\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f"
+                         "\x80\x81\x82\x83\x84\x85\x86\x87"
+                         "\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f"
+                         "\x90\x91\x92\x93\x94\x95\x96\x97"
+                         "\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf"
+                         "\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7"
+                         "\xe8\xe9\xea\xeb\xec\xed\xee\xef"
+                         "\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7"
+                         "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
+               .rlen   = 512,
+       },
 };
 
 /*
index 0bc0cb7..de473ef 100644 (file)
@@ -115,10 +115,7 @@ static int __init tx4939_rng_probe(struct platform_device *dev)
        rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL);
        if (!rngdev)
                return -ENOMEM;
-       if (!devm_request_mem_region(&dev->dev, r->start, resource_size(r),
-                                    dev_name(&dev->dev)))
-               return -EBUSY;
-       rngdev->base = devm_ioremap(&dev->dev, r->start, resource_size(r));
+       rngdev->base = devm_request_and_ioremap(&dev->dev, r);
        if (!rngdev->base)
                return -EBUSY;
 
index 6d16b4b..e707979 100644 (file)
@@ -293,4 +293,15 @@ config CRYPTO_DEV_S5P
          Select this to offload Samsung S5PV210 or S5PC110 from AES
          algorithms execution.
 
+config CRYPTO_DEV_TEGRA_AES
+       tristate "Support for TEGRA AES hw engine"
+       depends on ARCH_TEGRA
+       select CRYPTO_AES
+       help
+         TEGRA processors have AES module accelerator. Select this if you
+         want to use the TEGRA module for AES algorithms.
+
+         To compile this driver as a module, choose M here: the module
+         will be called tegra-aes.
+
 endif # CRYPTO_HW
index 53ea501..f3e64ea 100644 (file)
@@ -13,3 +13,4 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
 obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
 obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
 obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
+obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
index e73cf2e..534a364 100644 (file)
@@ -1844,6 +1844,25 @@ static struct caam_alg_template driver_algs[] = {
                .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,
        },
        {
+               .name = "authenc(hmac(sha224),cbc(aes))",
+               .driver_name = "authenc-hmac-sha224-cbc-aes-caam",
+               .blocksize = AES_BLOCK_SIZE,
+               .template_aead = {
+                       .setkey = aead_setkey,
+                       .setauthsize = aead_setauthsize,
+                       .encrypt = aead_encrypt,
+                       .decrypt = aead_decrypt,
+                       .givencrypt = aead_givencrypt,
+                       .geniv = "<built-in>",
+                       .ivsize = AES_BLOCK_SIZE,
+                       .maxauthsize = SHA224_DIGEST_SIZE,
+                       },
+               .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,
+               .class2_alg_type = OP_ALG_ALGSEL_SHA224 |
+                                  OP_ALG_AAI_HMAC_PRECOMP,
+               .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,
+       },
+       {
                .name = "authenc(hmac(sha256),cbc(aes))",
                .driver_name = "authenc-hmac-sha256-cbc-aes-caam",
                .blocksize = AES_BLOCK_SIZE,
@@ -1864,6 +1883,26 @@ static struct caam_alg_template driver_algs[] = {
                .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,
        },
        {
+               .name = "authenc(hmac(sha384),cbc(aes))",
+               .driver_name = "authenc-hmac-sha384-cbc-aes-caam",
+               .blocksize = AES_BLOCK_SIZE,
+               .template_aead = {
+                       .setkey = aead_setkey,
+                       .setauthsize = aead_setauthsize,
+                       .encrypt = aead_encrypt,
+                       .decrypt = aead_decrypt,
+                       .givencrypt = aead_givencrypt,
+                       .geniv = "<built-in>",
+                       .ivsize = AES_BLOCK_SIZE,
+                       .maxauthsize = SHA384_DIGEST_SIZE,
+                       },
+               .class1_alg_type = OP_ALG_ALGSEL_AES | OP_ALG_AAI_CBC,
+               .class2_alg_type = OP_ALG_ALGSEL_SHA384 |
+                                  OP_ALG_AAI_HMAC_PRECOMP,
+               .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,
+       },
+
+       {
                .name = "authenc(hmac(sha512),cbc(aes))",
                .driver_name = "authenc-hmac-sha512-cbc-aes-caam",
                .blocksize = AES_BLOCK_SIZE,
@@ -1922,6 +1961,25 @@ static struct caam_alg_template driver_algs[] = {
                .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,
        },
        {
+               .name = "authenc(hmac(sha224),cbc(des3_ede))",
+               .driver_name = "authenc-hmac-sha224-cbc-des3_ede-caam",
+               .blocksize = DES3_EDE_BLOCK_SIZE,
+               .template_aead = {
+                       .setkey = aead_setkey,
+                       .setauthsize = aead_setauthsize,
+                       .encrypt = aead_encrypt,
+                       .decrypt = aead_decrypt,
+                       .givencrypt = aead_givencrypt,
+                       .geniv = "<built-in>",
+                       .ivsize = DES3_EDE_BLOCK_SIZE,
+                       .maxauthsize = SHA224_DIGEST_SIZE,
+                       },
+               .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,
+               .class2_alg_type = OP_ALG_ALGSEL_SHA224 |
+                                  OP_ALG_AAI_HMAC_PRECOMP,
+               .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,
+       },
+       {
                .name = "authenc(hmac(sha256),cbc(des3_ede))",
                .driver_name = "authenc-hmac-sha256-cbc-des3_ede-caam",
                .blocksize = DES3_EDE_BLOCK_SIZE,
@@ -1942,6 +2000,25 @@ static struct caam_alg_template driver_algs[] = {
                .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,
        },
        {
+               .name = "authenc(hmac(sha384),cbc(des3_ede))",
+               .driver_name = "authenc-hmac-sha384-cbc-des3_ede-caam",
+               .blocksize = DES3_EDE_BLOCK_SIZE,
+               .template_aead = {
+                       .setkey = aead_setkey,
+                       .setauthsize = aead_setauthsize,
+                       .encrypt = aead_encrypt,
+                       .decrypt = aead_decrypt,
+                       .givencrypt = aead_givencrypt,
+                       .geniv = "<built-in>",
+                       .ivsize = DES3_EDE_BLOCK_SIZE,
+                       .maxauthsize = SHA384_DIGEST_SIZE,
+                       },
+               .class1_alg_type = OP_ALG_ALGSEL_3DES | OP_ALG_AAI_CBC,
+               .class2_alg_type = OP_ALG_ALGSEL_SHA384 |
+                                  OP_ALG_AAI_HMAC_PRECOMP,
+               .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,
+       },
+       {
                .name = "authenc(hmac(sha512),cbc(des3_ede))",
                .driver_name = "authenc-hmac-sha512-cbc-des3_ede-caam",
                .blocksize = DES3_EDE_BLOCK_SIZE,
@@ -2000,6 +2077,25 @@ static struct caam_alg_template driver_algs[] = {
                .alg_op = OP_ALG_ALGSEL_SHA1 | OP_ALG_AAI_HMAC,
        },
        {
+               .name = "authenc(hmac(sha224),cbc(des))",
+               .driver_name = "authenc-hmac-sha224-cbc-des-caam",
+               .blocksize = DES_BLOCK_SIZE,
+               .template_aead = {
+                       .setkey = aead_setkey,
+                       .setauthsize = aead_setauthsize,
+                       .encrypt = aead_encrypt,
+                       .decrypt = aead_decrypt,
+                       .givencrypt = aead_givencrypt,
+                       .geniv = "<built-in>",
+                       .ivsize = DES_BLOCK_SIZE,
+                       .maxauthsize = SHA224_DIGEST_SIZE,
+                       },
+               .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,
+               .class2_alg_type = OP_ALG_ALGSEL_SHA224 |
+                                  OP_ALG_AAI_HMAC_PRECOMP,
+               .alg_op = OP_ALG_ALGSEL_SHA224 | OP_ALG_AAI_HMAC,
+       },
+       {
                .name = "authenc(hmac(sha256),cbc(des))",
                .driver_name = "authenc-hmac-sha256-cbc-des-caam",
                .blocksize = DES_BLOCK_SIZE,
@@ -2020,6 +2116,25 @@ static struct caam_alg_template driver_algs[] = {
                .alg_op = OP_ALG_ALGSEL_SHA256 | OP_ALG_AAI_HMAC,
        },
        {
+               .name = "authenc(hmac(sha384),cbc(des))",
+               .driver_name = "authenc-hmac-sha384-cbc-des-caam",
+               .blocksize = DES_BLOCK_SIZE,
+               .template_aead = {
+                       .setkey = aead_setkey,
+                       .setauthsize = aead_setauthsize,
+                       .encrypt = aead_encrypt,
+                       .decrypt = aead_decrypt,
+                       .givencrypt = aead_givencrypt,
+                       .geniv = "<built-in>",
+                       .ivsize = DES_BLOCK_SIZE,
+                       .maxauthsize = SHA384_DIGEST_SIZE,
+                       },
+               .class1_alg_type = OP_ALG_ALGSEL_DES | OP_ALG_AAI_CBC,
+               .class2_alg_type = OP_ALG_ALGSEL_SHA384 |
+                                  OP_ALG_AAI_HMAC_PRECOMP,
+               .alg_op = OP_ALG_ALGSEL_SHA384 | OP_ALG_AAI_HMAC,
+       },
+       {
                .name = "authenc(hmac(sha512),cbc(des))",
                .driver_name = "authenc-hmac-sha512-cbc-des-caam",
                .blocksize = DES_BLOCK_SIZE,
@@ -2205,7 +2320,8 @@ static struct caam_crypto_alg *caam_alg_alloc(struct device *ctrldev,
        alg->cra_blocksize = template->blocksize;
        alg->cra_alignmask = 0;
        alg->cra_ctxsize = sizeof(struct caam_ctx);
-       alg->cra_flags = CRYPTO_ALG_ASYNC | template->type;
+       alg->cra_flags = CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                        template->type;
        switch (template->type) {
        case CRYPTO_ALG_TYPE_ABLKCIPHER:
                alg->cra_type = &crypto_ablkcipher_type;
@@ -2285,12 +2401,12 @@ static int __init caam_algapi_init(void)
                        dev_warn(ctrldev, "%s alg registration failed\n",
                                t_alg->crypto_alg.cra_driver_name);
                        kfree(t_alg);
-               } else {
+               } else
                        list_add_tail(&t_alg->entry, &priv->alg_list);
-                       dev_info(ctrldev, "%s\n",
-                                t_alg->crypto_alg.cra_driver_name);
-               }
        }
+       if (!list_empty(&priv->alg_list))
+               dev_info(ctrldev, "%s algorithms registered in /proc/crypto\n",
+                        (char *)of_get_property(dev_node, "compatible", NULL));
 
        return err;
 }
index 8ae3ba2..c5f61c5 100644 (file)
@@ -46,7 +46,7 @@ static int caam_remove(struct platform_device *pdev)
 /* Probe routine for CAAM top (controller) level */
 static int caam_probe(struct platform_device *pdev)
 {
-       int d, ring, rspec;
+       int ring, rspec;
        struct device *dev;
        struct device_node *nprop, *np;
        struct caam_ctrl __iomem *ctrl;
index 219d09c..f3e36c8 100644 (file)
@@ -393,7 +393,8 @@ static struct crypto_alg geode_cbc_alg = {
        .cra_driver_name        =       "cbc-aes-geode",
        .cra_priority           =       400,
        .cra_flags                      =       CRYPTO_ALG_TYPE_BLKCIPHER |
-                                                       CRYPTO_ALG_NEED_FALLBACK,
+                                               CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                               CRYPTO_ALG_NEED_FALLBACK,
        .cra_init                       =       fallback_init_blk,
        .cra_exit                       =       fallback_exit_blk,
        .cra_blocksize          =       AES_MIN_BLOCK_SIZE,
@@ -479,7 +480,8 @@ static struct crypto_alg geode_ecb_alg = {
        .cra_driver_name        =       "ecb-aes-geode",
        .cra_priority           =       400,
        .cra_flags                      =       CRYPTO_ALG_TYPE_BLKCIPHER |
-                                                       CRYPTO_ALG_NEED_FALLBACK,
+                                               CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                               CRYPTO_ALG_NEED_FALLBACK,
        .cra_init                       =       fallback_init_blk,
        .cra_exit                       =       fallback_exit_blk,
        .cra_blocksize          =       AES_MIN_BLOCK_SIZE,
index 76368f9..c9c4bef 100644 (file)
@@ -2494,7 +2494,8 @@ static int hifn_alg_alloc(struct hifn_device *dev, struct hifn_alg_template *t)
                 t->drv_name, dev->name);
 
        alg->alg.cra_priority = 300;
-       alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
+       alg->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                               CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC;
        alg->alg.cra_blocksize = t->bsize;
        alg->alg.cra_ctxsize = sizeof(struct hifn_context);
        alg->alg.cra_alignmask = 0;
index 4c20c5b..0053d7e 100644 (file)
@@ -265,7 +265,7 @@ static int setup_crypt_desc(void)
        BUILD_BUG_ON(sizeof(struct crypt_ctl) != 64);
        crypt_virt = dma_alloc_coherent(dev,
                        NPE_QLEN * sizeof(struct crypt_ctl),
-                       &crypt_phys, GFP_KERNEL);
+                       &crypt_phys, GFP_ATOMIC);
        if (!crypt_virt)
                return -ENOMEM;
        memset(crypt_virt, 0, NPE_QLEN * sizeof(struct crypt_ctl));
@@ -1449,6 +1449,7 @@ static int __init ixp_module_init(void)
                        /* block ciphers */
                        cra->cra_type = &crypto_ablkcipher_type;
                        cra->cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY |
                                         CRYPTO_ALG_ASYNC;
                        if (!cra->cra_ablkcipher.setkey)
                                cra->cra_ablkcipher.setkey = ablk_setkey;
@@ -1461,6 +1462,7 @@ static int __init ixp_module_init(void)
                        /* authenc */
                        cra->cra_type = &crypto_aead_type;
                        cra->cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                        CRYPTO_ALG_KERN_DRIVER_ONLY |
                                         CRYPTO_ALG_ASYNC;
                        cra->cra_aead.setkey = aead_setkey;
                        cra->cra_aead.setauthsize = aead_setauthsize;
index 0d40cf6..e6ecc5f 100644 (file)
@@ -899,7 +899,8 @@ struct crypto_alg mv_aes_alg_ecb = {
        .cra_name               = "ecb(aes)",
        .cra_driver_name        = "mv-ecb-aes",
        .cra_priority   = 300,
-       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                         CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
        .cra_blocksize  = 16,
        .cra_ctxsize    = sizeof(struct mv_ctx),
        .cra_alignmask  = 0,
@@ -921,7 +922,8 @@ struct crypto_alg mv_aes_alg_cbc = {
        .cra_name               = "cbc(aes)",
        .cra_driver_name        = "mv-cbc-aes",
        .cra_priority   = 300,
-       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+       .cra_flags      = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                         CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
        .cra_blocksize  = AES_BLOCK_SIZE,
        .cra_ctxsize    = sizeof(struct mv_ctx),
        .cra_alignmask  = 0,
@@ -953,7 +955,8 @@ struct ahash_alg mv_sha1_alg = {
                          .cra_driver_name = "mv-sha1",
                          .cra_priority = 300,
                          .cra_flags =
-                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
+                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                         CRYPTO_ALG_NEED_FALLBACK,
                          .cra_blocksize = SHA1_BLOCK_SIZE,
                          .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),
                          .cra_init = mv_cra_hash_sha1_init,
@@ -977,7 +980,8 @@ struct ahash_alg mv_hmac_sha1_alg = {
                          .cra_driver_name = "mv-hmac-sha1",
                          .cra_priority = 300,
                          .cra_flags =
-                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
+                         CRYPTO_ALG_ASYNC | CRYPTO_ALG_KERN_DRIVER_ONLY |
+                         CRYPTO_ALG_NEED_FALLBACK,
                          .cra_blocksize = SHA1_BLOCK_SIZE,
                          .cra_ctxsize = sizeof(struct mv_tfm_hash_ctx),
                          .cra_init = mv_cra_hash_hmac_sha1_init,
index 8944dab..67b97c5 100644 (file)
@@ -1402,7 +1402,8 @@ static int __devinit __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl)
        snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s", tmpl->name);
        snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s-n2", tmpl->drv_name);
        alg->cra_priority = N2_CRA_PRIORITY;
-       alg->cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
+       alg->cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                        CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC;
        alg->cra_blocksize = tmpl->block_size;
        p->enc_type = tmpl->enc_type;
        alg->cra_ctxsize = sizeof(struct n2_cipher_context);
@@ -1493,7 +1494,9 @@ static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl)
        snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", tmpl->name);
        snprintf(base->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s-n2", tmpl->name);
        base->cra_priority = N2_CRA_PRIORITY;
-       base->cra_flags = CRYPTO_ALG_TYPE_AHASH | CRYPTO_ALG_NEED_FALLBACK;
+       base->cra_flags = CRYPTO_ALG_TYPE_AHASH |
+                         CRYPTO_ALG_KERN_DRIVER_ONLY |
+                         CRYPTO_ALG_NEED_FALLBACK;
        base->cra_blocksize = tmpl->block_size;
        base->cra_ctxsize = sizeof(struct n2_hash_ctx);
        base->cra_module = THIS_MODULE;
index 5b970d9..63e57b5 100644 (file)
@@ -756,7 +756,9 @@ static struct crypto_alg algs[] = {
        .cra_name               = "ecb(aes)",
        .cra_driver_name        = "ecb-aes-omap",
        .cra_priority           = 100,
-       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                 CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                 CRYPTO_ALG_ASYNC,
        .cra_blocksize          = AES_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct omap_aes_ctx),
        .cra_alignmask          = 0,
@@ -776,7 +778,9 @@ static struct crypto_alg algs[] = {
        .cra_name               = "cbc(aes)",
        .cra_driver_name        = "cbc-aes-omap",
        .cra_priority           = 100,
-       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                 CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                 CRYPTO_ALG_ASYNC,
        .cra_blocksize          = AES_BLOCK_SIZE,
        .cra_ctxsize            = sizeof(struct omap_aes_ctx),
        .cra_alignmask          = 0,
index 6399a8f..a3fd6fc 100644 (file)
@@ -953,6 +953,7 @@ static struct ahash_alg algs[] = {
                .cra_driver_name        = "omap-sha1",
                .cra_priority           = 100,
                .cra_flags              = CRYPTO_ALG_TYPE_AHASH |
+                                               CRYPTO_ALG_KERN_DRIVER_ONLY |
                                                CRYPTO_ALG_ASYNC |
                                                CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
@@ -975,6 +976,7 @@ static struct ahash_alg algs[] = {
                .cra_driver_name        = "omap-md5",
                .cra_priority           = 100,
                .cra_flags              = CRYPTO_ALG_TYPE_AHASH |
+                                               CRYPTO_ALG_KERN_DRIVER_ONLY |
                                                CRYPTO_ALG_ASYNC |
                                                CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
@@ -998,6 +1000,7 @@ static struct ahash_alg algs[] = {
                .cra_driver_name        = "omap-hmac-sha1",
                .cra_priority           = 100,
                .cra_flags              = CRYPTO_ALG_TYPE_AHASH |
+                                               CRYPTO_ALG_KERN_DRIVER_ONLY |
                                                CRYPTO_ALG_ASYNC |
                                                CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
@@ -1022,6 +1025,7 @@ static struct ahash_alg algs[] = {
                .cra_driver_name        = "omap-hmac-md5",
                .cra_priority           = 100,
                .cra_flags              = CRYPTO_ALG_TYPE_AHASH |
+                                               CRYPTO_ALG_KERN_DRIVER_ONLY |
                                                CRYPTO_ALG_ASYNC |
                                                CRYPTO_ALG_NEED_FALLBACK,
                .cra_blocksize          = SHA1_BLOCK_SIZE,
index 58480d0..410a03c 100644 (file)
@@ -1322,6 +1322,7 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_driver_name = "cbc-aes-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                    CRYPTO_ALG_KERN_DRIVER_ONLY |
                                     CRYPTO_ALG_ASYNC |
                                     CRYPTO_ALG_NEED_FALLBACK,
                        .cra_blocksize = AES_BLOCK_SIZE,
@@ -1349,6 +1350,7 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_driver_name = "ecb-aes-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
                        .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                               CRYPTO_ALG_KERN_DRIVER_ONLY |
                                CRYPTO_ALG_ASYNC | CRYPTO_ALG_NEED_FALLBACK,
                        .cra_blocksize = AES_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
@@ -1373,7 +1375,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "cbc(des)",
                        .cra_driver_name = "cbc-des-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                        .cra_type = &crypto_ablkcipher_type,
@@ -1398,7 +1402,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "ecb(des)",
                        .cra_driver_name = "ecb-des-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                        .cra_type = &crypto_ablkcipher_type,
@@ -1422,7 +1428,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "cbc(des3_ede)",
                        .cra_driver_name = "cbc-des3-ede-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                        .cra_type = &crypto_ablkcipher_type,
@@ -1447,7 +1455,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "ecb(des3_ede)",
                        .cra_driver_name = "ecb-des3-ede-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                        .cra_type = &crypto_ablkcipher_type,
@@ -1472,7 +1482,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "authenc(hmac(sha1),cbc(aes))",
                        .cra_driver_name = "authenc-hmac-sha1-cbc-aes-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                        .cra_type = &crypto_aead_type,
@@ -1500,7 +1512,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "authenc(hmac(sha256),cbc(aes))",
                        .cra_driver_name = "authenc-hmac-sha256-cbc-aes-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                        .cra_type = &crypto_aead_type,
@@ -1527,7 +1541,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "authenc(hmac(md5),cbc(aes))",
                        .cra_driver_name = "authenc-hmac-md5-cbc-aes-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = AES_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                        .cra_type = &crypto_aead_type,
@@ -1554,7 +1570,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "authenc(hmac(sha1),cbc(des3_ede))",
                        .cra_driver_name = "authenc-hmac-sha1-cbc-3des-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                        .cra_type = &crypto_aead_type,
@@ -1582,7 +1600,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "authenc(hmac(sha256),cbc(des3_ede))",
                        .cra_driver_name = "authenc-hmac-sha256-cbc-3des-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                        .cra_type = &crypto_aead_type,
@@ -1609,7 +1629,9 @@ static struct spacc_alg ipsec_engine_algs[] = {
                        .cra_name = "authenc(hmac(md5),cbc(des3_ede))",
                        .cra_driver_name = "authenc-hmac-md5-cbc-3des-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_AEAD |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = DES3_EDE_BLOCK_SIZE,
                        .cra_ctxsize = sizeof(struct spacc_aead_ctx),
                        .cra_type = &crypto_aead_type,
@@ -1639,7 +1661,9 @@ static struct spacc_alg l2_engine_algs[] = {
                        .cra_name = "f8(kasumi)",
                        .cra_driver_name = "f8-kasumi-picoxcell",
                        .cra_priority = SPACC_CRYPTO_ALG_PRIORITY,
-                       .cra_flags = CRYPTO_ALG_TYPE_GIVCIPHER | CRYPTO_ALG_ASYNC,
+                       .cra_flags = CRYPTO_ALG_TYPE_GIVCIPHER |
+                                       CRYPTO_ALG_ASYNC |
+                                       CRYPTO_ALG_KERN_DRIVER_ONLY,
                        .cra_blocksize = 8,
                        .cra_ctxsize = sizeof(struct spacc_ablk_ctx),
                        .cra_type = &crypto_ablkcipher_type,
index 3376bca..bc986f8 100644 (file)
@@ -518,7 +518,8 @@ static struct crypto_alg algs[] = {
                .cra_driver_name        = "ecb-aes-s5p",
                .cra_priority           = 100,
                .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                                         CRYPTO_ALG_ASYNC,
+                                         CRYPTO_ALG_ASYNC |
+                                         CRYPTO_ALG_KERN_DRIVER_ONLY,
                .cra_blocksize          = AES_BLOCK_SIZE,
                .cra_ctxsize            = sizeof(struct s5p_aes_ctx),
                .cra_alignmask          = 0x0f,
@@ -538,7 +539,8 @@ static struct crypto_alg algs[] = {
                .cra_driver_name        = "cbc-aes-s5p",
                .cra_priority           = 100,
                .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                                         CRYPTO_ALG_ASYNC,
+                                         CRYPTO_ALG_ASYNC |
+                                         CRYPTO_ALG_KERN_DRIVER_ONLY,
                .cra_blocksize          = AES_BLOCK_SIZE,
                .cra_ctxsize            = sizeof(struct s5p_aes_ctx),
                .cra_alignmask          = 0x0f,
index 2d8c789..dc641c7 100644 (file)
@@ -2648,6 +2648,7 @@ static struct talitos_crypto_alg *talitos_alg_alloc(struct device *dev,
        alg->cra_priority = TALITOS_CRA_PRIORITY;
        alg->cra_alignmask = 0;
        alg->cra_ctxsize = sizeof(struct talitos_ctx);
+       alg->cra_flags |= CRYPTO_ALG_KERN_DRIVER_ONLY;
 
        t_alg->dev = dev;
 
diff --git a/drivers/crypto/tegra-aes.c b/drivers/crypto/tegra-aes.c
new file mode 100644 (file)
index 0000000..422a976
--- /dev/null
@@ -0,0 +1,1096 @@
+/*
+ * drivers/crypto/tegra-aes.c
+ *
+ * Driver for NVIDIA Tegra AES hardware engine residing inside the
+ * Bit Stream Engine for Video (BSEV) hardware block.
+ *
+ * The programming sequence for this engine is with the help
+ * of commands which travel via a command queue residing between the
+ * CPU and the BSEV block. The BSEV engine has an internal RAM (VRAM)
+ * where the final input plaintext, keys and the IV have to be copied
+ * before starting the encrypt/decrypt operation.
+ *
+ * Copyright (c) 2010, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/scatterlist.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+#include <linux/mutex.h>
+#include <linux/interrupt.h>
+#include <linux/completion.h>
+#include <linux/workqueue.h>
+
+#include <mach/clk.h>
+
+#include <crypto/scatterwalk.h>
+#include <crypto/aes.h>
+#include <crypto/internal/rng.h>
+
+#include "tegra-aes.h"
+
+#define FLAGS_MODE_MASK                        0x00FF
+#define FLAGS_ENCRYPT                  BIT(0)
+#define FLAGS_CBC                      BIT(1)
+#define FLAGS_GIV                      BIT(2)
+#define FLAGS_RNG                      BIT(3)
+#define FLAGS_OFB                      BIT(4)
+#define FLAGS_NEW_KEY                  BIT(5)
+#define FLAGS_NEW_IV                   BIT(6)
+#define FLAGS_INIT                     BIT(7)
+#define FLAGS_FAST                     BIT(8)
+#define FLAGS_BUSY                     9
+
+/*
+ * Defines AES engine Max process bytes size in one go, which takes 1 msec.
+ * AES engine spends about 176 cycles/16-bytes or 11 cycles/byte
+ * The duration CPU can use the BSE to 1 msec, then the number of available
+ * cycles of AVP/BSE is 216K. In this duration, AES can process 216/11 ~= 19KB
+ * Based on this AES_HW_DMA_BUFFER_SIZE_BYTES is configured to 16KB.
+ */
+#define AES_HW_DMA_BUFFER_SIZE_BYTES 0x4000
+
+/*
+ * The key table length is 64 bytes
+ * (This includes first upto 32 bytes key + 16 bytes original initial vector
+ * and 16 bytes updated initial vector)
+ */
+#define AES_HW_KEY_TABLE_LENGTH_BYTES 64
+
+/*
+ * The memory being used is divides as follows:
+ * 1. Key - 32 bytes
+ * 2. Original IV - 16 bytes
+ * 3. Updated IV - 16 bytes
+ * 4. Key schedule - 256 bytes
+ *
+ * 1+2+3 constitute the hw key table.
+ */
+#define AES_HW_IV_SIZE 16
+#define AES_HW_KEYSCHEDULE_LEN 256
+#define AES_IVKEY_SIZE (AES_HW_KEY_TABLE_LENGTH_BYTES + AES_HW_KEYSCHEDULE_LEN)
+
+/* Define commands required for AES operation */
+enum {
+       CMD_BLKSTARTENGINE = 0x0E,
+       CMD_DMASETUP = 0x10,
+       CMD_DMACOMPLETE = 0x11,
+       CMD_SETTABLE = 0x15,
+       CMD_MEMDMAVD = 0x22,
+};
+
+/* Define sub-commands */
+enum {
+       SUBCMD_VRAM_SEL = 0x1,
+       SUBCMD_CRYPTO_TABLE_SEL = 0x3,
+       SUBCMD_KEY_TABLE_SEL = 0x8,
+};
+
+/* memdma_vd command */
+#define MEMDMA_DIR_DTOVRAM             0 /* sdram -> vram */
+#define MEMDMA_DIR_VTODRAM             1 /* vram -> sdram */
+#define MEMDMA_DIR_SHIFT               25
+#define MEMDMA_NUM_WORDS_SHIFT         12
+
+/* command queue bit shifts */
+enum {
+       CMDQ_KEYTABLEADDR_SHIFT = 0,
+       CMDQ_KEYTABLEID_SHIFT = 17,
+       CMDQ_VRAMSEL_SHIFT = 23,
+       CMDQ_TABLESEL_SHIFT = 24,
+       CMDQ_OPCODE_SHIFT = 26,
+};
+
+/*
+ * The secure key slot contains a unique secure key generated
+ * and loaded by the bootloader. This slot is marked as non-accessible
+ * to the kernel.
+ */
+#define SSK_SLOT_NUM           4
+
+#define AES_NR_KEYSLOTS                8
+#define TEGRA_AES_QUEUE_LENGTH 50
+#define DEFAULT_RNG_BLK_SZ     16
+
+/* The command queue depth */
+#define AES_HW_MAX_ICQ_LENGTH  5
+
+struct tegra_aes_slot {
+       struct list_head node;
+       int slot_num;
+};
+
+static struct tegra_aes_slot ssk = {
+       .slot_num = SSK_SLOT_NUM,
+};
+
+struct tegra_aes_reqctx {
+       unsigned long mode;
+};
+
+struct tegra_aes_dev {
+       struct device *dev;
+       void __iomem *io_base;
+       dma_addr_t ivkey_phys_base;
+       void __iomem *ivkey_base;
+       struct clk *aes_clk;
+       struct tegra_aes_ctx *ctx;
+       int irq;
+       unsigned long flags;
+       struct completion op_complete;
+       u32 *buf_in;
+       dma_addr_t dma_buf_in;
+       u32 *buf_out;
+       dma_addr_t dma_buf_out;
+       u8 *iv;
+       u8 dt[DEFAULT_RNG_BLK_SZ];
+       int ivlen;
+       u64 ctr;
+       spinlock_t lock;
+       struct crypto_queue queue;
+       struct tegra_aes_slot *slots;
+       struct ablkcipher_request *req;
+       size_t total;
+       struct scatterlist *in_sg;
+       size_t in_offset;
+       struct scatterlist *out_sg;
+       size_t out_offset;
+};
+
+static struct tegra_aes_dev *aes_dev;
+
+struct tegra_aes_ctx {
+       struct tegra_aes_dev *dd;
+       unsigned long flags;
+       struct tegra_aes_slot *slot;
+       u8 key[AES_MAX_KEY_SIZE];
+       size_t keylen;
+};
+
+static struct tegra_aes_ctx rng_ctx = {
+       .flags = FLAGS_NEW_KEY,
+       .keylen = AES_KEYSIZE_128,
+};
+
+/* keep registered devices data here */
+static struct list_head dev_list;
+static DEFINE_SPINLOCK(list_lock);
+static DEFINE_MUTEX(aes_lock);
+
+static void aes_workqueue_handler(struct work_struct *work);
+static DECLARE_WORK(aes_work, aes_workqueue_handler);
+static struct workqueue_struct *aes_wq;
+
+extern unsigned long long tegra_chip_uid(void);
+
+static inline u32 aes_readl(struct tegra_aes_dev *dd, u32 offset)
+{
+       return readl(dd->io_base + offset);
+}
+
+static inline void aes_writel(struct tegra_aes_dev *dd, u32 val, u32 offset)
+{
+       writel(val, dd->io_base + offset);
+}
+
+static int aes_start_crypt(struct tegra_aes_dev *dd, u32 in_addr, u32 out_addr,
+       int nblocks, int mode, bool upd_iv)
+{
+       u32 cmdq[AES_HW_MAX_ICQ_LENGTH];
+       int i, eng_busy, icq_empty, ret;
+       u32 value;
+
+       /* reset all the interrupt bits */
+       aes_writel(dd, 0xFFFFFFFF, TEGRA_AES_INTR_STATUS);
+
+       /* enable error, dma xfer complete interrupts */
+       aes_writel(dd, 0x33, TEGRA_AES_INT_ENB);
+
+       cmdq[0] = CMD_DMASETUP << CMDQ_OPCODE_SHIFT;
+       cmdq[1] = in_addr;
+       cmdq[2] = CMD_BLKSTARTENGINE << CMDQ_OPCODE_SHIFT | (nblocks-1);
+       cmdq[3] = CMD_DMACOMPLETE << CMDQ_OPCODE_SHIFT;
+
+       value = aes_readl(dd, TEGRA_AES_CMDQUE_CONTROL);
+       /* access SDRAM through AHB */
+       value &= ~TEGRA_AES_CMDQ_CTRL_SRC_STM_SEL_FIELD;
+       value &= ~TEGRA_AES_CMDQ_CTRL_DST_STM_SEL_FIELD;
+       value |= TEGRA_AES_CMDQ_CTRL_SRC_STM_SEL_FIELD |
+                TEGRA_AES_CMDQ_CTRL_DST_STM_SEL_FIELD |
+                TEGRA_AES_CMDQ_CTRL_ICMDQEN_FIELD;
+       aes_writel(dd, value, TEGRA_AES_CMDQUE_CONTROL);
+       dev_dbg(dd->dev, "cmd_q_ctrl=0x%x", value);
+
+       value = (0x1 << TEGRA_AES_SECURE_INPUT_ALG_SEL_SHIFT) |
+               ((dd->ctx->keylen * 8) <<
+                       TEGRA_AES_SECURE_INPUT_KEY_LEN_SHIFT) |
+               ((u32)upd_iv << TEGRA_AES_SECURE_IV_SELECT_SHIFT);
+
+       if (mode & FLAGS_CBC) {
+               value |= ((((mode & FLAGS_ENCRYPT) ? 2 : 3)
+                               << TEGRA_AES_SECURE_XOR_POS_SHIFT) |
+                       (((mode & FLAGS_ENCRYPT) ? 2 : 3)
+                               << TEGRA_AES_SECURE_VCTRAM_SEL_SHIFT) |
+                       ((mode & FLAGS_ENCRYPT) ? 1 : 0)
+                               << TEGRA_AES_SECURE_CORE_SEL_SHIFT);
+       } else if (mode & FLAGS_OFB) {
+               value |= ((TEGRA_AES_SECURE_XOR_POS_FIELD) |
+                       (2 << TEGRA_AES_SECURE_INPUT_SEL_SHIFT) |
+                       (TEGRA_AES_SECURE_CORE_SEL_FIELD));
+       } else if (mode & FLAGS_RNG) {
+               value |= (((mode & FLAGS_ENCRYPT) ? 1 : 0)
+                               << TEGRA_AES_SECURE_CORE_SEL_SHIFT |
+                         TEGRA_AES_SECURE_RNG_ENB_FIELD);
+       } else {
+               value |= (((mode & FLAGS_ENCRYPT) ? 1 : 0)
+                               << TEGRA_AES_SECURE_CORE_SEL_SHIFT);
+       }
+
+       dev_dbg(dd->dev, "secure_in_sel=0x%x", value);
+       aes_writel(dd, value, TEGRA_AES_SECURE_INPUT_SELECT);
+
+       aes_writel(dd, out_addr, TEGRA_AES_SECURE_DEST_ADDR);
+       INIT_COMPLETION(dd->op_complete);
+
+       for (i = 0; i < AES_HW_MAX_ICQ_LENGTH - 1; i++) {
+               do {
+                       value = aes_readl(dd, TEGRA_AES_INTR_STATUS);
+                       eng_busy = value & TEGRA_AES_ENGINE_BUSY_FIELD;
+                       icq_empty = value & TEGRA_AES_ICQ_EMPTY_FIELD;
+               } while (eng_busy & (!icq_empty));
+               aes_writel(dd, cmdq[i], TEGRA_AES_ICMDQUE_WR);
+       }
+
+       ret = wait_for_completion_timeout(&dd->op_complete,
+                                         msecs_to_jiffies(150));
+       if (ret == 0) {
+               dev_err(dd->dev, "timed out (0x%x)\n",
+                       aes_readl(dd, TEGRA_AES_INTR_STATUS));
+               return -ETIMEDOUT;
+       }
+
+       aes_writel(dd, cmdq[AES_HW_MAX_ICQ_LENGTH - 1], TEGRA_AES_ICMDQUE_WR);
+       return 0;
+}
+
+static void aes_release_key_slot(struct tegra_aes_slot *slot)
+{
+       if (slot->slot_num == SSK_SLOT_NUM)
+               return;
+
+       spin_lock(&list_lock);
+       list_add_tail(&slot->node, &dev_list);
+       slot = NULL;
+       spin_unlock(&list_lock);
+}
+
+static struct tegra_aes_slot *aes_find_key_slot(void)
+{
+       struct tegra_aes_slot *slot = NULL;
+       struct list_head *new_head;
+       int empty;
+
+       spin_lock(&list_lock);
+       empty = list_empty(&dev_list);
+       if (!empty) {
+               slot = list_entry(&dev_list, struct tegra_aes_slot, node);
+               new_head = dev_list.next;
+               list_del(&dev_list);
+               dev_list.next = new_head->next;
+               dev_list.prev = NULL;
+       }
+       spin_unlock(&list_lock);
+
+       return slot;
+}
+
+static int aes_set_key(struct tegra_aes_dev *dd)
+{
+       u32 value, cmdq[2];
+       struct tegra_aes_ctx *ctx = dd->ctx;
+       int eng_busy, icq_empty, dma_busy;
+       bool use_ssk = false;
+
+       /* use ssk? */
+       if (!dd->ctx->slot) {
+               dev_dbg(dd->dev, "using ssk");
+               dd->ctx->slot = &ssk;
+               use_ssk = true;
+       }
+
+       /* enable key schedule generation in hardware */
+       value = aes_readl(dd, TEGRA_AES_SECURE_CONFIG_EXT);
+       value &= ~TEGRA_AES_SECURE_KEY_SCH_DIS_FIELD;
+       aes_writel(dd, value, TEGRA_AES_SECURE_CONFIG_EXT);
+
+       /* select the key slot */
+       value = aes_readl(dd, TEGRA_AES_SECURE_CONFIG);
+       value &= ~TEGRA_AES_SECURE_KEY_INDEX_FIELD;
+       value |= (ctx->slot->slot_num << TEGRA_AES_SECURE_KEY_INDEX_SHIFT);
+       aes_writel(dd, value, TEGRA_AES_SECURE_CONFIG);
+
+       if (use_ssk)
+               return 0;
+
+       /* copy the key table from sdram to vram */
+       cmdq[0] = CMD_MEMDMAVD << CMDQ_OPCODE_SHIFT |
+               MEMDMA_DIR_DTOVRAM << MEMDMA_DIR_SHIFT |
+               AES_HW_KEY_TABLE_LENGTH_BYTES / sizeof(u32) <<
+                       MEMDMA_NUM_WORDS_SHIFT;
+       cmdq[1] = (u32)dd->ivkey_phys_base;
+
+       aes_writel(dd, cmdq[0], TEGRA_AES_ICMDQUE_WR);
+       aes_writel(dd, cmdq[1], TEGRA_AES_ICMDQUE_WR);
+
+       do {
+               value = aes_readl(dd, TEGRA_AES_INTR_STATUS);
+               eng_busy = value & TEGRA_AES_ENGINE_BUSY_FIELD;
+               icq_empty = value & TEGRA_AES_ICQ_EMPTY_FIELD;
+               dma_busy = value & TEGRA_AES_DMA_BUSY_FIELD;
+       } while (eng_busy & (!icq_empty) & dma_busy);
+
+       /* settable command to get key into internal registers */
+       value = CMD_SETTABLE << CMDQ_OPCODE_SHIFT |
+               SUBCMD_CRYPTO_TABLE_SEL << CMDQ_TABLESEL_SHIFT |
+               SUBCMD_VRAM_SEL << CMDQ_VRAMSEL_SHIFT |
+               (SUBCMD_KEY_TABLE_SEL | ctx->slot->slot_num) <<
+                       CMDQ_KEYTABLEID_SHIFT;
+       aes_writel(dd, value, TEGRA_AES_ICMDQUE_WR);
+
+       do {
+               value = aes_readl(dd, TEGRA_AES_INTR_STATUS);
+               eng_busy = value & TEGRA_AES_ENGINE_BUSY_FIELD;
+               icq_empty = value & TEGRA_AES_ICQ_EMPTY_FIELD;
+       } while (eng_busy & (!icq_empty));
+
+       return 0;
+}
+
+static int tegra_aes_handle_req(struct tegra_aes_dev *dd)
+{
+       struct crypto_async_request *async_req, *backlog;
+       struct crypto_ablkcipher *tfm;
+       struct tegra_aes_ctx *ctx;
+       struct tegra_aes_reqctx *rctx;
+       struct ablkcipher_request *req;
+       unsigned long flags;
+       int dma_max = AES_HW_DMA_BUFFER_SIZE_BYTES;
+       int ret = 0, nblocks, total;
+       int count = 0;
+       dma_addr_t addr_in, addr_out;
+       struct scatterlist *in_sg, *out_sg;
+
+       if (!dd)
+               return -EINVAL;
+
+       spin_lock_irqsave(&dd->lock, flags);
+       backlog = crypto_get_backlog(&dd->queue);
+       async_req = crypto_dequeue_request(&dd->queue);
+       if (!async_req)
+               clear_bit(FLAGS_BUSY, &dd->flags);
+       spin_unlock_irqrestore(&dd->lock, flags);
+
+       if (!async_req)
+               return -ENODATA;
+
+       if (backlog)
+               backlog->complete(backlog, -EINPROGRESS);
+
+       req = ablkcipher_request_cast(async_req);
+
+       dev_dbg(dd->dev, "%s: get new req\n", __func__);
+
+       if (!req->src || !req->dst)
+               return -EINVAL;
+
+       /* take mutex to access the aes hw */
+       mutex_lock(&aes_lock);
+
+       /* assign new request to device */
+       dd->req = req;
+       dd->total = req->nbytes;
+       dd->in_offset = 0;
+       dd->in_sg = req->src;
+       dd->out_offset = 0;
+       dd->out_sg = req->dst;
+
+       in_sg = dd->in_sg;
+       out_sg = dd->out_sg;
+
+       total = dd->total;
+
+       tfm = crypto_ablkcipher_reqtfm(req);
+       rctx = ablkcipher_request_ctx(req);
+       ctx = crypto_ablkcipher_ctx(tfm);
+       rctx->mode &= FLAGS_MODE_MASK;
+       dd->flags = (dd->flags & ~FLAGS_MODE_MASK) | rctx->mode;
+
+       dd->iv = (u8 *)req->info;
+       dd->ivlen = crypto_ablkcipher_ivsize(tfm);
+
+       /* assign new context to device */
+       ctx->dd = dd;
+       dd->ctx = ctx;
+
+       if (ctx->flags & FLAGS_NEW_KEY) {
+               /* copy the key */
+               memcpy(dd->ivkey_base, ctx->key, ctx->keylen);
+               memset(dd->ivkey_base + ctx->keylen, 0, AES_HW_KEY_TABLE_LENGTH_BYTES - ctx->keylen);
+               aes_set_key(dd);
+               ctx->flags &= ~FLAGS_NEW_KEY;
+       }
+
+       if (((dd->flags & FLAGS_CBC) || (dd->flags & FLAGS_OFB)) && dd->iv) {
+               /* set iv to the aes hw slot
+                * Hw generates updated iv only after iv is set in slot.
+                * So key and iv is passed asynchronously.
+                */
+               memcpy(dd->buf_in, dd->iv, dd->ivlen);
+
+               ret = aes_start_crypt(dd, (u32)dd->dma_buf_in,
+                                     dd->dma_buf_out, 1, FLAGS_CBC, false);
+               if (ret < 0) {
+                       dev_err(dd->dev, "aes_start_crypt fail(%d)\n", ret);
+                       goto out;
+               }
+       }
+
+       while (total) {
+               dev_dbg(dd->dev, "remain: %d\n", total);
+               ret = dma_map_sg(dd->dev, in_sg, 1, DMA_TO_DEVICE);
+               if (!ret) {
+                       dev_err(dd->dev, "dma_map_sg() error\n");
+                       goto out;
+               }
+
+               ret = dma_map_sg(dd->dev, out_sg, 1, DMA_FROM_DEVICE);
+               if (!ret) {
+                       dev_err(dd->dev, "dma_map_sg() error\n");
+                       dma_unmap_sg(dd->dev, dd->in_sg,
+                               1, DMA_TO_DEVICE);
+                       goto out;
+               }
+
+               addr_in = sg_dma_address(in_sg);
+               addr_out = sg_dma_address(out_sg);
+               dd->flags |= FLAGS_FAST;
+               count = min_t(int, sg_dma_len(in_sg), dma_max);
+               WARN_ON(sg_dma_len(in_sg) != sg_dma_len(out_sg));
+               nblocks = DIV_ROUND_UP(count, AES_BLOCK_SIZE);
+
+               ret = aes_start_crypt(dd, addr_in, addr_out, nblocks,
+                       dd->flags, true);
+
+               dma_unmap_sg(dd->dev, out_sg, 1, DMA_FROM_DEVICE);
+               dma_unmap_sg(dd->dev, in_sg, 1, DMA_TO_DEVICE);
+
+               if (ret < 0) {
+                       dev_err(dd->dev, "aes_start_crypt fail(%d)\n", ret);
+                       goto out;
+               }
+               dd->flags &= ~FLAGS_FAST;
+
+               dev_dbg(dd->dev, "out: copied %d\n", count);
+               total -= count;
+               in_sg = sg_next(in_sg);
+               out_sg = sg_next(out_sg);
+               WARN_ON(((total != 0) && (!in_sg || !out_sg)));
+       }
+
+out:
+       mutex_unlock(&aes_lock);
+
+       dd->total = total;
+
+       if (dd->req->base.complete)
+               dd->req->base.complete(&dd->req->base, ret);
+
+       dev_dbg(dd->dev, "%s: exit\n", __func__);
+       return ret;
+}
+
+static int tegra_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
+                           unsigned int keylen)
+{
+       struct tegra_aes_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+       struct tegra_aes_dev *dd = aes_dev;
+       struct tegra_aes_slot *key_slot;
+
+       if ((keylen != AES_KEYSIZE_128) && (keylen != AES_KEYSIZE_192) &&
+               (keylen != AES_KEYSIZE_256)) {
+               dev_err(dd->dev, "unsupported key size\n");
+               crypto_ablkcipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+               return -EINVAL;
+       }
+
+       dev_dbg(dd->dev, "keylen: %d\n", keylen);
+
+       ctx->dd = dd;
+
+       if (key) {
+               if (!ctx->slot) {
+                       key_slot = aes_find_key_slot();
+                       if (!key_slot) {
+                               dev_err(dd->dev, "no empty slot\n");
+                               return -ENOMEM;
+                       }
+
+                       ctx->slot = key_slot;
+               }
+
+               memcpy(ctx->key, key, keylen);
+               ctx->keylen = keylen;
+       }
+
+       ctx->flags |= FLAGS_NEW_KEY;
+       dev_dbg(dd->dev, "done\n");
+       return 0;
+}
+
+static void aes_workqueue_handler(struct work_struct *work)
+{
+       struct tegra_aes_dev *dd = aes_dev;
+       int ret;
+
+       ret = clk_enable(dd->aes_clk);
+       if (ret)
+               BUG_ON("clock enable failed");
+
+       /* empty the crypto queue and then return */
+       do {
+               ret = tegra_aes_handle_req(dd);
+       } while (!ret);
+
+       clk_disable(dd->aes_clk);
+}
+
+static irqreturn_t aes_irq(int irq, void *dev_id)
+{
+       struct tegra_aes_dev *dd = (struct tegra_aes_dev *)dev_id;
+       u32 value = aes_readl(dd, TEGRA_AES_INTR_STATUS);
+       int busy = test_bit(FLAGS_BUSY, &dd->flags);
+
+       if (!busy) {
+               dev_dbg(dd->dev, "spurious interrupt\n");
+               return IRQ_NONE;
+       }
+
+       dev_dbg(dd->dev, "irq_stat: 0x%x\n", value);
+       if (value & TEGRA_AES_INT_ERROR_MASK)
+               aes_writel(dd, TEGRA_AES_INT_ERROR_MASK, TEGRA_AES_INTR_STATUS);
+
+       if (!(value & TEGRA_AES_ENGINE_BUSY_FIELD))
+               complete(&dd->op_complete);
+       else
+               return IRQ_NONE;
+
+       return IRQ_HANDLED;
+}
+
+static int tegra_aes_crypt(struct ablkcipher_request *req, unsigned long mode)
+{
+       struct tegra_aes_reqctx *rctx = ablkcipher_request_ctx(req);
+       struct tegra_aes_dev *dd = aes_dev;
+       unsigned long flags;
+       int err = 0;
+       int busy;
+
+       dev_dbg(dd->dev, "nbytes: %d, enc: %d, cbc: %d, ofb: %d\n",
+               req->nbytes, !!(mode & FLAGS_ENCRYPT),
+               !!(mode & FLAGS_CBC), !!(mode & FLAGS_OFB));
+
+       rctx->mode = mode;
+
+       spin_lock_irqsave(&dd->lock, flags);
+       err = ablkcipher_enqueue_request(&dd->queue, req);
+       busy = test_and_set_bit(FLAGS_BUSY, &dd->flags);
+       spin_unlock_irqrestore(&dd->lock, flags);
+
+       if (!busy)
+               queue_work(aes_wq, &aes_work);
+
+       return err;
+}
+
+static int tegra_aes_ecb_encrypt(struct ablkcipher_request *req)
+{
+       return tegra_aes_crypt(req, FLAGS_ENCRYPT);
+}
+
+static int tegra_aes_ecb_decrypt(struct ablkcipher_request *req)
+{
+       return tegra_aes_crypt(req, 0);
+}
+
+static int tegra_aes_cbc_encrypt(struct ablkcipher_request *req)
+{
+       return tegra_aes_crypt(req, FLAGS_ENCRYPT | FLAGS_CBC);
+}
+
+static int tegra_aes_cbc_decrypt(struct ablkcipher_request *req)
+{
+       return tegra_aes_crypt(req, FLAGS_CBC);
+}
+
+static int tegra_aes_ofb_encrypt(struct ablkcipher_request *req)
+{
+       return tegra_aes_crypt(req, FLAGS_ENCRYPT | FLAGS_OFB);
+}
+
+static int tegra_aes_ofb_decrypt(struct ablkcipher_request *req)
+{
+       return tegra_aes_crypt(req, FLAGS_OFB);
+}
+
+static int tegra_aes_get_random(struct crypto_rng *tfm, u8 *rdata,
+                               unsigned int dlen)
+{
+       struct tegra_aes_dev *dd = aes_dev;
+       struct tegra_aes_ctx *ctx = &rng_ctx;
+       int ret, i;
+       u8 *dest = rdata, *dt = dd->dt;
+
+       /* take mutex to access the aes hw */
+       mutex_lock(&aes_lock);
+
+       ret = clk_enable(dd->aes_clk);
+       if (ret)
+               return ret;
+
+       ctx->dd = dd;
+       dd->ctx = ctx;
+       dd->flags = FLAGS_ENCRYPT | FLAGS_RNG;
+
+       memcpy(dd->buf_in, dt, DEFAULT_RNG_BLK_SZ);
+
+       ret = aes_start_crypt(dd, (u32)dd->dma_buf_in,
+                             (u32)dd->dma_buf_out, 1, dd->flags, true);
+       if (ret < 0) {
+               dev_err(dd->dev, "aes_start_crypt fail(%d)\n", ret);
+               dlen = ret;
+               goto out;
+       }
+       memcpy(dest, dd->buf_out, dlen);
+
+       /* update the DT */
+       for (i = DEFAULT_RNG_BLK_SZ - 1; i >= 0; i--) {
+               dt[i] += 1;
+               if (dt[i] != 0)
+                       break;
+       }
+
+out:
+       clk_disable(dd->aes_clk);
+       mutex_unlock(&aes_lock);
+
+       dev_dbg(dd->dev, "%s: done\n", __func__);
+       return dlen;
+}
+
+static int tegra_aes_rng_reset(struct crypto_rng *tfm, u8 *seed,
+                              unsigned int slen)
+{
+       struct tegra_aes_dev *dd = aes_dev;
+       struct tegra_aes_ctx *ctx = &rng_ctx;
+       struct tegra_aes_slot *key_slot;
+       struct timespec ts;
+       int ret = 0;
+       u64 nsec, tmp[2];
+       u8 *dt;
+
+       if (!ctx || !dd) {
+               dev_err(dd->dev, "ctx=0x%x, dd=0x%x\n",
+                       (unsigned int)ctx, (unsigned int)dd);
+               return -EINVAL;
+       }
+
+       if (slen < (DEFAULT_RNG_BLK_SZ + AES_KEYSIZE_128)) {
+               dev_err(dd->dev, "seed size invalid");
+               return -ENOMEM;
+       }
+
+       /* take mutex to access the aes hw */
+       mutex_lock(&aes_lock);
+
+       if (!ctx->slot) {
+               key_slot = aes_find_key_slot();
+               if (!key_slot) {
+                       dev_err(dd->dev, "no empty slot\n");
+                       mutex_unlock(&aes_lock);
+                       return -ENOMEM;
+               }
+               ctx->slot = key_slot;
+       }
+
+       ctx->dd = dd;
+       dd->ctx = ctx;
+       dd->ctr = 0;
+
+       ctx->keylen = AES_KEYSIZE_128;
+       ctx->flags |= FLAGS_NEW_KEY;
+
+       /* copy the key to the key slot */
+       memcpy(dd->ivkey_base, seed + DEFAULT_RNG_BLK_SZ, AES_KEYSIZE_128);
+       memset(dd->ivkey_base + AES_KEYSIZE_128, 0, AES_HW_KEY_TABLE_LENGTH_BYTES - AES_KEYSIZE_128);
+
+       dd->iv = seed;
+       dd->ivlen = slen;
+
+       dd->flags = FLAGS_ENCRYPT | FLAGS_RNG;
+
+       ret = clk_enable(dd->aes_clk);
+       if (ret)
+               return ret;
+
+       aes_set_key(dd);
+
+       /* set seed to the aes hw slot */
+       memcpy(dd->buf_in, dd->iv, DEFAULT_RNG_BLK_SZ);
+       ret = aes_start_crypt(dd, (u32)dd->dma_buf_in,
+                             dd->dma_buf_out, 1, FLAGS_CBC, false);
+       if (ret < 0) {
+               dev_err(dd->dev, "aes_start_crypt fail(%d)\n", ret);
+               goto out;
+       }
+
+       if (dd->ivlen >= (2 * DEFAULT_RNG_BLK_SZ + AES_KEYSIZE_128)) {
+               dt = dd->iv + DEFAULT_RNG_BLK_SZ + AES_KEYSIZE_128;
+       } else {
+               getnstimeofday(&ts);
+               nsec = timespec_to_ns(&ts);
+               do_div(nsec, 1000);
+               nsec ^= dd->ctr << 56;
+               dd->ctr++;
+               tmp[0] = nsec;
+               tmp[1] = tegra_chip_uid();
+               dt = (u8 *)tmp;
+       }
+       memcpy(dd->dt, dt, DEFAULT_RNG_BLK_SZ);
+
+out:
+       clk_disable(dd->aes_clk);
+       mutex_unlock(&aes_lock);
+
+       dev_dbg(dd->dev, "%s: done\n", __func__);
+       return ret;
+}
+
+static int tegra_aes_cra_init(struct crypto_tfm *tfm)
+{
+       tfm->crt_ablkcipher.reqsize = sizeof(struct tegra_aes_reqctx);
+
+       return 0;
+}
+
+void tegra_aes_cra_exit(struct crypto_tfm *tfm)
+{
+       struct tegra_aes_ctx *ctx =
+               crypto_ablkcipher_ctx((struct crypto_ablkcipher *)tfm);
+
+       if (ctx && ctx->slot)
+               aes_release_key_slot(ctx->slot);
+}
+
+static struct crypto_alg algs[] = {
+       {
+               .cra_name = "ecb(aes)",
+               .cra_driver_name = "ecb-aes-tegra",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = AES_BLOCK_SIZE,
+               .cra_alignmask = 3,
+               .cra_type = &crypto_ablkcipher_type,
+               .cra_u.ablkcipher = {
+                       .min_keysize = AES_MIN_KEY_SIZE,
+                       .max_keysize = AES_MAX_KEY_SIZE,
+                       .setkey = tegra_aes_setkey,
+                       .encrypt = tegra_aes_ecb_encrypt,
+                       .decrypt = tegra_aes_ecb_decrypt,
+               },
+       }, {
+               .cra_name = "cbc(aes)",
+               .cra_driver_name = "cbc-aes-tegra",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = AES_BLOCK_SIZE,
+               .cra_alignmask = 3,
+               .cra_type = &crypto_ablkcipher_type,
+               .cra_u.ablkcipher = {
+                       .min_keysize = AES_MIN_KEY_SIZE,
+                       .max_keysize = AES_MAX_KEY_SIZE,
+                       .ivsize = AES_MIN_KEY_SIZE,
+                       .setkey = tegra_aes_setkey,
+                       .encrypt = tegra_aes_cbc_encrypt,
+                       .decrypt = tegra_aes_cbc_decrypt,
+               }
+       }, {
+               .cra_name = "ofb(aes)",
+               .cra_driver_name = "ofb-aes-tegra",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = AES_BLOCK_SIZE,
+               .cra_alignmask = 3,
+               .cra_type = &crypto_ablkcipher_type,
+               .cra_u.ablkcipher = {
+                       .min_keysize = AES_MIN_KEY_SIZE,
+                       .max_keysize = AES_MAX_KEY_SIZE,
+                       .ivsize = AES_MIN_KEY_SIZE,
+                       .setkey = tegra_aes_setkey,
+                       .encrypt = tegra_aes_ofb_encrypt,
+                       .decrypt = tegra_aes_ofb_decrypt,
+               }
+       }, {
+               .cra_name = "ansi_cprng",
+               .cra_driver_name = "rng-aes-tegra",
+               .cra_flags = CRYPTO_ALG_TYPE_RNG,
+               .cra_ctxsize = sizeof(struct tegra_aes_ctx),
+               .cra_type = &crypto_rng_type,
+               .cra_u.rng = {
+                       .rng_make_random = tegra_aes_get_random,
+                       .rng_reset = tegra_aes_rng_reset,
+                       .seedsize = AES_KEYSIZE_128 + (2 * DEFAULT_RNG_BLK_SZ),
+               }
+       }
+};
+
+static int tegra_aes_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct tegra_aes_dev *dd;
+       struct resource *res;
+       int err = -ENOMEM, i = 0, j;
+
+       dd = devm_kzalloc(dev, sizeof(struct tegra_aes_dev), GFP_KERNEL);
+       if (dd == NULL) {
+               dev_err(dev, "unable to alloc data struct.\n");
+               return err;
+       }
+
+       dd->dev = dev;
+       platform_set_drvdata(pdev, dd);
+
+       dd->slots = devm_kzalloc(dev, sizeof(struct tegra_aes_slot) *
+                                AES_NR_KEYSLOTS, GFP_KERNEL);
+       if (dd->slots == NULL) {
+               dev_err(dev, "unable to alloc slot struct.\n");
+               goto out;
+       }
+
+       spin_lock_init(&dd->lock);
+       crypto_init_queue(&dd->queue, TEGRA_AES_QUEUE_LENGTH);
+
+       /* Get the module base address */
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!res) {
+               dev_err(dev, "invalid resource type: base\n");
+               err = -ENODEV;
+               goto out;
+       }
+
+       if (!devm_request_mem_region(&pdev->dev, res->start,
+                                    resource_size(res),
+                                    dev_name(&pdev->dev))) {
+               dev_err(&pdev->dev, "Couldn't request MEM resource\n");
+               return -ENODEV;
+       }
+
+       dd->io_base = devm_ioremap(dev, res->start, resource_size(res));
+       if (!dd->io_base) {
+               dev_err(dev, "can't ioremap register space\n");
+               err = -ENOMEM;
+               goto out;
+       }
+
+       /* Initialize the vde clock */
+       dd->aes_clk = clk_get(dev, "vde");
+       if (IS_ERR(dd->aes_clk)) {
+               dev_err(dev, "iclock intialization failed.\n");
+               err = -ENODEV;
+               goto out;
+       }
+
+       err = clk_set_rate(dd->aes_clk, ULONG_MAX);
+       if (err) {
+               dev_err(dd->dev, "iclk set_rate fail(%d)\n", err);
+               goto out;
+       }
+
+       /*
+        * the foll contiguous memory is allocated as follows -
+        * - hardware key table
+        * - key schedule
+        */
+       dd->ivkey_base = dma_alloc_coherent(dev, AES_HW_KEY_TABLE_LENGTH_BYTES,
+                                           &dd->ivkey_phys_base,
+               GFP_KERNEL);
+       if (!dd->ivkey_base) {
+               dev_err(dev, "can not allocate iv/key buffer\n");
+               err = -ENOMEM;
+               goto out;
+       }
+
+       dd->buf_in = dma_alloc_coherent(dev, AES_HW_DMA_BUFFER_SIZE_BYTES,
+                                       &dd->dma_buf_in, GFP_KERNEL);
+       if (!dd->buf_in) {
+               dev_err(dev, "can not allocate dma-in buffer\n");
+               err = -ENOMEM;
+               goto out;
+       }
+
+       dd->buf_out = dma_alloc_coherent(dev, AES_HW_DMA_BUFFER_SIZE_BYTES,
+                                        &dd->dma_buf_out, GFP_KERNEL);
+       if (!dd->buf_out) {
+               dev_err(dev, "can not allocate dma-out buffer\n");
+               err = -ENOMEM;
+               goto out;
+       }
+
+       init_completion(&dd->op_complete);
+       aes_wq = alloc_workqueue("tegra_aes_wq", WQ_HIGHPRI | WQ_UNBOUND, 1);
+       if (!aes_wq) {
+               dev_err(dev, "alloc_workqueue failed\n");
+               goto out;
+       }
+
+       /* get the irq */
+       res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+       if (!res) {
+               dev_err(dev, "invalid resource type: base\n");
+               err = -ENODEV;
+               goto out;
+       }
+       dd->irq = res->start;
+
+       err = devm_request_irq(dev, dd->irq, aes_irq, IRQF_TRIGGER_HIGH |
+                               IRQF_SHARED, "tegra-aes", dd);
+       if (err) {
+               dev_err(dev, "request_irq failed\n");
+               goto out;
+       }
+
+       mutex_init(&aes_lock);
+       INIT_LIST_HEAD(&dev_list);
+
+       spin_lock_init(&list_lock);
+       spin_lock(&list_lock);
+       for (i = 0; i < AES_NR_KEYSLOTS; i++) {
+               if (i == SSK_SLOT_NUM)
+                       continue;
+               dd->slots[i].slot_num = i;
+               INIT_LIST_HEAD(&dd->slots[i].node);
+               list_add_tail(&dd->slots[i].node, &dev_list);
+       }
+       spin_unlock(&list_lock);
+
+       aes_dev = dd;
+       for (i = 0; i < ARRAY_SIZE(algs); i++) {
+               INIT_LIST_HEAD(&algs[i].cra_list);
+
+               algs[i].cra_priority = 300;
+               algs[i].cra_ctxsize = sizeof(struct tegra_aes_ctx);
+               algs[i].cra_module = THIS_MODULE;
+               algs[i].cra_init = tegra_aes_cra_init;
+               algs[i].cra_exit = tegra_aes_cra_exit;
+
+               err = crypto_register_alg(&algs[i]);
+               if (err)
+                       goto out;
+       }
+
+       dev_info(dev, "registered");
+       return 0;
+
+out:
+       for (j = 0; j < i; j++)
+               crypto_unregister_alg(&algs[j]);
+       if (dd->ivkey_base)
+               dma_free_coherent(dev, AES_HW_KEY_TABLE_LENGTH_BYTES,
+                       dd->ivkey_base, dd->ivkey_phys_base);
+       if (dd->buf_in)
+               dma_free_coherent(dev, AES_HW_DMA_BUFFER_SIZE_BYTES,
+                       dd->buf_in, dd->dma_buf_in);
+       if (dd->buf_out)
+               dma_free_coherent(dev, AES_HW_DMA_BUFFER_SIZE_BYTES,
+                       dd->buf_out, dd->dma_buf_out);
+       if (IS_ERR(dd->aes_clk))
+               clk_put(dd->aes_clk);
+       if (aes_wq)
+               destroy_workqueue(aes_wq);
+       spin_lock(&list_lock);
+       list_del(&dev_list);
+       spin_unlock(&list_lock);
+
+       aes_dev = NULL;
+
+       dev_err(dev, "%s: initialization failed.\n", __func__);
+       return err;
+}
+
+static int __devexit tegra_aes_remove(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct tegra_aes_dev *dd = platform_get_drvdata(pdev);
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(algs); i++)
+               crypto_unregister_alg(&algs[i]);
+
+       cancel_work_sync(&aes_work);
+       destroy_workqueue(aes_wq);
+       spin_lock(&list_lock);
+       list_del(&dev_list);
+       spin_unlock(&list_lock);
+
+       dma_free_coherent(dev, AES_HW_KEY_TABLE_LENGTH_BYTES,
+                         dd->ivkey_base, dd->ivkey_phys_base);
+       dma_free_coherent(dev, AES_HW_DMA_BUFFER_SIZE_BYTES,
+                         dd->buf_in, dd->dma_buf_in);
+       dma_free_coherent(dev, AES_HW_DMA_BUFFER_SIZE_BYTES,
+                         dd->buf_out, dd->dma_buf_out);
+       clk_put(dd->aes_clk);
+       aes_dev = NULL;
+
+       return 0;
+}
+
+static struct of_device_id tegra_aes_of_match[] __devinitdata = {
+       { .compatible = "nvidia,tegra20-aes", },
+       { .compatible = "nvidia,tegra30-aes", },
+       { },
+};
+
+static struct platform_driver tegra_aes_driver = {
+       .probe  = tegra_aes_probe,
+       .remove = __devexit_p(tegra_aes_remove),
+       .driver = {
+               .name   = "tegra-aes",
+               .owner  = THIS_MODULE,
+               .of_match_table = tegra_aes_of_match,
+       },
+};
+
+module_platform_driver(tegra_aes_driver);
+
+MODULE_DESCRIPTION("Tegra AES/OFB/CPRNG hw acceleration support.");
+MODULE_AUTHOR("NVIDIA Corporation");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/crypto/tegra-aes.h b/drivers/crypto/tegra-aes.h
new file mode 100644 (file)
index 0000000..6006333
--- /dev/null
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2010, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __CRYPTODEV_TEGRA_AES_H
+#define __CRYPTODEV_TEGRA_AES_H
+
+#define TEGRA_AES_ICMDQUE_WR                   0x1000
+#define TEGRA_AES_CMDQUE_CONTROL               0x1008
+#define TEGRA_AES_INTR_STATUS                  0x1018
+#define TEGRA_AES_INT_ENB                      0x1040
+#define TEGRA_AES_CONFIG                       0x1044
+#define TEGRA_AES_IRAM_ACCESS_CFG              0x10A0
+#define TEGRA_AES_SECURE_DEST_ADDR             0x1100
+#define TEGRA_AES_SECURE_INPUT_SELECT          0x1104
+#define TEGRA_AES_SECURE_CONFIG                        0x1108
+#define TEGRA_AES_SECURE_CONFIG_EXT            0x110C
+#define TEGRA_AES_SECURE_SECURITY              0x1110
+#define TEGRA_AES_SECURE_HASH_RESULT0          0x1120
+#define TEGRA_AES_SECURE_HASH_RESULT1          0x1124
+#define TEGRA_AES_SECURE_HASH_RESULT2          0x1128
+#define TEGRA_AES_SECURE_HASH_RESULT3          0x112C
+#define TEGRA_AES_SECURE_SEC_SEL0              0x1140
+#define TEGRA_AES_SECURE_SEC_SEL1              0x1144
+#define TEGRA_AES_SECURE_SEC_SEL2              0x1148
+#define TEGRA_AES_SECURE_SEC_SEL3              0x114C
+#define TEGRA_AES_SECURE_SEC_SEL4              0x1150
+#define TEGRA_AES_SECURE_SEC_SEL5              0x1154
+#define TEGRA_AES_SECURE_SEC_SEL6              0x1158
+#define TEGRA_AES_SECURE_SEC_SEL7              0x115C
+
+/* interrupt status reg masks and shifts */
+#define TEGRA_AES_ENGINE_BUSY_FIELD            BIT(0)
+#define TEGRA_AES_ICQ_EMPTY_FIELD              BIT(3)
+#define TEGRA_AES_DMA_BUSY_FIELD               BIT(23)
+
+/* secure select reg masks and shifts */
+#define TEGRA_AES_SECURE_SEL0_KEYREAD_ENB0_FIELD       BIT(0)
+
+/* secure config ext masks and shifts */
+#define TEGRA_AES_SECURE_KEY_SCH_DIS_FIELD     BIT(15)
+
+/* secure config masks and shifts */
+#define TEGRA_AES_SECURE_KEY_INDEX_SHIFT       20
+#define TEGRA_AES_SECURE_KEY_INDEX_FIELD       (0x1F << TEGRA_AES_SECURE_KEY_INDEX_SHIFT)
+#define TEGRA_AES_SECURE_BLOCK_CNT_SHIFT       0
+#define TEGRA_AES_SECURE_BLOCK_CNT_FIELD       (0xFFFFF << TEGRA_AES_SECURE_BLOCK_CNT_SHIFT)
+
+/* stream interface select masks and shifts */
+#define TEGRA_AES_CMDQ_CTRL_UCMDQEN_FIELD      BIT(0)
+#define TEGRA_AES_CMDQ_CTRL_ICMDQEN_FIELD      BIT(1)
+#define TEGRA_AES_CMDQ_CTRL_SRC_STM_SEL_FIELD  BIT(4)
+#define TEGRA_AES_CMDQ_CTRL_DST_STM_SEL_FIELD  BIT(5)
+
+/* config register masks and shifts */
+#define TEGRA_AES_CONFIG_ENDIAN_ENB_FIELD      BIT(10)
+#define TEGRA_AES_CONFIG_MODE_SEL_SHIFT                0
+#define TEGRA_AES_CONFIG_MODE_SEL_FIELD                (0x1F << TEGRA_AES_CONFIG_MODE_SEL_SHIFT)
+
+/* extended config */
+#define TEGRA_AES_SECURE_OFFSET_CNT_SHIFT      24
+#define TEGRA_AES_SECURE_OFFSET_CNT_FIELD      (0xFF << TEGRA_AES_SECURE_OFFSET_CNT_SHIFT)
+#define TEGRA_AES_SECURE_KEYSCHED_GEN_FIELD    BIT(15)
+
+/* init vector select */
+#define TEGRA_AES_SECURE_IV_SELECT_SHIFT       10
+#define TEGRA_AES_SECURE_IV_SELECT_FIELD       BIT(10)
+
+/* secure engine input */
+#define TEGRA_AES_SECURE_INPUT_ALG_SEL_SHIFT   28
+#define TEGRA_AES_SECURE_INPUT_ALG_SEL_FIELD   (0xF << TEGRA_AES_SECURE_INPUT_ALG_SEL_SHIFT)
+#define TEGRA_AES_SECURE_INPUT_KEY_LEN_SHIFT   16
+#define TEGRA_AES_SECURE_INPUT_KEY_LEN_FIELD   (0xFFF << TEGRA_AES_SECURE_INPUT_KEY_LEN_SHIFT)
+#define TEGRA_AES_SECURE_RNG_ENB_FIELD         BIT(11)
+#define TEGRA_AES_SECURE_CORE_SEL_SHIFT                9
+#define TEGRA_AES_SECURE_CORE_SEL_FIELD                BIT(9)
+#define TEGRA_AES_SECURE_VCTRAM_SEL_SHIFT      7
+#define TEGRA_AES_SECURE_VCTRAM_SEL_FIELD      (0x3 << TEGRA_AES_SECURE_VCTRAM_SEL_SHIFT)
+#define TEGRA_AES_SECURE_INPUT_SEL_SHIFT       5
+#define TEGRA_AES_SECURE_INPUT_SEL_FIELD       (0x3 << TEGRA_AES_SECURE_INPUT_SEL_SHIFT)
+#define TEGRA_AES_SECURE_XOR_POS_SHIFT         3
+#define TEGRA_AES_SECURE_XOR_POS_FIELD         (0x3 << TEGRA_AES_SECURE_XOR_POS_SHIFT)
+#define TEGRA_AES_SECURE_HASH_ENB_FIELD                BIT(2)
+#define TEGRA_AES_SECURE_ON_THE_FLY_FIELD      BIT(0)
+
+/* interrupt error mask */
+#define TEGRA_AES_INT_ERROR_MASK               0xFFF000
+
+#endif
index 8a94217..48ce547 100644 (file)
  */
 #define CRYPTO_ALG_INSTANCE            0x00000800
 
+/* Set this bit if the algorithm provided is hardware accelerated but
+ * not available to userspace via instruction set or so.
+ */
+#define CRYPTO_ALG_KERN_DRIVER_ONLY    0x00001000
+
 /*
  * Transform masks and values (for crt_flags).
  */
@@ -309,6 +314,8 @@ struct crypto_alg {
  */
 int crypto_register_alg(struct crypto_alg *alg);
 int crypto_unregister_alg(struct crypto_alg *alg);
+int crypto_register_algs(struct crypto_alg *algs, int count);
+int crypto_unregister_algs(struct crypto_alg *algs, int count);
 
 /*
  * Algorithm query interface.
index 4633b2f..86292be 100644 (file)
@@ -46,7 +46,6 @@ struct padata_priv {
        struct list_head        list;
        struct parallel_data    *pd;
        int                     cb_cpu;
-       int                     seq_nr;
        int                     info;
        void                    (*parallel)(struct padata_priv *padata);
        void                    (*serial)(struct padata_priv *padata);
@@ -116,7 +115,6 @@ struct padata_cpumask {
  * @pinst: padata instance.
  * @pqueue: percpu padata queues used for parallelization.
  * @squeue: percpu padata queues used for serialuzation.
- * @seq_nr: The sequence number that will be attached to the next object.
  * @reorder_objects: Number of objects waiting in the reorder queues.
  * @refcnt: Number of objects holding a reference on this parallel_data.
  * @max_seq_nr:  Maximal used sequence number.
@@ -129,12 +127,12 @@ struct parallel_data {
        struct padata_instance          *pinst;
        struct padata_parallel_queue    __percpu *pqueue;
        struct padata_serial_queue      __percpu *squeue;
-       atomic_t                        seq_nr;
        atomic_t                        reorder_objects;
        atomic_t                        refcnt;
-       unsigned int                    max_seq_nr;
        struct padata_cpumask           cpumask;
        spinlock_t                      lock ____cacheline_aligned;
+       spinlock_t                      seq_lock;
+       unsigned int                    seq_nr;
        unsigned int                    processed;
        struct timer_list               timer;
 };
index b452599..6f10eb2 100644 (file)
@@ -29,7 +29,6 @@
 #include <linux/sysfs.h>
 #include <linux/rcupdate.h>
 
-#define MAX_SEQ_NR (INT_MAX - NR_CPUS)
 #define MAX_OBJ_NUM 1000
 
 static int padata_index_to_cpu(struct parallel_data *pd, int cpu_index)
@@ -43,18 +42,19 @@ static int padata_index_to_cpu(struct parallel_data *pd, int cpu_index)
        return target_cpu;
 }
 
-static int padata_cpu_hash(struct padata_priv *padata)
+static int padata_cpu_hash(struct parallel_data *pd)
 {
        int cpu_index;
-       struct parallel_data *pd;
-
-       pd =  padata->pd;
 
        /*
         * Hash the sequence numbers to the cpus by taking
         * seq_nr mod. number of cpus in use.
         */
-       cpu_index =  padata->seq_nr % cpumask_weight(pd->cpumask.pcpu);
+
+       spin_lock(&pd->seq_lock);
+       cpu_index =  pd->seq_nr % cpumask_weight(pd->cpumask.pcpu);
+       pd->seq_nr++;
+       spin_unlock(&pd->seq_lock);
 
        return padata_index_to_cpu(pd, cpu_index);
 }
@@ -132,12 +132,7 @@ int padata_do_parallel(struct padata_instance *pinst,
        padata->pd = pd;
        padata->cb_cpu = cb_cpu;
 
-       if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
-               atomic_set(&pd->seq_nr, -1);
-
-       padata->seq_nr = atomic_inc_return(&pd->seq_nr);
-
-       target_cpu = padata_cpu_hash(padata);
+       target_cpu = padata_cpu_hash(pd);
        queue = per_cpu_ptr(pd->pqueue, target_cpu);
 
        spin_lock(&queue->parallel.lock);
@@ -173,7 +168,7 @@ EXPORT_SYMBOL(padata_do_parallel);
 static struct padata_priv *padata_get_next(struct parallel_data *pd)
 {
        int cpu, num_cpus;
-       int next_nr, next_index;
+       unsigned int next_nr, next_index;
        struct padata_parallel_queue *queue, *next_queue;
        struct padata_priv *padata;
        struct padata_list *reorder;
@@ -189,14 +184,6 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd)
        cpu = padata_index_to_cpu(pd, next_index);
        next_queue = per_cpu_ptr(pd->pqueue, cpu);
 
-       if (unlikely(next_nr > pd->max_seq_nr)) {
-               next_nr = next_nr - pd->max_seq_nr - 1;
-               next_index = next_nr % num_cpus;
-               cpu = padata_index_to_cpu(pd, next_index);
-               next_queue = per_cpu_ptr(pd->pqueue, cpu);
-               pd->processed = 0;
-       }
-
        padata = NULL;
 
        reorder = &next_queue->reorder;
@@ -205,8 +192,6 @@ static struct padata_priv *padata_get_next(struct parallel_data *pd)
                padata = list_entry(reorder->list.next,
                                    struct padata_priv, list);
 
-               BUG_ON(next_nr != padata->seq_nr);
-
                spin_lock(&reorder->lock);
                list_del_init(&padata->list);
                atomic_dec(&pd->reorder_objects);
@@ -230,6 +215,7 @@ out:
 
 static void padata_reorder(struct parallel_data *pd)
 {
+       int cb_cpu;
        struct padata_priv *padata;
        struct padata_serial_queue *squeue;
        struct padata_instance *pinst = pd->pinst;
@@ -270,13 +256,14 @@ static void padata_reorder(struct parallel_data *pd)
                        return;
                }
 
-               squeue = per_cpu_ptr(pd->squeue, padata->cb_cpu);
+               cb_cpu = padata->cb_cpu;
+               squeue = per_cpu_ptr(pd->squeue, cb_cpu);
 
                spin_lock(&squeue->serial.lock);
                list_add_tail(&padata->list, &squeue->serial.list);
                spin_unlock(&squeue->serial.lock);
 
-               queue_work_on(padata->cb_cpu, pinst->wq, &squeue->work);
+               queue_work_on(cb_cpu, pinst->wq, &squeue->work);
        }
 
        spin_unlock_bh(&pd->lock);
@@ -400,7 +387,7 @@ static void padata_init_squeues(struct parallel_data *pd)
 /* Initialize all percpu queues used by parallel workers */
 static void padata_init_pqueues(struct parallel_data *pd)
 {
-       int cpu_index, num_cpus, cpu;
+       int cpu_index, cpu;
        struct padata_parallel_queue *pqueue;
 
        cpu_index = 0;
@@ -415,9 +402,6 @@ static void padata_init_pqueues(struct parallel_data *pd)
                INIT_WORK(&pqueue->work, padata_parallel_worker);
                atomic_set(&pqueue->num_obj, 0);
        }
-
-       num_cpus = cpumask_weight(pd->cpumask.pcpu);
-       pd->max_seq_nr = num_cpus ? (MAX_SEQ_NR / num_cpus) * num_cpus - 1 : 0;
 }
 
 /* Allocate and initialize the internal cpumask dependend resources. */
@@ -444,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
        padata_init_pqueues(pd);
        padata_init_squeues(pd);
        setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
-       atomic_set(&pd->seq_nr, -1);
+       pd->seq_nr = 0;
        atomic_set(&pd->reorder_objects, 0);
        atomic_set(&pd->refcnt, 0);
        pd->pinst = pinst;