crypto: cryptomgr - Add test infrastructure
Herbert Xu [Thu, 31 Jul 2008 09:08:25 +0000 (17:08 +0800)]
This patch moves the newly created alg_test infrastructure into
cryptomgr.  This shall allow us to use it for testing at algorithm
registrations.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

crypto/Kconfig
crypto/Makefile
crypto/algboss.c [moved from crypto/cryptomgr.c with 94% similarity]
crypto/internal.h
crypto/tcrypt.c
crypto/tcrypt.h
crypto/testmgr.c [new file with mode: 0644]
crypto/testmgr.h [new file with mode: 0644]
include/linux/crypto.h

index 797b9e1..776f90d 100644 (file)
@@ -40,7 +40,9 @@ config CRYPTO_HASH
 
 config CRYPTO_MANAGER
        tristate "Cryptographic algorithm manager"
-       select CRYPTO_ALGAPI
+       select CRYPTO_AEAD
+       select CRYPTO_HASH
+       select CRYPTO_BLKCIPHER
        help
          Create default cryptographic template instantiations such as
          cbc(aes).
@@ -85,9 +87,7 @@ config CRYPTO_AUTHENC
 config CRYPTO_TEST
        tristate "Testing module"
        depends on m
-       select CRYPTO_ALGAPI
-       select CRYPTO_AEAD
-       select CRYPTO_BLKCIPHER
+       select CRYPTO_MANAGER
        help
          Quick & dirty crypto test module.
 
index d4f3ed8..59ab500 100644 (file)
@@ -22,6 +22,8 @@ crypto_hash-objs := hash.o
 crypto_hash-objs += ahash.o
 obj-$(CONFIG_CRYPTO_HASH) += crypto_hash.o
 
+cryptomgr-objs := algboss.o testmgr.o
+
 obj-$(CONFIG_CRYPTO_MANAGER) += cryptomgr.o
 obj-$(CONFIG_CRYPTO_HMAC) += hmac.o
 obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o
similarity index 94%
rename from crypto/cryptomgr.c
rename to crypto/algboss.c
index e5e3cf8..2662ac0 100644 (file)
@@ -206,16 +206,32 @@ static struct notifier_block cryptomgr_notifier = {
 
 static int __init cryptomgr_init(void)
 {
-       return crypto_register_notifier(&cryptomgr_notifier);
+       int err;
+
+       err = testmgr_init();
+       if (err)
+               return err;
+
+       err = crypto_register_notifier(&cryptomgr_notifier);
+       if (err)
+               goto free_testmgr;
+
+       return 0;
+
+free_testmgr:
+       testmgr_exit();
+       return err;
 }
 
 static void __exit cryptomgr_exit(void)
 {
        int err = crypto_unregister_notifier(&cryptomgr_notifier);
        BUG_ON(err);
+
+       testmgr_exit();
 }
 
-module_init(cryptomgr_init);
+subsys_initcall(cryptomgr_init);
 module_exit(cryptomgr_exit);
 
 MODULE_LICENSE("GPL");
index 6d8d213..48cb704 100644 (file)
@@ -108,6 +108,9 @@ int crypto_register_instance(struct crypto_template *tmpl,
 int crypto_register_notifier(struct notifier_block *nb);
 int crypto_unregister_notifier(struct notifier_block *nb);
 
+int __init testmgr_init(void);
+void testmgr_exit(void);
+
 static inline void crypto_alg_put(struct crypto_alg *alg)
 {
        if (atomic_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy)
index ed9d4ee..28a45a1 100644 (file)
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
 #include <linux/string.h>
-#include <linux/crypto.h>
 #include <linux/moduleparam.h>
 #include <linux/jiffies.h>
 #include <linux/timex.h>
  * Need slab memory for testing (size in number of pages).
  */
 #define TVMEMSIZE      4
-#define XBUFSIZE       8
 
 /*
- * Indexes into the xbuf to simulate cross-page access.
- */
-#define IDX1           32
-#define IDX2           32400
-#define IDX3           1
-#define IDX4           8193
-#define IDX5           22222
-#define IDX6           17101
-#define IDX7           27333
-#define IDX8           3000
-
-/*
-* Used by test_cipher()
+* Used by test_cipher_speed()
 */
 #define ENCRYPT 1
 #define DECRYPT 0
 
-struct tcrypt_result {
-       struct completion completion;
-       int err;
-};
-
-struct aead_test_suite {
-       struct {
-               struct aead_testvec *vecs;
-               unsigned int count;
-       } enc, dec;
-};
-
-struct cipher_test_suite {
-       struct {
-               struct cipher_testvec *vecs;
-               unsigned int count;
-       } enc, dec;
-};
-
-struct comp_test_suite {
-       struct {
-               struct comp_testvec *vecs;
-               unsigned int count;
-       } comp, decomp;
-};
-
-struct hash_test_suite {
-       struct hash_testvec *vecs;
-       unsigned int count;
-};
-
-struct alg_test_desc {
-       const char *alg;
-       int (*test)(const struct alg_test_desc *desc, const char *driver,
-                   u32 type, u32 mask);
-
-       union {
-               struct aead_test_suite aead;
-               struct cipher_test_suite cipher;
-               struct comp_test_suite comp;
-               struct hash_test_suite hash;
-       } suite;
-};
-
-static unsigned int IDX[8] = { IDX1, IDX2, IDX3, IDX4, IDX5, IDX6, IDX7, IDX8 };
-
 /*
  * Used by test_cipher_speed()
  */
 static unsigned int sec;
 
 static int mode;
-static char *xbuf[XBUFSIZE];
-static char *axbuf[XBUFSIZE];
 static char *tvmem[TVMEMSIZE];
 
 static char *check[] = {
@@ -119,666 +56,6 @@ static char *check[] = {
        "lzo", "cts", NULL
 };
 
-static void hexdump(unsigned char *buf, unsigned int len)
-{
-       print_hex_dump(KERN_CONT, "", DUMP_PREFIX_OFFSET,
-                       16, 1,
-                       buf, len, false);
-}
-
-static void tcrypt_complete(struct crypto_async_request *req, int err)
-{
-       struct tcrypt_result *res = req->data;
-
-       if (err == -EINPROGRESS)
-               return;
-
-       res->err = err;
-       complete(&res->completion);
-}
-
-static int test_hash(struct crypto_ahash *tfm, struct hash_testvec *template,
-                    unsigned int tcount)
-{
-       const char *algo = crypto_tfm_alg_driver_name(crypto_ahash_tfm(tfm));
-       unsigned int i, j, k, temp;
-       struct scatterlist sg[8];
-       char result[64];
-       struct ahash_request *req;
-       struct tcrypt_result tresult;
-       int ret;
-       void *hash_buff;
-
-       init_completion(&tresult.completion);
-
-       req = ahash_request_alloc(tfm, GFP_KERNEL);
-       if (!req) {
-               printk(KERN_ERR "alg: hash: Failed to allocate request for "
-                      "%s\n", algo);
-               ret = -ENOMEM;
-               goto out_noreq;
-       }
-       ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                  tcrypt_complete, &tresult);
-
-       for (i = 0; i < tcount; i++) {
-               memset(result, 0, 64);
-
-               hash_buff = xbuf[0];
-
-               memcpy(hash_buff, template[i].plaintext, template[i].psize);
-               sg_init_one(&sg[0], hash_buff, template[i].psize);
-
-               if (template[i].ksize) {
-                       crypto_ahash_clear_flags(tfm, ~0);
-                       ret = crypto_ahash_setkey(tfm, template[i].key,
-                                                 template[i].ksize);
-                       if (ret) {
-                               printk(KERN_ERR "alg: hash: setkey failed on "
-                                      "test %d for %s: ret=%d\n", i + 1, algo,
-                                      -ret);
-                               goto out;
-                       }
-               }
-
-               ahash_request_set_crypt(req, sg, result, template[i].psize);
-               ret = crypto_ahash_digest(req);
-               switch (ret) {
-               case 0:
-                       break;
-               case -EINPROGRESS:
-               case -EBUSY:
-                       ret = wait_for_completion_interruptible(
-                               &tresult.completion);
-                       if (!ret && !(ret = tresult.err)) {
-                               INIT_COMPLETION(tresult.completion);
-                               break;
-                       }
-                       /* fall through */
-               default:
-                       printk(KERN_ERR "alg: hash: digest failed on test %d "
-                              "for %s: ret=%d\n", i + 1, algo, -ret);
-                       goto out;
-               }
-
-               if (memcmp(result, template[i].digest,
-                          crypto_ahash_digestsize(tfm))) {
-                       printk(KERN_ERR "alg: hash: Test %d failed for %s\n",
-                              i + 1, algo);
-                       hexdump(result, crypto_ahash_digestsize(tfm));
-                       ret = -EINVAL;
-                       goto out;
-               }
-       }
-
-       j = 0;
-       for (i = 0; i < tcount; i++) {
-               if (template[i].np) {
-                       j++;
-                       memset(result, 0, 64);
-
-                       temp = 0;
-                       sg_init_table(sg, template[i].np);
-                       for (k = 0; k < template[i].np; k++) {
-                               sg_set_buf(&sg[k],
-                                          memcpy(xbuf[IDX[k] >> PAGE_SHIFT] +
-                                                 offset_in_page(IDX[k]),
-                                                 template[i].plaintext + temp,
-                                                 template[i].tap[k]),
-                                          template[i].tap[k]);
-                               temp += template[i].tap[k];
-                       }
-
-                       if (template[i].ksize) {
-                               crypto_ahash_clear_flags(tfm, ~0);
-                               ret = crypto_ahash_setkey(tfm, template[i].key,
-                                                         template[i].ksize);
-
-                               if (ret) {
-                                       printk(KERN_ERR "alg: hash: setkey "
-                                              "failed on chunking test %d "
-                                              "for %s: ret=%d\n", j, algo,
-                                              -ret);
-                                       goto out;
-                               }
-                       }
-
-                       ahash_request_set_crypt(req, sg, result,
-                                               template[i].psize);
-                       ret = crypto_ahash_digest(req);
-                       switch (ret) {
-                       case 0:
-                               break;
-                       case -EINPROGRESS:
-                       case -EBUSY:
-                               ret = wait_for_completion_interruptible(
-                                       &tresult.completion);
-                               if (!ret && !(ret = tresult.err)) {
-                                       INIT_COMPLETION(tresult.completion);
-                                       break;
-                               }
-                               /* fall through */
-                       default:
-                               printk(KERN_ERR "alg: hash: digest failed "
-                                      "on chunking test %d for %s: "
-                                      "ret=%d\n", j, algo, -ret);
-                               goto out;
-                       }
-
-                       if (memcmp(result, template[i].digest,
-                                  crypto_ahash_digestsize(tfm))) {
-                               printk(KERN_ERR "alg: hash: Chunking test %d "
-                                      "failed for %s\n", j, algo);
-                               hexdump(result, crypto_ahash_digestsize(tfm));
-                               ret = -EINVAL;
-                               goto out;
-                       }
-               }
-       }
-
-       ret = 0;
-
-out:
-       ahash_request_free(req);
-out_noreq:
-       return ret;
-}
-
-static int test_aead(struct crypto_aead *tfm, int enc,
-                    struct aead_testvec *template, unsigned int tcount)
-{
-       const char *algo = crypto_tfm_alg_driver_name(crypto_aead_tfm(tfm));
-       unsigned int i, j, k, n, temp;
-       int ret = 0;
-       char *q;
-       char *key;
-       struct aead_request *req;
-       struct scatterlist sg[8];
-       struct scatterlist asg[8];
-       const char *e;
-       struct tcrypt_result result;
-       unsigned int authsize;
-       void *input;
-       void *assoc;
-       char iv[MAX_IVLEN];
-
-       if (enc == ENCRYPT)
-               e = "encryption";
-       else
-               e = "decryption";
-
-       init_completion(&result.completion);
-
-       req = aead_request_alloc(tfm, GFP_KERNEL);
-       if (!req) {
-               printk(KERN_ERR "alg: aead: Failed to allocate request for "
-                      "%s\n", algo);
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       aead_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                 tcrypt_complete, &result);
-
-       for (i = 0, j = 0; i < tcount; i++) {
-               if (!template[i].np) {
-                       j++;
-
-                       /* some tepmplates have no input data but they will
-                        * touch input
-                        */
-                       input = xbuf[0];
-                       assoc = axbuf[0];
-
-                       memcpy(input, template[i].input, template[i].ilen);
-                       memcpy(assoc, template[i].assoc, template[i].alen);
-                       if (template[i].iv)
-                               memcpy(iv, template[i].iv, MAX_IVLEN);
-                       else
-                               memset(iv, 0, MAX_IVLEN);
-
-                       crypto_aead_clear_flags(tfm, ~0);
-                       if (template[i].wk)
-                               crypto_aead_set_flags(
-                                       tfm, CRYPTO_TFM_REQ_WEAK_KEY);
-
-                       key = template[i].key;
-
-                       ret = crypto_aead_setkey(tfm, key,
-                                                template[i].klen);
-                       if (!ret == template[i].fail) {
-                               printk(KERN_ERR "alg: aead: setkey failed on "
-                                      "test %d for %s: flags=%x\n", j, algo,
-                                      crypto_aead_get_flags(tfm));
-                               goto out;
-                       } else if (ret)
-                               continue;
-
-                       authsize = abs(template[i].rlen - template[i].ilen);
-                       ret = crypto_aead_setauthsize(tfm, authsize);
-                       if (ret) {
-                               printk(KERN_ERR "alg: aead: Failed to set "
-                                      "authsize to %u on test %d for %s\n",
-                                      authsize, j, algo);
-                               goto out;
-                       }
-
-                       sg_init_one(&sg[0], input,
-                                   template[i].ilen + (enc ? authsize : 0));
-
-                       sg_init_one(&asg[0], assoc, template[i].alen);
-
-                       aead_request_set_crypt(req, sg, sg,
-                                              template[i].ilen, iv);
-
-                       aead_request_set_assoc(req, asg, template[i].alen);
-
-                       ret = enc ?
-                               crypto_aead_encrypt(req) :
-                               crypto_aead_decrypt(req);
-
-                       switch (ret) {
-                       case 0:
-                               break;
-                       case -EINPROGRESS:
-                       case -EBUSY:
-                               ret = wait_for_completion_interruptible(
-                                       &result.completion);
-                               if (!ret && !(ret = result.err)) {
-                                       INIT_COMPLETION(result.completion);
-                                       break;
-                               }
-                               /* fall through */
-                       default:
-                               printk(KERN_ERR "alg: aead: %s failed on test "
-                                      "%d for %s: ret=%d\n", e, j, algo, -ret);
-                               goto out;
-                       }
-
-                       q = input;
-                       if (memcmp(q, template[i].result, template[i].rlen)) {
-                               printk(KERN_ERR "alg: aead: Test %d failed on "
-                                      "%s for %s\n", j, e, algo);
-                               hexdump(q, template[i].rlen);
-                               ret = -EINVAL;
-                               goto out;
-                       }
-               }
-       }
-
-       for (i = 0, j = 0; i < tcount; i++) {
-               if (template[i].np) {
-                       j++;
-
-                       if (template[i].iv)
-                               memcpy(iv, template[i].iv, MAX_IVLEN);
-                       else
-                               memset(iv, 0, MAX_IVLEN);
-
-                       crypto_aead_clear_flags(tfm, ~0);
-                       if (template[i].wk)
-                               crypto_aead_set_flags(
-                                       tfm, CRYPTO_TFM_REQ_WEAK_KEY);
-                       key = template[i].key;
-
-                       ret = crypto_aead_setkey(tfm, key, template[i].klen);
-                       if (!ret == template[i].fail) {
-                               printk(KERN_ERR "alg: aead: setkey failed on "
-                                      "chunk test %d for %s: flags=%x\n", j,
-                                      algo, crypto_aead_get_flags(tfm));
-                               goto out;
-                       } else if (ret)
-                               continue;
-
-                       authsize = abs(template[i].rlen - template[i].ilen);
-
-                       ret = -EINVAL;
-                       sg_init_table(sg, template[i].np);
-                       for (k = 0, temp = 0; k < template[i].np; k++) {
-                               if (WARN_ON(offset_in_page(IDX[k]) +
-                                           template[i].tap[k] > PAGE_SIZE))
-                                       goto out;
-
-                               q = xbuf[IDX[k] >> PAGE_SHIFT] +
-                                   offset_in_page(IDX[k]);
-
-                               memcpy(q, template[i].input + temp,
-                                      template[i].tap[k]);
-
-                               n = template[i].tap[k];
-                               if (k == template[i].np - 1 && enc)
-                                       n += authsize;
-                               if (offset_in_page(q) + n < PAGE_SIZE)
-                                       q[n] = 0;
-
-                               sg_set_buf(&sg[k], q, template[i].tap[k]);
-                               temp += template[i].tap[k];
-                       }
-
-                       ret = crypto_aead_setauthsize(tfm, authsize);
-                       if (ret) {
-                               printk(KERN_ERR "alg: aead: Failed to set "
-                                      "authsize to %u on chunk test %d for "
-                                      "%s\n", authsize, j, algo);
-                               goto out;
-                       }
-
-                       if (enc) {
-                               if (WARN_ON(sg[k - 1].offset +
-                                           sg[k - 1].length + authsize >
-                                           PAGE_SIZE)) {
-                                       ret = -EINVAL;
-                                       goto out;
-                               }
-
-                               sg[k - 1].length += authsize;
-                       }
-
-                       sg_init_table(asg, template[i].anp);
-                       for (k = 0, temp = 0; k < template[i].anp; k++) {
-                               sg_set_buf(&asg[k],
-                                          memcpy(axbuf[IDX[k] >> PAGE_SHIFT] +
-                                                 offset_in_page(IDX[k]),
-                                                 template[i].assoc + temp,
-                                                 template[i].atap[k]),
-                                          template[i].atap[k]);
-                               temp += template[i].atap[k];
-                       }
-
-                       aead_request_set_crypt(req, sg, sg,
-                                              template[i].ilen,
-                                              iv);
-
-                       aead_request_set_assoc(req, asg, template[i].alen);
-
-                       ret = enc ?
-                               crypto_aead_encrypt(req) :
-                               crypto_aead_decrypt(req);
-
-                       switch (ret) {
-                       case 0:
-                               break;
-                       case -EINPROGRESS:
-                       case -EBUSY:
-                               ret = wait_for_completion_interruptible(
-                                       &result.completion);
-                               if (!ret && !(ret = result.err)) {
-                                       INIT_COMPLETION(result.completion);
-                                       break;
-                               }
-                               /* fall through */
-                       default:
-                               printk(KERN_ERR "alg: aead: %s failed on "
-                                      "chunk test %d for %s: ret=%d\n", e, j,
-                                      algo, -ret);
-                               goto out;
-                       }
-
-                       ret = -EINVAL;
-                       for (k = 0, temp = 0; k < template[i].np; k++) {
-                               q = xbuf[IDX[k] >> PAGE_SHIFT] +
-                                   offset_in_page(IDX[k]);
-
-                               n = template[i].tap[k];
-                               if (k == template[i].np - 1)
-                                       n += enc ? authsize : -authsize;
-
-                               if (memcmp(q, template[i].result + temp, n)) {
-                                       printk(KERN_ERR "alg: aead: Chunk "
-                                              "test %d failed on %s at page "
-                                              "%u for %s\n", j, e, k, algo);
-                                       hexdump(q, n);
-                                       goto out;
-                               }
-
-                               q += n;
-                               if (k == template[i].np - 1 && !enc) {
-                                       if (memcmp(q, template[i].input +
-                                                     temp + n, authsize))
-                                               n = authsize;
-                                       else
-                                               n = 0;
-                               } else {
-                                       for (n = 0; offset_in_page(q + n) &&
-                                                   q[n]; n++)
-                                               ;
-                               }
-                               if (n) {
-                                       printk(KERN_ERR "alg: aead: Result "
-                                              "buffer corruption in chunk "
-                                              "test %d on %s at page %u for "
-                                              "%s: %u bytes:\n", j, e, k,
-                                              algo, n);
-                                       hexdump(q, n);
-                                       goto out;
-                               }
-
-                               temp += template[i].tap[k];
-                       }
-               }
-       }
-
-       ret = 0;
-
-out:
-       aead_request_free(req);
-       return ret;
-}
-
-static int test_cipher(struct crypto_ablkcipher *tfm, int enc,
-                      struct cipher_testvec *template, unsigned int tcount)
-{
-       const char *algo =
-               crypto_tfm_alg_driver_name(crypto_ablkcipher_tfm(tfm));
-       unsigned int i, j, k, n, temp;
-       int ret;
-       char *q;
-       struct ablkcipher_request *req;
-       struct scatterlist sg[8];
-       const char *e;
-       struct tcrypt_result result;
-       void *data;
-       char iv[MAX_IVLEN];
-
-       if (enc == ENCRYPT)
-               e = "encryption";
-       else
-               e = "decryption";
-
-       init_completion(&result.completion);
-
-       req = ablkcipher_request_alloc(tfm, GFP_KERNEL);
-       if (!req) {
-               printk(KERN_ERR "alg: cipher: Failed to allocate request for "
-                      "%s\n", algo);
-               ret = -ENOMEM;
-               goto out;
-       }
-
-       ablkcipher_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
-                                       tcrypt_complete, &result);
-
-       j = 0;
-       for (i = 0; i < tcount; i++) {
-               if (template[i].iv)
-                       memcpy(iv, template[i].iv, MAX_IVLEN);
-               else
-                       memset(iv, 0, MAX_IVLEN);
-
-               if (!(template[i].np)) {
-                       j++;
-
-                       data = xbuf[0];
-                       memcpy(data, template[i].input, template[i].ilen);
-
-                       crypto_ablkcipher_clear_flags(tfm, ~0);
-                       if (template[i].wk)
-                               crypto_ablkcipher_set_flags(
-                                       tfm, CRYPTO_TFM_REQ_WEAK_KEY);
-
-                       ret = crypto_ablkcipher_setkey(tfm, template[i].key,
-                                                      template[i].klen);
-                       if (!ret == template[i].fail) {
-                               printk(KERN_ERR "alg: cipher: setkey failed "
-                                      "on test %d for %s: flags=%x\n", j,
-                                      algo, crypto_ablkcipher_get_flags(tfm));
-                               goto out;
-                       } else if (ret)
-                               continue;
-
-                       sg_init_one(&sg[0], data, template[i].ilen);
-
-                       ablkcipher_request_set_crypt(req, sg, sg,
-                                                    template[i].ilen, iv);
-                       ret = enc ?
-                               crypto_ablkcipher_encrypt(req) :
-                               crypto_ablkcipher_decrypt(req);
-
-                       switch (ret) {
-                       case 0:
-                               break;
-                       case -EINPROGRESS:
-                       case -EBUSY:
-                               ret = wait_for_completion_interruptible(
-                                       &result.completion);
-                               if (!ret && !((ret = result.err))) {
-                                       INIT_COMPLETION(result.completion);
-                                       break;
-                               }
-                               /* fall through */
-                       default:
-                               printk(KERN_ERR "alg: cipher: %s failed on "
-                                      "test %d for %s: ret=%d\n", e, j, algo,
-                                      -ret);
-                               goto out;
-                       }
-
-                       q = data;
-                       if (memcmp(q, template[i].result, template[i].rlen)) {
-                               printk(KERN_ERR "alg: cipher: Test %d failed "
-                                      "on %s for %s\n", j, e, algo);
-                               hexdump(q, template[i].rlen);
-                               ret = -EINVAL;
-                               goto out;
-                       }
-               }
-       }
-
-       j = 0;
-       for (i = 0; i < tcount; i++) {
-
-               if (template[i].iv)
-                       memcpy(iv, template[i].iv, MAX_IVLEN);
-               else
-                       memset(iv, 0, MAX_IVLEN);
-
-               if (template[i].np) {
-                       j++;
-
-                       crypto_ablkcipher_clear_flags(tfm, ~0);
-                       if (template[i].wk)
-                               crypto_ablkcipher_set_flags(
-                                       tfm, CRYPTO_TFM_REQ_WEAK_KEY);
-
-                       ret = crypto_ablkcipher_setkey(tfm, template[i].key,
-                                                      template[i].klen);
-                       if (!ret == template[i].fail) {
-                               printk(KERN_ERR "alg: cipher: setkey failed "
-                                      "on chunk test %d for %s: flags=%x\n",
-                                      j, algo,
-                                      crypto_ablkcipher_get_flags(tfm));
-                               goto out;
-                       } else if (ret)
-                               continue;
-
-                       temp = 0;
-                       ret = -EINVAL;
-                       sg_init_table(sg, template[i].np);
-                       for (k = 0; k < template[i].np; k++) {
-                               if (WARN_ON(offset_in_page(IDX[k]) +
-                                           template[i].tap[k] > PAGE_SIZE))
-                                       goto out;
-
-                               q = xbuf[IDX[k] >> PAGE_SHIFT] +
-                                   offset_in_page(IDX[k]);
-
-                               memcpy(q, template[i].input + temp,
-                                      template[i].tap[k]);
-
-                               if (offset_in_page(q) + template[i].tap[k] <
-                                   PAGE_SIZE)
-                                       q[template[i].tap[k]] = 0;
-
-                               sg_set_buf(&sg[k], q, template[i].tap[k]);
-
-                               temp += template[i].tap[k];
-                       }
-
-                       ablkcipher_request_set_crypt(req, sg, sg,
-                                       template[i].ilen, iv);
-
-                       ret = enc ?
-                               crypto_ablkcipher_encrypt(req) :
-                               crypto_ablkcipher_decrypt(req);
-
-                       switch (ret) {
-                       case 0:
-                               break;
-                       case -EINPROGRESS:
-                       case -EBUSY:
-                               ret = wait_for_completion_interruptible(
-                                       &result.completion);
-                               if (!ret && !((ret = result.err))) {
-                                       INIT_COMPLETION(result.completion);
-                                       break;
-                               }
-                               /* fall through */
-                       default:
-                               printk(KERN_ERR "alg: cipher: %s failed on "
-                                      "chunk test %d for %s: ret=%d\n", e, j,
-                                      algo, -ret);
-                               goto out;
-                       }
-
-                       temp = 0;
-                       ret = -EINVAL;
-                       for (k = 0; k < template[i].np; k++) {
-                               q = xbuf[IDX[k] >> PAGE_SHIFT] +
-                                   offset_in_page(IDX[k]);
-
-                               if (memcmp(q, template[i].result + temp,
-                                          template[i].tap[k])) {
-                                       printk(KERN_ERR "alg: cipher: Chunk "
-                                              "test %d failed on %s at page "
-                                              "%u for %s\n", j, e, k, algo);
-                                       hexdump(q, template[i].tap[k]);
-                                       goto out;
-                               }
-
-                               q += template[i].tap[k];
-                               for (n = 0; offset_in_page(q + n) && q[n]; n++)
-                                       ;
-                               if (n) {
-                                       printk(KERN_ERR "alg: cipher: "
-                                              "Result buffer corruption in "
-                                              "chunk test %d on %s at page "
-                                              "%u for %s: %u bytes:\n", j, e,
-                                              k, algo, n);
-                                       hexdump(q, n);
-                                       goto out;
-                               }
-                               temp += template[i].tap[k];
-                       }
-               }
-       }
-
-       ret = 0;
-
-out:
-       ablkcipher_request_free(req);
-       return ret;
-}
-
 static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc,
                               struct scatterlist *sg, int blen, int sec)
 {
@@ -854,11 +131,11 @@ out:
 static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 };
 
 static void test_cipher_speed(const char *algo, int enc, unsigned int sec,
-                             struct cipher_testvec *template,
+                             struct cipher_speed_template *template,
                              unsigned int tcount, u8 *keysize)
 {
        unsigned int ret, i, j, iv_len;
-       unsigned char *key, iv[128];
+       const char *key, iv[128];
        struct crypto_blkcipher *tfm;
        struct blkcipher_desc desc;
        const char *e;
@@ -901,7 +178,7 @@ static void test_cipher_speed(const char *algo, int enc, unsigned int sec,
                        memset(tvmem[0], 0xff, PAGE_SIZE);
 
                        /* set key, plain text and IV */
-                       key = (unsigned char *)tvmem[0];
+                       key = tvmem[0];
                        for (j = 0; j < tcount; j++) {
                                if (template[j].klen == *keysize) {
                                        key = template[j].key;
@@ -1175,68 +452,6 @@ out:
        crypto_free_hash(tfm);
 }
 
-static int test_comp(struct crypto_comp *tfm, struct comp_testvec *ctemplate,
-                    struct comp_testvec *dtemplate, int ctcount, int dtcount)
-{
-       const char *algo = crypto_tfm_alg_driver_name(crypto_comp_tfm(tfm));
-       unsigned int i;
-       char result[COMP_BUF_SIZE];
-       int ret;
-
-       for (i = 0; i < ctcount; i++) {
-               int ilen, dlen = COMP_BUF_SIZE;
-
-               memset(result, 0, sizeof (result));
-
-               ilen = ctemplate[i].inlen;
-               ret = crypto_comp_compress(tfm, ctemplate[i].input,
-                                          ilen, result, &dlen);
-               if (ret) {
-                       printk(KERN_ERR "alg: comp: compression failed "
-                              "on test %d for %s: ret=%d\n", i + 1, algo,
-                              -ret);
-                       goto out;
-               }
-
-               if (memcmp(result, ctemplate[i].output, dlen)) {
-                       printk(KERN_ERR "alg: comp: Compression test %d "
-                              "failed for %s\n", i + 1, algo);
-                       hexdump(result, dlen);
-                       ret = -EINVAL;
-                       goto out;
-               }
-       }
-
-       for (i = 0; i < dtcount; i++) {
-               int ilen, ret, dlen = COMP_BUF_SIZE;
-
-               memset(result, 0, sizeof (result));
-
-               ilen = dtemplate[i].inlen;
-               ret = crypto_comp_decompress(tfm, dtemplate[i].input,
-                                            ilen, result, &dlen);
-               if (ret) {
-                       printk(KERN_ERR "alg: comp: decompression failed "
-                              "on test %d for %s: ret=%d\n", i + 1, algo,
-                              -ret);
-                       goto out;
-               }
-
-               if (memcmp(result, dtemplate[i].output, dlen)) {
-                       printk(KERN_ERR "alg: comp: Decompression test %d "
-                              "failed for %s\n", i + 1, algo);
-                       hexdump(result, dlen);
-                       ret = -EINVAL;
-                       goto out;
-               }
-       }
-
-       ret = 0;
-
-out:
-       return ret;
-}
-
 static void test_available(void)
 {
        char **name = check;
@@ -1249,895 +464,6 @@ static void test_available(void)
        }
 }
 
-static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,
-                        u32 type, u32 mask)
-{
-       struct crypto_aead *tfm;
-       int err = 0;
-
-       tfm = crypto_alloc_aead(driver, type, mask);
-       if (IS_ERR(tfm)) {
-               printk(KERN_ERR "alg: aead: Failed to load transform for %s: "
-                      "%ld\n", driver, PTR_ERR(tfm));
-               return PTR_ERR(tfm);
-       }
-
-       if (desc->suite.aead.enc.vecs) {
-               err = test_aead(tfm, ENCRYPT, desc->suite.aead.enc.vecs,
-                               desc->suite.aead.enc.count);
-               if (err)
-                       goto out;
-       }
-
-       if (!err && desc->suite.aead.dec.vecs)
-               err = test_aead(tfm, DECRYPT, desc->suite.aead.dec.vecs,
-                               desc->suite.aead.dec.count);
-
-out:
-       crypto_free_aead(tfm);
-       return err;
-}
-
-static int alg_test_cipher(const struct alg_test_desc *desc,
-                          const char *driver, u32 type, u32 mask)
-{
-       struct crypto_ablkcipher *tfm;
-       int err = 0;
-
-       tfm = crypto_alloc_ablkcipher(driver, type, mask);
-       if (IS_ERR(tfm)) {
-               printk(KERN_ERR "alg: cipher: Failed to load transform for "
-                      "%s: %ld\n", driver, PTR_ERR(tfm));
-               return PTR_ERR(tfm);
-       }
-
-       if (desc->suite.cipher.enc.vecs) {
-               err = test_cipher(tfm, ENCRYPT, desc->suite.cipher.enc.vecs,
-                                 desc->suite.cipher.enc.count);
-               if (err)
-                       goto out;
-       }
-
-       if (desc->suite.cipher.dec.vecs)
-               err = test_cipher(tfm, DECRYPT, desc->suite.cipher.dec.vecs,
-                                 desc->suite.cipher.dec.count);
-
-out:
-       crypto_free_ablkcipher(tfm);
-       return err;
-}
-
-static int alg_test_comp(const struct alg_test_desc *desc, const char *driver,
-                        u32 type, u32 mask)
-{
-       struct crypto_comp *tfm;
-       int err;
-
-       tfm = crypto_alloc_comp(driver, type, mask);
-       if (IS_ERR(tfm)) {
-               printk(KERN_ERR "alg: comp: Failed to load transform for %s: "
-                      "%ld\n", driver, PTR_ERR(tfm));
-               return PTR_ERR(tfm);
-       }
-
-       err = test_comp(tfm, desc->suite.comp.comp.vecs,
-                       desc->suite.comp.decomp.vecs,
-                       desc->suite.comp.comp.count,
-                       desc->suite.comp.decomp.count);
-
-       crypto_free_comp(tfm);
-       return err;
-}
-
-static int alg_test_hash(const struct alg_test_desc *desc, const char *driver,
-                        u32 type, u32 mask)
-{
-       struct crypto_ahash *tfm;
-       int err;
-
-       tfm = crypto_alloc_ahash(driver, type, mask);
-       if (IS_ERR(tfm)) {
-               printk(KERN_ERR "alg: hash: Failed to load transform for %s: "
-                      "%ld\n", driver, PTR_ERR(tfm));
-               return PTR_ERR(tfm);
-       }
-
-       err = test_hash(tfm, desc->suite.hash.vecs, desc->suite.hash.count);
-
-       crypto_free_ahash(tfm);
-       return err;
-}
-
-/* Please keep this list sorted by algorithm name. */
-static const struct alg_test_desc alg_test_descs[] = {
-       {
-               .alg = "cbc(aes)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = aes_cbc_enc_tv_template,
-                                       .count = AES_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_cbc_dec_tv_template,
-                                       .count = AES_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "cbc(anubis)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = anubis_cbc_enc_tv_template,
-                                       .count = ANUBIS_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = anubis_cbc_dec_tv_template,
-                                       .count = ANUBIS_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "cbc(blowfish)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = bf_cbc_enc_tv_template,
-                                       .count = BF_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = bf_cbc_dec_tv_template,
-                                       .count = BF_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "cbc(camellia)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = camellia_cbc_enc_tv_template,
-                                       .count = CAMELLIA_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = camellia_cbc_dec_tv_template,
-                                       .count = CAMELLIA_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "cbc(des)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = des_cbc_enc_tv_template,
-                                       .count = DES_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = des_cbc_dec_tv_template,
-                                       .count = DES_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "cbc(des3_ede)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = des3_ede_cbc_enc_tv_template,
-                                       .count = DES3_EDE_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = des3_ede_cbc_dec_tv_template,
-                                       .count = DES3_EDE_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "cbc(twofish)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = tf_cbc_enc_tv_template,
-                                       .count = TF_CBC_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = tf_cbc_dec_tv_template,
-                                       .count = TF_CBC_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ccm(aes)",
-               .test = alg_test_aead,
-               .suite = {
-                       .aead = {
-                               .enc = {
-                                       .vecs = aes_ccm_enc_tv_template,
-                                       .count = AES_CCM_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_ccm_dec_tv_template,
-                                       .count = AES_CCM_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "crc32c",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = crc32c_tv_template,
-                               .count = CRC32C_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "cts(cbc(aes))",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = cts_mode_enc_tv_template,
-                                       .count = CTS_MODE_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = cts_mode_dec_tv_template,
-                                       .count = CTS_MODE_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "deflate",
-               .test = alg_test_comp,
-               .suite = {
-                       .comp = {
-                               .comp = {
-                                       .vecs = deflate_comp_tv_template,
-                                       .count = DEFLATE_COMP_TEST_VECTORS
-                               },
-                               .decomp = {
-                                       .vecs = deflate_decomp_tv_template,
-                                       .count = DEFLATE_DECOMP_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(aes)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = aes_enc_tv_template,
-                                       .count = AES_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_dec_tv_template,
-                                       .count = AES_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(anubis)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = anubis_enc_tv_template,
-                                       .count = ANUBIS_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = anubis_dec_tv_template,
-                                       .count = ANUBIS_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(arc4)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = arc4_enc_tv_template,
-                                       .count = ARC4_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = arc4_dec_tv_template,
-                                       .count = ARC4_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(blowfish)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = bf_enc_tv_template,
-                                       .count = BF_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = bf_dec_tv_template,
-                                       .count = BF_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(camellia)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = camellia_enc_tv_template,
-                                       .count = CAMELLIA_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = camellia_dec_tv_template,
-                                       .count = CAMELLIA_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(cast5)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = cast5_enc_tv_template,
-                                       .count = CAST5_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = cast5_dec_tv_template,
-                                       .count = CAST5_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(cast6)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = cast6_enc_tv_template,
-                                       .count = CAST6_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = cast6_dec_tv_template,
-                                       .count = CAST6_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(des)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = des_enc_tv_template,
-                                       .count = DES_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = des_dec_tv_template,
-                                       .count = DES_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(des3_ede)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = des3_ede_enc_tv_template,
-                                       .count = DES3_EDE_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = des3_ede_dec_tv_template,
-                                       .count = DES3_EDE_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(khazad)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = khazad_enc_tv_template,
-                                       .count = KHAZAD_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = khazad_dec_tv_template,
-                                       .count = KHAZAD_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(seed)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = seed_enc_tv_template,
-                                       .count = SEED_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = seed_dec_tv_template,
-                                       .count = SEED_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(serpent)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = serpent_enc_tv_template,
-                                       .count = SERPENT_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = serpent_dec_tv_template,
-                                       .count = SERPENT_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(tea)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = tea_enc_tv_template,
-                                       .count = TEA_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = tea_dec_tv_template,
-                                       .count = TEA_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(tnepres)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = tnepres_enc_tv_template,
-                                       .count = TNEPRES_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = tnepres_dec_tv_template,
-                                       .count = TNEPRES_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(twofish)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = tf_enc_tv_template,
-                                       .count = TF_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = tf_dec_tv_template,
-                                       .count = TF_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(xeta)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = xeta_enc_tv_template,
-                                       .count = XETA_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = xeta_dec_tv_template,
-                                       .count = XETA_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "ecb(xtea)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = xtea_enc_tv_template,
-                                       .count = XTEA_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = xtea_dec_tv_template,
-                                       .count = XTEA_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "gcm(aes)",
-               .test = alg_test_aead,
-               .suite = {
-                       .aead = {
-                               .enc = {
-                                       .vecs = aes_gcm_enc_tv_template,
-                                       .count = AES_GCM_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_gcm_dec_tv_template,
-                                       .count = AES_GCM_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "hmac(md5)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_md5_tv_template,
-                               .count = HMAC_MD5_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(rmd128)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_rmd128_tv_template,
-                               .count = HMAC_RMD128_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(rmd160)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_rmd160_tv_template,
-                               .count = HMAC_RMD160_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(sha1)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_sha1_tv_template,
-                               .count = HMAC_SHA1_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(sha224)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_sha224_tv_template,
-                               .count = HMAC_SHA224_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(sha256)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_sha256_tv_template,
-                               .count = HMAC_SHA256_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(sha384)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_sha384_tv_template,
-                               .count = HMAC_SHA384_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "hmac(sha512)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = hmac_sha512_tv_template,
-                               .count = HMAC_SHA512_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "lrw(aes)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = aes_lrw_enc_tv_template,
-                                       .count = AES_LRW_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_lrw_dec_tv_template,
-                                       .count = AES_LRW_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "lzo",
-               .test = alg_test_comp,
-               .suite = {
-                       .comp = {
-                               .comp = {
-                                       .vecs = lzo_comp_tv_template,
-                                       .count = LZO_COMP_TEST_VECTORS
-                               },
-                               .decomp = {
-                                       .vecs = lzo_decomp_tv_template,
-                                       .count = LZO_DECOMP_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "md4",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = md4_tv_template,
-                               .count = MD4_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "md5",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = md5_tv_template,
-                               .count = MD5_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "michael_mic",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = michael_mic_tv_template,
-                               .count = MICHAEL_MIC_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "pcbc(fcrypt)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = fcrypt_pcbc_enc_tv_template,
-                                       .count = FCRYPT_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = fcrypt_pcbc_dec_tv_template,
-                                       .count = FCRYPT_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "rfc3686(ctr(aes))",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = aes_ctr_enc_tv_template,
-                                       .count = AES_CTR_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_ctr_dec_tv_template,
-                                       .count = AES_CTR_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "rmd128",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = rmd128_tv_template,
-                               .count = RMD128_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "rmd160",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = rmd160_tv_template,
-                               .count = RMD160_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "rmd256",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = rmd256_tv_template,
-                               .count = RMD256_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "rmd320",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = rmd320_tv_template,
-                               .count = RMD320_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "salsa20",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = salsa20_stream_enc_tv_template,
-                                       .count = SALSA20_STREAM_ENC_TEST_VECTORS
-                               }
-                       }
-               }
-       }, {
-               .alg = "sha1",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = sha1_tv_template,
-                               .count = SHA1_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "sha224",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = sha224_tv_template,
-                               .count = SHA224_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "sha256",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = sha256_tv_template,
-                               .count = SHA256_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "sha384",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = sha384_tv_template,
-                               .count = SHA384_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "sha512",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = sha512_tv_template,
-                               .count = SHA512_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "tgr128",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = tgr128_tv_template,
-                               .count = TGR128_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "tgr160",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = tgr160_tv_template,
-                               .count = TGR160_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "tgr192",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = tgr192_tv_template,
-                               .count = TGR192_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "wp256",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = wp256_tv_template,
-                               .count = WP256_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "wp384",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = wp384_tv_template,
-                               .count = WP384_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "wp512",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = wp512_tv_template,
-                               .count = WP512_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "xcbc(aes)",
-               .test = alg_test_hash,
-               .suite = {
-                       .hash = {
-                               .vecs = aes_xcbc128_tv_template,
-                               .count = XCBC_AES_TEST_VECTORS
-                       }
-               }
-       }, {
-               .alg = "xts(aes)",
-               .test = alg_test_cipher,
-               .suite = {
-                       .cipher = {
-                               .enc = {
-                                       .vecs = aes_xts_enc_tv_template,
-                                       .count = AES_XTS_ENC_TEST_VECTORS
-                               },
-                               .dec = {
-                                       .vecs = aes_xts_dec_tv_template,
-                                       .count = AES_XTS_DEC_TEST_VECTORS
-                               }
-                       }
-               }
-       }
-};
-
-static int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
-{
-       int start = 0;
-       int end = ARRAY_SIZE(alg_test_descs);
-
-       while (start < end) {
-               int i = (start + end) / 2;
-               int diff = strcmp(alg_test_descs[i].alg, alg);
-
-               if (diff > 0) {
-                       end = i;
-                       continue;
-               }
-
-               if (diff < 0) {
-                       start = i + 1;
-                       continue;
-               }
-
-               return alg_test_descs[i].test(alg_test_descs + i, driver,
-                                             type, mask);
-       }
-
-       printk(KERN_INFO "alg: No test for %s (%s)\n", alg, driver);
-       return 0;
-}
-
 static inline int tcrypt_test(const char *alg)
 {
        return alg_test(alg, alg, 0, 0);
@@ -2392,16 +718,16 @@ static void do_test(int m)
 
        case 201:
                test_cipher_speed("ecb(des3_ede)", ENCRYPT, sec,
-                               des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,
+                               des3_speed_template, DES3_SPEED_VECTORS,
                                speed_template_24);
                test_cipher_speed("ecb(des3_ede)", DECRYPT, sec,
-                               des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,
+                               des3_speed_template, DES3_SPEED_VECTORS,
                                speed_template_24);
                test_cipher_speed("cbc(des3_ede)", ENCRYPT, sec,
-                               des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,
+                               des3_speed_template, DES3_SPEED_VECTORS,
                                speed_template_24);
                test_cipher_speed("cbc(des3_ede)", DECRYPT, sec,
-                               des3_ede_enc_tv_template, DES3_EDE_ENC_TEST_VECTORS,
+                               des3_speed_template, DES3_SPEED_VECTORS,
                                speed_template_24);
                break;
 
@@ -2545,18 +871,6 @@ static int __init tcrypt_mod_init(void)
                        goto err_free_tv;
        }
 
-       for (i = 0; i < XBUFSIZE; i++) {
-               xbuf[i] = (void *)__get_free_page(GFP_KERNEL);
-               if (!xbuf[i])
-                       goto err_free_xbuf;
-       }
-
-       for (i = 0; i < XBUFSIZE; i++) {
-               axbuf[i] = (void *)__get_free_page(GFP_KERNEL);
-               if (!axbuf[i])
-                       goto err_free_axbuf;
-       }
-
        do_test(mode);
 
        /* We intentionaly return -EAGAIN to prevent keeping
@@ -2567,12 +881,6 @@ static int __init tcrypt_mod_init(void)
         */
        err = -EAGAIN;
 
-err_free_axbuf:
-       for (i = 0; i < XBUFSIZE && axbuf[i]; i++)
-               free_page((unsigned long)axbuf[i]);
-err_free_xbuf:
-       for (i = 0; i < XBUFSIZE && xbuf[i]; i++)
-               free_page((unsigned long)xbuf[i]);
 err_free_tv:
        for (i = 0; i < TVMEMSIZE && tvmem[i]; i++)
                free_page((unsigned long)tvmem[i]);
index c6254a1..966bbfa 100644 (file)
 #ifndef _CRYPTO_TCRYPT_H
 #define _CRYPTO_TCRYPT_H
 
-#define MAX_DIGEST_SIZE                64
-#define MAX_TAP                        8
-
-#define MAX_KEYLEN             56
-#define MAX_IVLEN              32
-
-struct hash_testvec {
-       /* only used with keyed hash algorithms */
-       char *key;
-       char *plaintext;
-       char *digest;
-       unsigned char tap[MAX_TAP];
-       unsigned char psize;
-       unsigned char np;
-       unsigned char ksize;
-};
-
-struct cipher_testvec {
-       char *key;
-       char *iv;
-       char *input;
-       char *result;
-       unsigned short tap[MAX_TAP];
-       int np;
-       unsigned char fail;
-       unsigned char wk; /* weak key flag */
-       unsigned char klen;
-       unsigned short ilen;
-       unsigned short rlen;
-};
-
-struct aead_testvec {
-       char *key;
-       char *iv;
-       char *input;
-       char *assoc;
-       char *result;
-       unsigned char tap[MAX_TAP];
-       unsigned char atap[MAX_TAP];
-       int np;
-       int anp;
-       unsigned char fail;
-       unsigned char wk; /* weak key flag */
-       unsigned char klen;
-       unsigned short ilen;
-       unsigned short alen;
-       unsigned short rlen;
+struct cipher_speed_template {
+       const char *key;
+       unsigned int klen;
 };
 
 struct hash_speed {
@@ -71,8677 +27,20 @@ struct hash_speed {
        unsigned int plen;      /* per-update length */
 };
 
-static char zeroed_string[48];
-
-/*
- * MD4 test vectors from RFC1320
- */
-#define MD4_TEST_VECTORS       7
-
-static struct hash_testvec md4_tv_template [] = {
-       {
-               .plaintext = "",
-               .digest = "\x31\xd6\xcf\xe0\xd1\x6a\xe9\x31"
-                         "\xb7\x3c\x59\xd7\xe0\xc0\x89\xc0",
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\xbd\xe5\x2c\xb3\x1d\xe3\x3e\x46"
-                         "\x24\x5e\x05\xfb\xdb\xd6\xfb\x24",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xa4\x48\x01\x7a\xaf\x21\xd8\x52"
-                         "\x5f\xc1\x0a\xe8\x7a\xa6\x72\x9d",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\xd9\x13\x0a\x81\x64\x54\x9f\xe8"
-                       "\x18\x87\x48\x06\xe1\xc7\x01\x4b",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xd7\x9e\x1c\x30\x8a\xa5\xbb\xcd"
-                         "\xee\xa8\xed\x63\xdf\x41\x2d\xa9",
-               .np     = 2,
-               .tap    = { 13, 13 },
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\x04\x3f\x85\x82\xf2\x41\xdb\x35"
-                         "\x1c\xe6\x27\xe1\x53\xe7\xf0\xe4",
-       }, {
-               .plaintext = "123456789012345678901234567890123456789012345678901234567890123"
-                          "45678901234567890",
-               .psize  = 80,
-               .digest = "\xe3\x3b\x4d\xdc\x9c\x38\xf2\x19"
-                         "\x9c\x3e\x7b\x16\x4f\xcc\x05\x36",
-       },
-};
-
-/*
- * MD5 test vectors from RFC1321
- */
-#define MD5_TEST_VECTORS       7
-
-static struct hash_testvec md5_tv_template[] = {
-       {
-               .digest = "\xd4\x1d\x8c\xd9\x8f\x00\xb2\x04"
-                         "\xe9\x80\x09\x98\xec\xf8\x42\x7e",
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\x0c\xc1\x75\xb9\xc0\xf1\xb6\xa8"
-                         "\x31\xc3\x99\xe2\x69\x77\x26\x61",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\x90\x01\x50\x98\x3c\xd2\x4f\xb0"
-                         "\xd6\x96\x3f\x7d\x28\xe1\x7f\x72",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\xf9\x6b\x69\x7d\x7c\xb7\x93\x8d"
-                         "\x52\x5a\x2f\x31\xaa\xf1\x61\xd0",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xc3\xfc\xd3\xd7\x61\x92\xe4\x00"
-                         "\x7d\xfb\x49\x6c\xca\x67\xe1\x3b",
-               .np     = 2,
-               .tap    = {13, 13}
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xd1\x74\xab\x98\xd2\x77\xd9\xf5"
-                         "\xa5\x61\x1c\x2c\x9f\x41\x9d\x9f",
-       }, {
-               .plaintext = "12345678901234567890123456789012345678901234567890123456789012"
-                          "345678901234567890",
-               .psize  = 80,
-               .digest = "\x57\xed\xf4\xa2\x2b\xe3\xc9\x55"
-                         "\xac\x49\xda\x2e\x21\x07\xb6\x7a",
-       }
-
-};
-
-/*
- * RIPEMD-128 test vectors from ISO/IEC 10118-3:2004(E)
- */
-#define RMD128_TEST_VECTORS     10
-
-static struct hash_testvec rmd128_tv_template[] = {
-       {
-               .digest = "\xcd\xf2\x62\x13\xa1\x50\xdc\x3e"
-                         "\xcb\x61\x0f\x18\xf6\xb3\x8b\x46",
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\x86\xbe\x7a\xfa\x33\x9d\x0f\xc7"
-                         "\xcf\xc7\x85\xe7\x2f\x57\x8d\x33",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xc1\x4a\x12\x19\x9c\x66\xe4\xba"
-                         "\x84\x63\x6b\x0f\x69\x14\x4c\x77",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x9e\x32\x7b\x3d\x6e\x52\x30\x62"
-                         "\xaf\xc1\x13\x2d\x7d\xf9\xd1\xb8",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xfd\x2a\xa6\x07\xf7\x1d\xc8\xf5"
-                         "\x10\x71\x49\x22\xb3\x71\x83\x4e",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"
-                            "fghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xd1\xe9\x59\xeb\x17\x9c\x91\x1f"
-                         "\xae\xa4\x62\x4c\x60\xc5\xc7\x02",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                            "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x3f\x45\xef\x19\x47\x32\xc2\xdb"
-                         "\xb2\xc4\xa2\xc7\x69\x79\x5f\xa3",
-        }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighij"
-                            "hijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\xa1\xaa\x06\x89\xd0\xfa\xfa\x2d"
-                         "\xdc\x22\xe8\x8b\x49\x13\x3a\x06",
-               .np     = 2,
-               .tap    = { 28, 28 },
-       }, {
-               .plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghi"
-                            "jklmghijklmnhijklmnoijklmnopjklmnopqklmnopqr"
-                            "lmnopqrsmnopqrstnopqrstu",
-               .psize  = 112,
-               .digest = "\xd4\xec\xc9\x13\xe1\xdf\x77\x6b"
-                         "\xf4\x8d\xe9\xd5\x5b\x1f\x25\x46",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijk",
-               .psize  = 32,
-               .digest = "\x13\xfc\x13\xe8\xef\xff\x34\x7d"
-                         "\xe1\x93\xff\x46\xdb\xac\xcf\xd4",
-       }
-};
-
-/*
- * RIPEMD-160 test vectors from ISO/IEC 10118-3:2004(E)
- */
-#define RMD160_TEST_VECTORS     10
-
-static struct hash_testvec rmd160_tv_template[] = {
-       {
-               .digest = "\x9c\x11\x85\xa5\xc5\xe9\xfc\x54\x61\x28"
-                         "\x08\x97\x7e\xe8\xf5\x48\xb2\x25\x8d\x31",
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\x0b\xdc\x9d\x2d\x25\x6b\x3e\xe9\xda\xae"
-                         "\x34\x7b\xe6\xf4\xdc\x83\x5a\x46\x7f\xfe",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\x8e\xb2\x08\xf7\xe0\x5d\x98\x7a\x9b\x04"
-                         "\x4a\x8e\x98\xc6\xb0\x87\xf1\x5a\x0b\xfc",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x5d\x06\x89\xef\x49\xd2\xfa\xe5\x72\xb8"
-                         "\x81\xb1\x23\xa8\x5f\xfa\x21\x59\x5f\x36",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xf7\x1c\x27\x10\x9c\x69\x2c\x1b\x56\xbb"
-                         "\xdc\xeb\x5b\x9d\x28\x65\xb3\x70\x8d\xbc",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"
-                            "fghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xb0\xe2\x0b\x6e\x31\x16\x64\x02\x86\xed"
-                         "\x3a\x87\xa5\x71\x30\x79\xb2\x1f\x51\x89",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                            "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x9b\x75\x2e\x45\x57\x3d\x4b\x39\xf4\xdb"
-                         "\xd3\x32\x3c\xab\x82\xbf\x63\x32\x6b\xfb",
-        }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighij"
-                            "hijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x12\xa0\x53\x38\x4a\x9c\x0c\x88\xe4\x05"
-                         "\xa0\x6c\x27\xdc\xf4\x9a\xda\x62\xeb\x2b",
-               .np     = 2,
-               .tap    = { 28, 28 },
-       }, {
-               .plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghi"
-                            "jklmghijklmnhijklmnoijklmnopjklmnopqklmnopqr"
-                            "lmnopqrsmnopqrstnopqrstu",
-               .psize  = 112,
-               .digest = "\x6f\x3f\xa3\x9b\x6b\x50\x3c\x38\x4f\x91"
-                         "\x9a\x49\xa7\xaa\x5c\x2c\x08\xbd\xfb\x45",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijk",
-               .psize  = 32,
-               .digest = "\x94\xc2\x64\x11\x54\x04\xe6\x33\x79\x0d"
-                         "\xfc\xc8\x7b\x58\x7d\x36\x77\x06\x7d\x9f",
-       }
-};
-
-/*
- * RIPEMD-256 test vectors
- */
-#define RMD256_TEST_VECTORS     8
-
-static struct hash_testvec rmd256_tv_template[] = {
-       {
-               .digest = "\x02\xba\x4c\x4e\x5f\x8e\xcd\x18"
-                         "\x77\xfc\x52\xd6\x4d\x30\xe3\x7a"
-                         "\x2d\x97\x74\xfb\x1e\x5d\x02\x63"
-                         "\x80\xae\x01\x68\xe3\xc5\x52\x2d",
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\xf9\x33\x3e\x45\xd8\x57\xf5\xd9"
-                         "\x0a\x91\xba\xb7\x0a\x1e\xba\x0c"
-                         "\xfb\x1b\xe4\xb0\x78\x3c\x9a\xcf"
-                         "\xcd\x88\x3a\x91\x34\x69\x29\x25",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xaf\xbd\x6e\x22\x8b\x9d\x8c\xbb"
-                         "\xce\xf5\xca\x2d\x03\xe6\xdb\xa1"
-                         "\x0a\xc0\xbc\x7d\xcb\xe4\x68\x0e"
-                         "\x1e\x42\xd2\xe9\x75\x45\x9b\x65",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x87\xe9\x71\x75\x9a\x1c\xe4\x7a"
-                         "\x51\x4d\x5c\x91\x4c\x39\x2c\x90"
-                         "\x18\xc7\xc4\x6b\xc1\x44\x65\x55"
-                         "\x4a\xfc\xdf\x54\xa5\x07\x0c\x0e",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\x64\x9d\x30\x34\x75\x1e\xa2\x16"
-                         "\x77\x6b\xf9\xa1\x8a\xcc\x81\xbc"
-                         "\x78\x96\x11\x8a\x51\x97\x96\x87"
-                         "\x82\xdd\x1f\xd9\x7d\x8d\x51\x33",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"
-                            "fghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\x57\x40\xa4\x08\xac\x16\xb7\x20"
-                         "\xb8\x44\x24\xae\x93\x1c\xbb\x1f"
-                         "\xe3\x63\xd1\xd0\xbf\x40\x17\xf1"
-                         "\xa8\x9f\x7e\xa6\xde\x77\xa0\xb8",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                            "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x06\xfd\xcc\x7a\x40\x95\x48\xaa"
-                         "\xf9\x13\x68\xc0\x6a\x62\x75\xb5"
-                         "\x53\xe3\xf0\x99\xbf\x0e\xa4\xed"
-                         "\xfd\x67\x78\xdf\x89\xa8\x90\xdd",
-        }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighij"
-                            "hijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x38\x43\x04\x55\x83\xaa\xc6\xc8"
-                         "\xc8\xd9\x12\x85\x73\xe7\xa9\x80"
-                         "\x9a\xfb\x2a\x0f\x34\xcc\xc3\x6e"
-                         "\xa9\xe7\x2f\x16\xf6\x36\x8e\x3f",
-               .np     = 2,
-               .tap    = { 28, 28 },
-       }
-};
-
-/*
- * RIPEMD-320 test vectors
- */
-#define RMD320_TEST_VECTORS     8
-
-static struct hash_testvec rmd320_tv_template[] = {
-       {
-               .digest = "\x22\xd6\x5d\x56\x61\x53\x6c\xdc\x75\xc1"
-                         "\xfd\xf5\xc6\xde\x7b\x41\xb9\xf2\x73\x25"
-                         "\xeb\xc6\x1e\x85\x57\x17\x7d\x70\x5a\x0e"
-                         "\xc8\x80\x15\x1c\x3a\x32\xa0\x08\x99\xb8",
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\xce\x78\x85\x06\x38\xf9\x26\x58\xa5\xa5"
-                         "\x85\x09\x75\x79\x92\x6d\xda\x66\x7a\x57"
-                         "\x16\x56\x2c\xfc\xf6\xfb\xe7\x7f\x63\x54"
-                         "\x2f\x99\xb0\x47\x05\xd6\x97\x0d\xff\x5d",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xde\x4c\x01\xb3\x05\x4f\x89\x30\xa7\x9d"
-                         "\x09\xae\x73\x8e\x92\x30\x1e\x5a\x17\x08"
-                         "\x5b\xef\xfd\xc1\xb8\xd1\x16\x71\x3e\x74"
-                         "\xf8\x2f\xa9\x42\xd6\x4c\xdb\xc4\x68\x2d",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x3a\x8e\x28\x50\x2e\xd4\x5d\x42\x2f\x68"
-                         "\x84\x4f\x9d\xd3\x16\xe7\xb9\x85\x33\xfa"
-                         "\x3f\x2a\x91\xd2\x9f\x84\xd4\x25\xc8\x8d"
-                         "\x6b\x4e\xff\x72\x7d\xf6\x6a\x7c\x01\x97",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xca\xbd\xb1\x81\x0b\x92\x47\x0a\x20\x93"
-                         "\xaa\x6b\xce\x05\x95\x2c\x28\x34\x8c\xf4"
-                         "\x3f\xf6\x08\x41\x97\x51\x66\xbb\x40\xed"
-                         "\x23\x40\x04\xb8\x82\x44\x63\xe6\xb0\x09",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcde"
-                            "fghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xed\x54\x49\x40\xc8\x6d\x67\xf2\x50\xd2"
-                         "\x32\xc3\x0b\x7b\x3e\x57\x70\xe0\xc6\x0c"
-                         "\x8c\xb9\xa4\xca\xfe\x3b\x11\x38\x8a\xf9"
-                         "\x92\x0e\x1b\x99\x23\x0b\x84\x3c\x86\xa4",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                            "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x55\x78\x88\xaf\x5f\x6d\x8e\xd6\x2a\xb6"
-                         "\x69\x45\xc6\xd2\xa0\xa4\x7e\xcd\x53\x41"
-                         "\xe9\x15\xeb\x8f\xea\x1d\x05\x24\x95\x5f"
-                         "\x82\x5d\xc7\x17\xe4\xa0\x08\xab\x2d\x42",
-        }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighij"
-                            "hijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\xd0\x34\xa7\x95\x0c\xf7\x22\x02\x1b\xa4"
-                         "\xb8\x4d\xf7\x69\xa5\xde\x20\x60\xe2\x59"
-                         "\xdf\x4c\x9b\xb4\xa4\x26\x8c\x0e\x93\x5b"
-                         "\xbc\x74\x70\xa9\x69\xc9\xd0\x72\xa1\xac",
-               .np     = 2,
-               .tap    = { 28, 28 },
-       }
-};
-
-/*
- * SHA1 test vectors  from from FIPS PUB 180-1
- */
-#define SHA1_TEST_VECTORS      2
-
-static struct hash_testvec sha1_tv_template[] = {
-       {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xa9\x99\x3e\x36\x47\x06\x81\x6a\xba\x3e"
-                         "\x25\x71\x78\x50\xc2\x6c\x9c\xd0\xd8\x9d",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x84\x98\x3e\x44\x1c\x3b\xd2\x6e\xba\xae"
-                         "\x4a\xa1\xf9\x51\x29\xe5\xe5\x46\x70\xf1",
-               .np     = 2,
-               .tap    = { 28, 28 }
-       }
-};
-
-
-/*
- * SHA224 test vectors from from FIPS PUB 180-2
- */
-#define SHA224_TEST_VECTORS     2
-
-static struct hash_testvec sha224_tv_template[] = {
-       {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\x23\x09\x7D\x22\x34\x05\xD8\x22"
-                         "\x86\x42\xA4\x77\xBD\xA2\x55\xB3"
-                         "\x2A\xAD\xBC\xE4\xBD\xA0\xB3\xF7"
-                         "\xE3\x6C\x9D\xA7",
-       }, {
-               .plaintext =
-               "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x75\x38\x8B\x16\x51\x27\x76\xCC"
-                         "\x5D\xBA\x5D\xA1\xFD\x89\x01\x50"
-                         "\xB0\xC6\x45\x5C\xB4\xF5\x8B\x19"
-                         "\x52\x52\x25\x25",
-               .np     = 2,
-               .tap    = { 28, 28 }
-       }
-};
-
-/*
- * SHA256 test vectors from from NIST
- */
-#define SHA256_TEST_VECTORS    2
-
-static struct hash_testvec sha256_tv_template[] = {
-       {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xba\x78\x16\xbf\x8f\x01\xcf\xea"
-                         "\x41\x41\x40\xde\x5d\xae\x22\x23"
-                         "\xb0\x03\x61\xa3\x96\x17\x7a\x9c"
-                         "\xb4\x10\xff\x61\xf2\x00\x15\xad",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x24\x8d\x6a\x61\xd2\x06\x38\xb8"
-                         "\xe5\xc0\x26\x93\x0c\x3e\x60\x39"
-                         "\xa3\x3c\xe4\x59\x64\xff\x21\x67"
-                         "\xf6\xec\xed\xd4\x19\xdb\x06\xc1",
-               .np     = 2,
-               .tap    = { 28, 28 }
-       },
-};
-
-/*
- * SHA384 test vectors from from NIST and kerneli
- */
-#define SHA384_TEST_VECTORS    4
-
-static struct hash_testvec sha384_tv_template[] = {
-       {
-               .plaintext= "abc",
-               .psize  = 3,
-               .digest = "\xcb\x00\x75\x3f\x45\xa3\x5e\x8b"
-                         "\xb5\xa0\x3d\x69\x9a\xc6\x50\x07"
-                         "\x27\x2c\x32\xab\x0e\xde\xd1\x63"
-                         "\x1a\x8b\x60\x5a\x43\xff\x5b\xed"
-                         "\x80\x86\x07\x2b\xa1\xe7\xcc\x23"
-                         "\x58\xba\xec\xa1\x34\xc8\x25\xa7",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x33\x91\xfd\xdd\xfc\x8d\xc7\x39"
-                         "\x37\x07\xa6\x5b\x1b\x47\x09\x39"
-                         "\x7c\xf8\xb1\xd1\x62\xaf\x05\xab"
-                         "\xfe\x8f\x45\x0d\xe5\xf3\x6b\xc6"
-                         "\xb0\x45\x5a\x85\x20\xbc\x4e\x6f"
-                         "\x5f\xe9\x5b\x1f\xe3\xc8\x45\x2b",
-       }, {
-               .plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
-                          "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
-               .psize  = 112,
-               .digest = "\x09\x33\x0c\x33\xf7\x11\x47\xe8"
-                         "\x3d\x19\x2f\xc7\x82\xcd\x1b\x47"
-                         "\x53\x11\x1b\x17\x3b\x3b\x05\xd2"
-                         "\x2f\xa0\x80\x86\xe3\xb0\xf7\x12"
-                         "\xfc\xc7\xc7\x1a\x55\x7e\x2d\xb9"
-                         "\x66\xc3\xe9\xfa\x91\x74\x60\x39",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"
-                          "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
-               .psize  = 104,
-               .digest = "\x3d\x20\x89\x73\xab\x35\x08\xdb"
-                         "\xbd\x7e\x2c\x28\x62\xba\x29\x0a"
-                         "\xd3\x01\x0e\x49\x78\xc1\x98\xdc"
-                         "\x4d\x8f\xd0\x14\xe5\x82\x82\x3a"
-                         "\x89\xe1\x6f\x9b\x2a\x7b\xbc\x1a"
-                         "\xc9\x38\xe2\xd1\x99\xe8\xbe\xa4",
-               .np     = 4,
-               .tap    = { 26, 26, 26, 26 }
-       },
-};
-
-/*
- * SHA512 test vectors from from NIST and kerneli
- */
-#define SHA512_TEST_VECTORS    4
-
-static struct hash_testvec sha512_tv_template[] = {
-       {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xdd\xaf\x35\xa1\x93\x61\x7a\xba"
-                         "\xcc\x41\x73\x49\xae\x20\x41\x31"
-                         "\x12\xe6\xfa\x4e\x89\xa9\x7e\xa2"
-                         "\x0a\x9e\xee\xe6\x4b\x55\xd3\x9a"
-                         "\x21\x92\x99\x2a\x27\x4f\xc1\xa8"
-                         "\x36\xba\x3c\x23\xa3\xfe\xeb\xbd"
-                         "\x45\x4d\x44\x23\x64\x3c\xe8\x0e"
-                         "\x2a\x9a\xc9\x4f\xa5\x4c\xa4\x9f",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x20\x4a\x8f\xc6\xdd\xa8\x2f\x0a"
-                         "\x0c\xed\x7b\xeb\x8e\x08\xa4\x16"
-                         "\x57\xc1\x6e\xf4\x68\xb2\x28\xa8"
-                         "\x27\x9b\xe3\x31\xa7\x03\xc3\x35"
-                         "\x96\xfd\x15\xc1\x3b\x1b\x07\xf9"
-                         "\xaa\x1d\x3b\xea\x57\x78\x9c\xa0"
-                         "\x31\xad\x85\xc7\xa7\x1d\xd7\x03"
-                         "\x54\xec\x63\x12\x38\xca\x34\x45",
-       }, {
-               .plaintext = "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn"
-                          "hijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu",
-               .psize  = 112,
-               .digest = "\x8e\x95\x9b\x75\xda\xe3\x13\xda"
-                         "\x8c\xf4\xf7\x28\x14\xfc\x14\x3f"
-                         "\x8f\x77\x79\xc6\xeb\x9f\x7f\xa1"
-                         "\x72\x99\xae\xad\xb6\x88\x90\x18"
-                         "\x50\x1d\x28\x9e\x49\x00\xf7\xe4"
-                         "\x33\x1b\x99\xde\xc4\xb5\x43\x3a"
-                         "\xc7\xd3\x29\xee\xb6\xdd\x26\x54"
-                         "\x5e\x96\xe5\x5b\x87\x4b\xe9\x09",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcd"
-                          "efghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz",
-               .psize  = 104,
-               .digest = "\x93\x0d\x0c\xef\xcb\x30\xff\x11"
-                         "\x33\xb6\x89\x81\x21\xf1\xcf\x3d"
-                         "\x27\x57\x8a\xfc\xaf\xe8\x67\x7c"
-                         "\x52\x57\xcf\x06\x99\x11\xf7\x5d"
-                         "\x8f\x58\x31\xb5\x6e\xbf\xda\x67"
-                         "\xb2\x78\xe6\x6d\xff\x8b\x84\xfe"
-                         "\x2b\x28\x70\xf7\x42\xa5\x80\xd8"
-                         "\xed\xb4\x19\x87\x23\x28\x50\xc9",
-               .np     = 4,
-               .tap    = { 26, 26, 26, 26 }
-       },
-};
-
-
-/*
- * WHIRLPOOL test vectors from Whirlpool package
- * by Vincent Rijmen and Paulo S. L. M. Barreto as part of the NESSIE
- * submission
- */
-#define WP512_TEST_VECTORS     8
-
-static struct hash_testvec wp512_tv_template[] = {
-       {
-               .plaintext = "",
-               .psize  = 0,
-               .digest = "\x19\xFA\x61\xD7\x55\x22\xA4\x66"
-                         "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"
-                         "\xC5\x30\x23\x21\x30\xD4\x07\xF8"
-                         "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7"
-                         "\x3E\x83\xBE\x69\x8B\x28\x8F\xEB"
-                         "\xCF\x88\xE3\xE0\x3C\x4F\x07\x57"
-                         "\xEA\x89\x64\xE5\x9B\x63\xD9\x37"
-                         "\x08\xB1\x38\xCC\x42\xA6\x6E\xB3",
-
-
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"
-                         "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"
-                         "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"
-                         "\x73\xC4\x50\x01\xD0\x08\x7B\x42"
-                         "\xD1\x1B\xC6\x45\x41\x3A\xEF\xF6"
-                         "\x3A\x42\x39\x1A\x39\x14\x5A\x59"
-                         "\x1A\x92\x20\x0D\x56\x01\x95\xE5"
-                         "\x3B\x47\x85\x84\xFD\xAE\x23\x1A",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"
-                         "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"
-                         "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"
-                         "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C"
-                         "\x71\x81\xEE\xBD\xB6\xC5\x7E\x27"
-                         "\x7D\x0E\x34\x95\x71\x14\xCB\xD6"
-                         "\xC7\x97\xFC\x9D\x95\xD8\xB5\x82"
-                         "\xD2\x25\x29\x20\x76\xD4\xEE\xF5",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"
-                         "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"
-                         "\x83\x8D\x00\x03\x22\x30\xF5\x3C"
-                         "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B"
-                         "\x84\x21\x55\x76\x59\xEF\x55\xC1"
-                         "\x06\xB4\xB5\x2A\xC5\xA4\xAA\xA6"
-                         "\x92\xED\x92\x00\x52\x83\x8F\x33"
-                         "\x62\xE8\x6D\xBD\x37\xA8\x90\x3E",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"
-                         "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"
-                         "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"
-                         "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B"
-                         "\x08\xBF\x2A\x92\x51\xC3\x0B\x6A"
-                         "\x0B\x8A\xAE\x86\x17\x7A\xB4\xA6"
-                         "\xF6\x8F\x67\x3E\x72\x07\x86\x5D"
-                         "\x5D\x98\x19\xA3\xDB\xA4\xEB\x3B",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                          "abcdefghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"
-                         "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"
-                         "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"
-                         "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E"
-                         "\x08\xEB\xA2\x66\x29\x12\x9D\x8F"
-                         "\xB7\xCB\x57\x21\x1B\x92\x81\xA6"
-                         "\x55\x17\xCC\x87\x9D\x7B\x96\x21"
-                         "\x42\xC6\x5F\x5A\x7A\xF0\x14\x67",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                          "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"
-                         "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"
-                         "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"
-                         "\x54\x9C\x4A\xFA\xDB\x60\x14\x29"
-                         "\x4D\x5B\xD8\xDF\x2A\x6C\x44\xE5"
-                         "\x38\xCD\x04\x7B\x26\x81\xA5\x1A"
-                         "\x2C\x60\x48\x1E\x88\xC5\xA2\x0B"
-                         "\x2C\x2A\x80\xCF\x3A\x9A\x08\x3B",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijk",
-               .psize  = 32,
-               .digest = "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"
-                         "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"
-                         "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"
-                         "\x07\xC5\x62\xF9\x88\xE9\x5C\x69"
-                         "\x16\xBD\xC8\x03\x1B\xC5\xBE\x1B"
-                         "\x7B\x94\x76\x39\xFE\x05\x0B\x56"
-                         "\x93\x9B\xAA\xA0\xAD\xFF\x9A\xE6"
-                         "\x74\x5B\x7B\x18\x1C\x3B\xE3\xFD",
-       },
-};
-
-#define WP384_TEST_VECTORS     8
-
-static struct hash_testvec wp384_tv_template[] = {
-       {
-               .plaintext = "",
-               .psize  = 0,
-               .digest = "\x19\xFA\x61\xD7\x55\x22\xA4\x66"
-                         "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"
-                         "\xC5\x30\x23\x21\x30\xD4\x07\xF8"
-                         "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7"
-                         "\x3E\x83\xBE\x69\x8B\x28\x8F\xEB"
-                         "\xCF\x88\xE3\xE0\x3C\x4F\x07\x57",
-
-
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"
-                         "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"
-                         "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"
-                         "\x73\xC4\x50\x01\xD0\x08\x7B\x42"
-                         "\xD1\x1B\xC6\x45\x41\x3A\xEF\xF6"
-                         "\x3A\x42\x39\x1A\x39\x14\x5A\x59",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"
-                         "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"
-                         "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"
-                         "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C"
-                         "\x71\x81\xEE\xBD\xB6\xC5\x7E\x27"
-                         "\x7D\x0E\x34\x95\x71\x14\xCB\xD6",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"
-                         "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"
-                         "\x83\x8D\x00\x03\x22\x30\xF5\x3C"
-                         "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B"
-                         "\x84\x21\x55\x76\x59\xEF\x55\xC1"
-                         "\x06\xB4\xB5\x2A\xC5\xA4\xAA\xA6",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"
-                         "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"
-                         "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"
-                         "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B"
-                         "\x08\xBF\x2A\x92\x51\xC3\x0B\x6A"
-                         "\x0B\x8A\xAE\x86\x17\x7A\xB4\xA6",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                          "abcdefghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"
-                         "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"
-                         "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"
-                         "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E"
-                         "\x08\xEB\xA2\x66\x29\x12\x9D\x8F"
-                         "\xB7\xCB\x57\x21\x1B\x92\x81\xA6",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                          "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"
-                         "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"
-                         "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"
-                         "\x54\x9C\x4A\xFA\xDB\x60\x14\x29"
-                         "\x4D\x5B\xD8\xDF\x2A\x6C\x44\xE5"
-                         "\x38\xCD\x04\x7B\x26\x81\xA5\x1A",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijk",
-               .psize  = 32,
-               .digest = "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"
-                         "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"
-                         "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"
-                         "\x07\xC5\x62\xF9\x88\xE9\x5C\x69"
-                         "\x16\xBD\xC8\x03\x1B\xC5\xBE\x1B"
-                         "\x7B\x94\x76\x39\xFE\x05\x0B\x56",
-       },
-};
-
-#define WP256_TEST_VECTORS     8
-
-static struct hash_testvec wp256_tv_template[] = {
-       {
-               .plaintext = "",
-               .psize  = 0,
-               .digest = "\x19\xFA\x61\xD7\x55\x22\xA4\x66"
-                         "\x9B\x44\xE3\x9C\x1D\x2E\x17\x26"
-                         "\xC5\x30\x23\x21\x30\xD4\x07\xF8"
-                         "\x9A\xFE\xE0\x96\x49\x97\xF7\xA7",
-
-
-       }, {
-               .plaintext = "a",
-               .psize  = 1,
-               .digest = "\x8A\xCA\x26\x02\x79\x2A\xEC\x6F"
-                         "\x11\xA6\x72\x06\x53\x1F\xB7\xD7"
-                         "\xF0\xDF\xF5\x94\x13\x14\x5E\x69"
-                         "\x73\xC4\x50\x01\xD0\x08\x7B\x42",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\x4E\x24\x48\xA4\xC6\xF4\x86\xBB"
-                         "\x16\xB6\x56\x2C\x73\xB4\x02\x0B"
-                         "\xF3\x04\x3E\x3A\x73\x1B\xCE\x72"
-                         "\x1A\xE1\xB3\x03\xD9\x7E\x6D\x4C",
-       }, {
-               .plaintext = "message digest",
-               .psize  = 14,
-               .digest = "\x37\x8C\x84\xA4\x12\x6E\x2D\xC6"
-                         "\xE5\x6D\xCC\x74\x58\x37\x7A\xAC"
-                         "\x83\x8D\x00\x03\x22\x30\xF5\x3C"
-                         "\xE1\xF5\x70\x0C\x0F\xFB\x4D\x3B",
-       }, {
-               .plaintext = "abcdefghijklmnopqrstuvwxyz",
-               .psize  = 26,
-               .digest = "\xF1\xD7\x54\x66\x26\x36\xFF\xE9"
-                         "\x2C\x82\xEB\xB9\x21\x2A\x48\x4A"
-                         "\x8D\x38\x63\x1E\xAD\x42\x38\xF5"
-                         "\x44\x2E\xE1\x3B\x80\x54\xE4\x1B",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-                          "abcdefghijklmnopqrstuvwxyz0123456789",
-               .psize  = 62,
-               .digest = "\xDC\x37\xE0\x08\xCF\x9E\xE6\x9B"
-                         "\xF1\x1F\x00\xED\x9A\xBA\x26\x90"
-                         "\x1D\xD7\xC2\x8C\xDE\xC0\x66\xCC"
-                         "\x6A\xF4\x2E\x40\xF8\x2F\x3A\x1E",
-       }, {
-               .plaintext = "1234567890123456789012345678901234567890"
-                          "1234567890123456789012345678901234567890",
-               .psize  = 80,
-               .digest = "\x46\x6E\xF1\x8B\xAB\xB0\x15\x4D"
-                         "\x25\xB9\xD3\x8A\x64\x14\xF5\xC0"
-                         "\x87\x84\x37\x2B\xCC\xB2\x04\xD6"
-                         "\x54\x9C\x4A\xFA\xDB\x60\x14\x29",
-       }, {
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijk",
-               .psize  = 32,
-               .digest = "\x2A\x98\x7E\xA4\x0F\x91\x70\x61"
-                         "\xF5\xD6\xF0\xA0\xE4\x64\x4F\x48"
-                         "\x8A\x7A\x5A\x52\xDE\xEE\x65\x62"
-                         "\x07\xC5\x62\xF9\x88\xE9\x5C\x69",
-       },
-};
-
-/*
- * TIGER test vectors from Tiger website
- */
-#define TGR192_TEST_VECTORS    6
-
-static struct hash_testvec tgr192_tv_template[] = {
-       {
-               .plaintext = "",
-               .psize  = 0,
-               .digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"
-                         "\x16\x16\x6e\x76\xb1\xbb\x92\x5f"
-                         "\xf3\x73\xde\x2d\x49\x58\x4e\x7a",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"
-                         "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf"
-                         "\x93\x5f\x7b\x95\x1c\x13\x29\x51",
-       }, {
-               .plaintext = "Tiger",
-               .psize  = 5,
-               .digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"
-                         "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec"
-                         "\x37\x79\x0c\x11\x6f\x9d\x2b\xdf",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",
-               .psize  = 64,
-               .digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"
-                         "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e"
-                         "\xb5\x86\x44\x50\x34\xa5\xa3\x86",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",
-               .psize  = 64,
-               .digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"
-                         "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9"
-                         "\x57\x89\x65\x65\x97\x5f\x91\x97",
-       }, {
-               .plaintext = "Tiger - A Fast New Hash Function, "
-                          "by Ross Anderson and Eli Biham, "
-                          "proceedings of Fast Software Encryption 3, "
-                          "Cambridge, 1996.",
-               .psize  = 125,
-               .digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"
-                         "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24"
-                         "\xdd\x68\x15\x1d\x50\x39\x74\xfc",
-       },
-};
-
-#define TGR160_TEST_VECTORS    6
-
-static struct hash_testvec tgr160_tv_template[] = {
-       {
-               .plaintext = "",
-               .psize  = 0,
-               .digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"
-                         "\x16\x16\x6e\x76\xb1\xbb\x92\x5f"
-                         "\xf3\x73\xde\x2d",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"
-                         "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf"
-                         "\x93\x5f\x7b\x95",
-       }, {
-               .plaintext = "Tiger",
-               .psize  = 5,
-               .digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"
-                         "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec"
-                         "\x37\x79\x0c\x11",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",
-               .psize  = 64,
-               .digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"
-                         "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e"
-                         "\xb5\x86\x44\x50",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",
-               .psize  = 64,
-               .digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"
-                         "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9"
-                         "\x57\x89\x65\x65",
-       }, {
-               .plaintext = "Tiger - A Fast New Hash Function, "
-                          "by Ross Anderson and Eli Biham, "
-                          "proceedings of Fast Software Encryption 3, "
-                          "Cambridge, 1996.",
-               .psize  = 125,
-               .digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"
-                         "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24"
-                         "\xdd\x68\x15\x1d",
-       },
-};
-
-#define TGR128_TEST_VECTORS    6
-
-static struct hash_testvec tgr128_tv_template[] = {
-       {
-               .plaintext = "",
-               .psize  = 0,
-               .digest = "\x24\xf0\x13\x0c\x63\xac\x93\x32"
-                         "\x16\x16\x6e\x76\xb1\xbb\x92\x5f",
-       }, {
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xf2\x58\xc1\xe8\x84\x14\xab\x2a"
-                         "\x52\x7a\xb5\x41\xff\xc5\xb8\xbf",
-       }, {
-               .plaintext = "Tiger",
-               .psize  = 5,
-               .digest = "\x9f\x00\xf5\x99\x07\x23\x00\xdd"
-                         "\x27\x6a\xbb\x38\xc8\xeb\x6d\xec",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",
-               .psize  = 64,
-               .digest = "\x87\xfb\x2a\x90\x83\x85\x1c\xf7"
-                         "\x47\x0d\x2c\xf8\x10\xe6\xdf\x9e",
-       }, {
-               .plaintext = "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",
-               .psize  = 64,
-               .digest = "\x46\x7d\xb8\x08\x63\xeb\xce\x48"
-                         "\x8d\xf1\xcd\x12\x61\x65\x5d\xe9",
-       }, {
-               .plaintext = "Tiger - A Fast New Hash Function, "
-                          "by Ross Anderson and Eli Biham, "
-                          "proceedings of Fast Software Encryption 3, "
-                          "Cambridge, 1996.",
-               .psize  = 125,
-               .digest = "\x3d\x9a\xeb\x03\xd1\xbd\x1a\x63"
-                         "\x57\xb2\x77\x4d\xfd\x6d\x5b\x24",
-       },
-};
-
-/*
- * HMAC-MD5 test vectors from RFC2202
- * (These need to be fixed to not use strlen).
- */
-#define HMAC_MD5_TEST_VECTORS  7
-
-static struct hash_testvec hmac_md5_tv_template[] =
-{
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-               .ksize  = 16,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\x92\x94\x72\x7a\x36\x38\xbb\x1c"
-                         "\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03"
-                         "\xea\xa8\x6e\x31\x0a\x5d\xb7\x38",
-               .np     = 2,
-               .tap    = {14, 14}
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
-               .ksize  = 16,
-               .plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",
-               .psize  = 50,
-               .digest = "\x56\xbe\x34\x52\x1d\x14\x4c\x88"
-                         "\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6",
-       }, {
-               .key    = "\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",
-               .ksize  = 25,
-               .plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",
-               .psize  = 50,
-               .digest = "\x69\x7e\xaf\x0a\xca\x3a\x3a\xea"
-                         "\x3a\x75\x16\x47\x46\xff\xaa\x79",
-       }, {
-               .key    = "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",
-               .ksize  = 16,
-               .plaintext = "Test With Truncation",
-               .psize  = 20,
-               .digest = "\x56\x46\x1e\xf2\x34\x2e\xdc\x00"
-                         "\xf9\xba\xb9\x95\x69\x0e\xfd\x4c",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
-               .psize  = 54,
-               .digest = "\x6b\x1a\xb7\xfe\x4b\xd7\xbf\x8f"
-                         "\x0b\x62\xe6\xce\x61\xb9\xd0\xcd",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "
-                          "Block-Size Data",
-               .psize  = 73,
-               .digest = "\x6f\x63\x0f\xad\x67\xcd\xa0\xee"
-                         "\x1f\xb1\xf5\x62\xdb\x3a\xa5\x3e",
-       },
-};
-
-/*
- * HMAC-RIPEMD128 test vectors from RFC2286
- */
-#define HMAC_RMD128_TEST_VECTORS       7
-
-static struct hash_testvec hmac_rmd128_tv_template[] = {
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-               .ksize  = 16,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\xfb\xf6\x1f\x94\x92\xaa\x4b\xbf"
-                         "\x81\xc1\x72\xe8\x4e\x07\x34\xdb",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\x87\x5f\x82\x88\x62\xb6\xb3\x34"
-                         "\xb4\x27\xc5\x5f\x9f\x7f\xf0\x9b",
-               .np     = 2,
-               .tap    = { 14, 14 },
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
-               .ksize  = 16,
-               .plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",
-               .psize  = 50,
-               .digest = "\x09\xf0\xb2\x84\x6d\x2f\x54\x3d"
-                         "\xa3\x63\xcb\xec\x8d\x62\xa3\x8d",
-       }, {
-               .key    = "\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",
-               .ksize  = 25,
-               .plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",
-               .psize  = 50,
-               .digest = "\xbd\xbb\xd7\xcf\x03\xe4\x4b\x5a"
-                         "\xa6\x0a\xf8\x15\xbe\x4d\x22\x94",
-       }, {
-               .key    = "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",
-               .ksize  = 16,
-               .plaintext = "Test With Truncation",
-               .psize  = 20,
-               .digest = "\xe7\x98\x08\xf2\x4b\x25\xfd\x03"
-                         "\x1c\x15\x5f\x0d\x55\x1d\x9a\x3a",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
-               .psize  = 54,
-               .digest = "\xdc\x73\x29\x28\xde\x98\x10\x4a"
-                         "\x1f\x59\xd3\x73\xc1\x50\xac\xbb",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "
-                          "Block-Size Data",
-               .psize  = 73,
-               .digest = "\x5c\x6b\xec\x96\x79\x3e\x16\xd4"
-                         "\x06\x90\xc2\x37\x63\x5f\x30\xc5",
-       },
-};
-
-/*
- * HMAC-RIPEMD160 test vectors from RFC2286
- */
-#define HMAC_RMD160_TEST_VECTORS       7
-
-static struct hash_testvec hmac_rmd160_tv_template[] = {
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-               .ksize  = 20,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\x24\xcb\x4b\xd6\x7d\x20\xfc\x1a\x5d\x2e"
-                         "\xd7\x73\x2d\xcc\x39\x37\x7f\x0a\x56\x68",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\xdd\xa6\xc0\x21\x3a\x48\x5a\x9e\x24\xf4"
-                         "\x74\x20\x64\xa7\xf0\x33\xb4\x3c\x40\x69",
-               .np     = 2,
-               .tap    = { 14, 14 },
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
-               .ksize  = 20,
-               .plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",
-               .psize  = 50,
-               .digest = "\xb0\xb1\x05\x36\x0d\xe7\x59\x96\x0a\xb4"
-                         "\xf3\x52\x98\xe1\x16\xe2\x95\xd8\xe7\xc1",
-       }, {
-               .key    = "\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",
-               .ksize  = 25,
-               .plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",
-               .psize  = 50,
-               .digest = "\xd5\xca\x86\x2f\x4d\x21\xd5\xe6\x10\xe1"
-                         "\x8b\x4c\xf1\xbe\xb9\x7a\x43\x65\xec\xf4",
-       }, {
-               .key    = "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",
-               .ksize  = 20,
-               .plaintext = "Test With Truncation",
-               .psize  = 20,
-               .digest = "\x76\x19\x69\x39\x78\xf9\x1d\x90\x53\x9a"
-                         "\xe7\x86\x50\x0f\xf3\xd8\xe0\x51\x8e\x39",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
-               .psize  = 54,
-               .digest = "\x64\x66\xca\x07\xac\x5e\xac\x29\xe1\xbd"
-                         "\x52\x3e\x5a\xda\x76\x05\xb7\x91\xfd\x8b",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "
-                          "Block-Size Data",
-               .psize  = 73,
-               .digest = "\x69\xea\x60\x79\x8d\x71\x61\x6c\xce\x5f"
-                         "\xd0\x87\x1e\x23\x75\x4c\xd7\x5d\x5a\x0a",
-       },
-};
-
-/*
- * HMAC-SHA1 test vectors from RFC2202
- */
-#define HMAC_SHA1_TEST_VECTORS 7
-
-static struct hash_testvec hmac_sha1_tv_template[] = {
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-               .ksize  = 20,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\xb6\x17\x31\x86\x55\x05\x72\x64"
-                         "\xe2\x8b\xc0\xb6\xfb\x37\x8c\x8e\xf1"
-                         "\x46\xbe",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\xef\xfc\xdf\x6a\xe5\xeb\x2f\xa2\xd2\x74"
-                         "\x16\xd5\xf1\x84\xdf\x9c\x25\x9a\x7c\x79",
-               .np     = 2,
-               .tap    = { 14, 14 }
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
-               .ksize  = 20,
-               .plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",
-               .psize  = 50,
-               .digest = "\x12\x5d\x73\x42\xb9\xac\x11\xcd\x91\xa3"
-                         "\x9a\xf4\x8a\xa1\x7b\x4f\x63\xf1\x75\xd3",
-       }, {
-               .key    = "\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",
-               .ksize  = 25,
-               .plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",
-               .psize  = 50,
-               .digest = "\x4c\x90\x07\xf4\x02\x62\x50\xc6\xbc\x84"
-                         "\x14\xf9\xbf\x50\xc8\x6c\x2d\x72\x35\xda",
-       }, {
-               .key    = "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c",
-               .ksize  = 20,
-               .plaintext = "Test With Truncation",
-               .psize  = 20,
-               .digest = "\x4c\x1a\x03\x42\x4b\x55\xe0\x7f\xe7\xf2"
-                         "\x7b\xe1\xd5\x8b\xb9\x32\x4a\x9a\x5a\x04",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
-               .psize  = 54,
-               .digest = "\xaa\x4a\xe5\xe1\x52\x72\xd0\x0e\x95\x70"
-                         "\x56\x37\xce\x8a\x3b\x55\xed\x40\x21\x12",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key and Larger Than One "
-                          "Block-Size Data",
-               .psize  = 73,
-               .digest = "\xe8\xe9\x9d\x0f\x45\x23\x7d\x78\x6d\x6b"
-                         "\xba\xa7\x96\x5c\x78\x08\xbb\xff\x1a\x91",
-       },
-};
-
-
-/*
- * SHA224 HMAC test vectors from RFC4231
- */
-#define HMAC_SHA224_TEST_VECTORS    4
-
-static struct hash_testvec hmac_sha224_tv_template[] = {
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                       "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                       "\x0b\x0b\x0b\x0b",
-               .ksize  = 20,
-               /*  ("Hi There") */
-               .plaintext = "\x48\x69\x20\x54\x68\x65\x72\x65",
-               .psize  = 8,
-               .digest = "\x89\x6f\xb1\x12\x8a\xbb\xdf\x19"
-                       "\x68\x32\x10\x7c\xd4\x9d\xf3\x3f"
-                       "\x47\xb4\xb1\x16\x99\x12\xba\x4f"
-                       "\x53\x68\x4b\x22",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               /* ("what do ya want for nothing?") */
-               .plaintext = "\x77\x68\x61\x74\x20\x64\x6f\x20"
-                       "\x79\x61\x20\x77\x61\x6e\x74\x20"
-                       "\x66\x6f\x72\x20\x6e\x6f\x74\x68"
-                       "\x69\x6e\x67\x3f",
-               .psize  = 28,
-               .digest = "\xa3\x0e\x01\x09\x8b\xc6\xdb\xbf"
-                       "\x45\x69\x0f\x3a\x7e\x9e\x6d\x0f"
-                       "\x8b\xbe\xa2\xa3\x9e\x61\x48\x00"
-                       "\x8f\xd0\x5e\x44",
-               .np = 4,
-               .tap    = { 7, 7, 7, 7 }
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa",
-               .ksize  = 131,
-               /* ("Test Using Larger Than Block-Size Key - Hash Key First") */
-               .plaintext = "\x54\x65\x73\x74\x20\x55\x73\x69"
-                       "\x6e\x67\x20\x4c\x61\x72\x67\x65"
-                       "\x72\x20\x54\x68\x61\x6e\x20\x42"
-                       "\x6c\x6f\x63\x6b\x2d\x53\x69\x7a"
-                       "\x65\x20\x4b\x65\x79\x20\x2d\x20"
-                       "\x48\x61\x73\x68\x20\x4b\x65\x79"
-                       "\x20\x46\x69\x72\x73\x74",
-               .psize  = 54,
-               .digest = "\x95\xe9\xa0\xdb\x96\x20\x95\xad"
-                       "\xae\xbe\x9b\x2d\x6f\x0d\xbc\xe2"
-                       "\xd4\x99\xf1\x12\xf2\xd2\xb7\x27"
-                       "\x3f\xa6\x87\x0e",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa",
-               .ksize  = 131,
-               /* ("This is a test using a larger than block-size key and a")
-               (" larger than block-size data. The key needs to be")
-                       (" hashed before being used by the HMAC algorithm.") */
-               .plaintext = "\x54\x68\x69\x73\x20\x69\x73\x20"
-                       "\x61\x20\x74\x65\x73\x74\x20\x75"
-                       "\x73\x69\x6e\x67\x20\x61\x20\x6c"
-                       "\x61\x72\x67\x65\x72\x20\x74\x68"
-                       "\x61\x6e\x20\x62\x6c\x6f\x63\x6b"
-                       "\x2d\x73\x69\x7a\x65\x20\x6b\x65"
-                       "\x79\x20\x61\x6e\x64\x20\x61\x20"
-                       "\x6c\x61\x72\x67\x65\x72\x20\x74"
-                       "\x68\x61\x6e\x20\x62\x6c\x6f\x63"
-                       "\x6b\x2d\x73\x69\x7a\x65\x20\x64"
-                       "\x61\x74\x61\x2e\x20\x54\x68\x65"
-                       "\x20\x6b\x65\x79\x20\x6e\x65\x65"
-                       "\x64\x73\x20\x74\x6f\x20\x62\x65"
-                       "\x20\x68\x61\x73\x68\x65\x64\x20"
-                       "\x62\x65\x66\x6f\x72\x65\x20\x62"
-                       "\x65\x69\x6e\x67\x20\x75\x73\x65"
-                       "\x64\x20\x62\x79\x20\x74\x68\x65"
-                       "\x20\x48\x4d\x41\x43\x20\x61\x6c"
-                       "\x67\x6f\x72\x69\x74\x68\x6d\x2e",
-               .psize  = 152,
-               .digest = "\x3a\x85\x41\x66\xac\x5d\x9f\x02"
-                       "\x3f\x54\xd5\x17\xd0\xb3\x9d\xbd"
-                       "\x94\x67\x70\xdb\x9c\x2b\x95\xc9"
-                       "\xf6\xf5\x65\xd1",
-       },
-};
-
-/*
- * HMAC-SHA256 test vectors from
- * draft-ietf-ipsec-ciph-sha-256-01.txt
- */
-#define HMAC_SHA256_TEST_VECTORS       10
-
-static struct hash_testvec hmac_sha256_tv_template[] = {
-       {
-               .key    = "\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",
-               .ksize  = 32,
-               .plaintext = "abc",
-               .psize  = 3,
-               .digest = "\xa2\x1b\x1f\x5d\x4c\xf4\xf7\x3a"
-                         "\x4d\xd9\x39\x75\x0f\x7a\x06\x6a"
-                         "\x7f\x98\xcc\x13\x1c\xb1\x6a\x66"
-                         "\x92\x75\x90\x21\xcf\xab\x81\x81",
-       }, {
-               .key    = "\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",
-               .ksize  = 32,
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 56,
-               .digest = "\x10\x4f\xdc\x12\x57\x32\x8f\x08"
-                         "\x18\x4b\xa7\x31\x31\xc5\x3c\xae"
-                         "\xe6\x98\xe3\x61\x19\x42\x11\x49"
-                         "\xea\x8c\x71\x24\x56\x69\x7d\x30",
-       }, {
-               .key    = "\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",
-               .ksize  = 32,
-               .plaintext = "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-                          "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-               .psize  = 112,
-               .digest = "\x47\x03\x05\xfc\x7e\x40\xfe\x34"
-                         "\xd3\xee\xb3\xe7\x73\xd9\x5a\xab"
-                         "\x73\xac\xf0\xfd\x06\x04\x47\xa5"
-                         "\xeb\x45\x95\xbf\x33\xa9\xd1\xa3",
-       }, {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                       "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                       "\x0b\x0b\x0b\x0b\x0b\x0b",
-               .ksize  = 32,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\x19\x8a\x60\x7e\xb4\x4b\xfb\xc6"
-                         "\x99\x03\xa0\xf1\xcf\x2b\xbd\xc5"
-                         "\xba\x0a\xa3\xf3\xd9\xae\x3c\x1c"
-                         "\x7a\x3b\x16\x96\xa0\xb6\x8c\xf7",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\x5b\xdc\xc1\x46\xbf\x60\x75\x4e"
-                         "\x6a\x04\x24\x26\x08\x95\x75\xc7"
-                         "\x5a\x00\x3f\x08\x9d\x27\x39\x83"
-                         "\x9d\xec\x58\xb9\x64\xec\x38\x43",
-               .np     = 2,
-               .tap    = { 14, 14 }
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
-               .ksize  = 32,
-               .plaintext = "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd"
-                       "\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd\xdd",
-               .psize  = 50,
-               .digest = "\xcd\xcb\x12\x20\xd1\xec\xcc\xea"
-                         "\x91\xe5\x3a\xba\x30\x92\xf9\x62"
-                         "\xe5\x49\xfe\x6c\xe9\xed\x7f\xdc"
-                         "\x43\x19\x1f\xbd\xe4\x5c\x30\xb0",
-       }, {
-               .key    = "\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",
-               .ksize  = 37,
-               .plaintext = "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd"
-                       "\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd\xcd",
-               .psize  = 50,
-               .digest = "\xd4\x63\x3c\x17\xf6\xfb\x8d\x74"
-                         "\x4c\x66\xde\xe0\xf8\xf0\x74\x55"
-                         "\x6e\xc4\xaf\x55\xef\x07\x99\x85"
-                         "\x41\x46\x8e\xb4\x9b\xd2\xe9\x17",
-       }, {
-               .key    = "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
-                       "\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c\x0c"
-                       "\x0c\x0c\x0c\x0c\x0c\x0c",
-               .ksize  = 32,
-               .plaintext = "Test With Truncation",
-               .psize  = 20,
-               .digest = "\x75\x46\xaf\x01\x84\x1f\xc0\x9b"
-                         "\x1a\xb9\xc3\x74\x9a\x5f\x1c\x17"
-                         "\xd4\xf5\x89\x66\x8a\x58\x7b\x27"
-                         "\x00\xa9\xc9\x7c\x11\x93\xcf\x42",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key - Hash Key First",
-               .psize  = 54,
-               .digest = "\x69\x53\x02\x5e\xd9\x6f\x0c\x09"
-                         "\xf8\x0a\x96\xf7\x8e\x65\x38\xdb"
-                         "\xe2\xe7\xb8\x20\xe3\xdd\x97\x0e"
-                         "\x7d\xdd\x39\x09\x1b\x32\x35\x2f",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa",
-               .ksize  = 80,
-               .plaintext = "Test Using Larger Than Block-Size Key and Larger Than "
-                          "One Block-Size Data",
-               .psize  = 73,
-               .digest = "\x63\x55\xac\x22\xe8\x90\xd0\xa3"
-                         "\xc8\x48\x1a\x5c\xa4\x82\x5b\xc8"
-                         "\x84\xd3\xe7\xa1\xff\x98\xa2\xfc"
-                         "\x2a\xc7\xd8\xe0\x64\xc3\xb2\xe6",
-       },
-};
-
-#define XCBC_AES_TEST_VECTORS 6
-
-static struct hash_testvec aes_xcbc128_tv_template[] = {
-       {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .plaintext = zeroed_string,
-               .digest = "\x75\xf0\x25\x1d\x52\x8a\xc0\x1c"
-                         "\x45\x73\xdf\xd5\x84\xd7\x9f\x29",
-               .psize  = 0,
-               .ksize  = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .plaintext = "\x00\x01\x02",
-               .digest = "\x5b\x37\x65\x80\xae\x2f\x19\xaf"
-                         "\xe7\x21\x9c\xee\xf1\x72\x75\x6f",
-               .psize  = 3,
-               .ksize  = 16,
-       } , {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                            "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .digest = "\xd2\xa2\x46\xfa\x34\x9b\x68\xa7"
-                         "\x99\x98\xa4\x39\x4f\xf7\xa2\x63",
-               .psize  = 16,
-               .ksize  = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .plaintext = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                            "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                            "\x10\x11\x12\x13",
-               .digest = "\x47\xf5\x1b\x45\x64\x96\x62\x15"
-                         "\xb8\x98\x5c\x63\x05\x5e\xd3\x08",
-               .tap    = { 10, 10 },
-               .psize  = 20,
-               .np     = 2,
-               .ksize  = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .plaintext = "\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",
-               .digest = "\xf5\x4f\x0e\xc8\xd2\xb9\xf3\xd3"
-                         "\x68\x07\x73\x4b\xd5\x28\x3f\xd4",
-               .psize  = 32,
-               .ksize  = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .plaintext = "\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",
-               .digest = "\xbe\xcb\xb3\xbc\xcd\xb5\x18\xa3"
-                         "\x06\x77\xd5\x48\x1f\xb6\xb4\xd8",
-               .tap    = { 17, 17 },
-               .psize  = 34,
-               .np     = 2,
-               .ksize  = 16,
-       }
-};
-
-/*
- * SHA384 HMAC test vectors from RFC4231
- */
-
-#define HMAC_SHA384_TEST_VECTORS       4
-
-static struct hash_testvec hmac_sha384_tv_template[] = {
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                         "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                         "\x0b\x0b\x0b\x0b",
-               .ksize  = 20,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\xaf\xd0\x39\x44\xd8\x48\x95\x62"
-                         "\x6b\x08\x25\xf4\xab\x46\x90\x7f"
-                         "\x15\xf9\xda\xdb\xe4\x10\x1e\xc6"
-                         "\x82\xaa\x03\x4c\x7c\xeb\xc5\x9c"
-                         "\xfa\xea\x9e\xa9\x07\x6e\xde\x7f"
-                         "\x4a\xf1\x52\xe8\xb2\xfa\x9c\xb6",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\xaf\x45\xd2\xe3\x76\x48\x40\x31"
-                         "\x61\x7f\x78\xd2\xb5\x8a\x6b\x1b"
-                         "\x9c\x7e\xf4\x64\xf5\xa0\x1b\x47"
-                         "\xe4\x2e\xc3\x73\x63\x22\x44\x5e"
-                         "\x8e\x22\x40\xca\x5e\x69\xe2\xc7"
-                         "\x8b\x32\x39\xec\xfa\xb2\x16\x49",
-               .np     = 4,
-               .tap    = { 7, 7, 7, 7 }
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa",
-               .ksize  = 131,
-               .plaintext = "Test Using Larger Than Block-Siz"
-                          "e Key - Hash Key First",
-               .psize  = 54,
-               .digest = "\x4e\xce\x08\x44\x85\x81\x3e\x90"
-                         "\x88\xd2\xc6\x3a\x04\x1b\xc5\xb4"
-                         "\x4f\x9e\xf1\x01\x2a\x2b\x58\x8f"
-                         "\x3c\xd1\x1f\x05\x03\x3a\xc4\xc6"
-                         "\x0c\x2e\xf6\xab\x40\x30\xfe\x82"
-                         "\x96\x24\x8d\xf1\x63\xf4\x49\x52",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa",
-               .ksize  = 131,
-               .plaintext = "This is a test u"
-                          "sing a larger th"
-                          "an block-size ke"
-                          "y and a larger t"
-                          "han block-size d"
-                          "ata. The key nee"
-                          "ds to be hashed "
-                          "before being use"
-                          "d by the HMAC al"
-                          "gorithm.",
-               .psize  = 152,
-               .digest = "\x66\x17\x17\x8e\x94\x1f\x02\x0d"
-                         "\x35\x1e\x2f\x25\x4e\x8f\xd3\x2c"
-                         "\x60\x24\x20\xfe\xb0\xb8\xfb\x9a"
-                         "\xdc\xce\xbb\x82\x46\x1e\x99\xc5"
-                         "\xa6\x78\xcc\x31\xe7\x99\x17\x6d"
-                         "\x38\x60\xe6\x11\x0c\x46\x52\x3e",
-       },
-};
-
-/*
- * SHA512 HMAC test vectors from RFC4231
- */
-
-#define HMAC_SHA512_TEST_VECTORS       4
-
-static struct hash_testvec hmac_sha512_tv_template[] = {
-       {
-               .key    = "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                         "\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b"
-                         "\x0b\x0b\x0b\x0b",
-               .ksize  = 20,
-               .plaintext = "Hi There",
-               .psize  = 8,
-               .digest = "\x87\xaa\x7c\xde\xa5\xef\x61\x9d"
-                         "\x4f\xf0\xb4\x24\x1a\x1d\x6c\xb0"
-                         "\x23\x79\xf4\xe2\xce\x4e\xc2\x78"
-                         "\x7a\xd0\xb3\x05\x45\xe1\x7c\xde"
-                         "\xda\xa8\x33\xb7\xd6\xb8\xa7\x02"
-                         "\x03\x8b\x27\x4e\xae\xa3\xf4\xe4"
-                         "\xbe\x9d\x91\x4e\xeb\x61\xf1\x70"
-                         "\x2e\x69\x6c\x20\x3a\x12\x68\x54",
-       }, {
-               .key    = "Jefe",
-               .ksize  = 4,
-               .plaintext = "what do ya want for nothing?",
-               .psize  = 28,
-               .digest = "\x16\x4b\x7a\x7b\xfc\xf8\x19\xe2"
-                         "\xe3\x95\xfb\xe7\x3b\x56\xe0\xa3"
-                         "\x87\xbd\x64\x22\x2e\x83\x1f\xd6"
-                         "\x10\x27\x0c\xd7\xea\x25\x05\x54"
-                         "\x97\x58\xbf\x75\xc0\x5a\x99\x4a"
-                         "\x6d\x03\x4f\x65\xf8\xf0\xe6\xfd"
-                         "\xca\xea\xb1\xa3\x4d\x4a\x6b\x4b"
-                         "\x63\x6e\x07\x0a\x38\xbc\xe7\x37",
-               .np     = 4,
-               .tap    = { 7, 7, 7, 7 }
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa",
-               .ksize  = 131,
-               .plaintext = "Test Using Large"
-                          "r Than Block-Siz"
-                          "e Key - Hash Key"
-                          " First",
-               .psize  = 54,
-               .digest = "\x80\xb2\x42\x63\xc7\xc1\xa3\xeb"
-                       "\xb7\x14\x93\xc1\xdd\x7b\xe8\xb4"
-                       "\x9b\x46\xd1\xf4\x1b\x4a\xee\xc1"
-                       "\x12\x1b\x01\x37\x83\xf8\xf3\x52"
-                       "\x6b\x56\xd0\x37\xe0\x5f\x25\x98"
-                       "\xbd\x0f\xd2\x21\x5d\x6a\x1e\x52"
-                       "\x95\xe6\x4f\x73\xf6\x3f\x0a\xec"
-                       "\x8b\x91\x5a\x98\x5d\x78\x65\x98",
-       }, {
-               .key    = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                       "\xaa\xaa\xaa",
-               .ksize  = 131,
-               .plaintext =
-                         "This is a test u"
-                         "sing a larger th"
-                         "an block-size ke"
-                         "y and a larger t"
-                         "han block-size d"
-                         "ata. The key nee"
-                         "ds to be hashed "
-                         "before being use"
-                         "d by the HMAC al"
-                         "gorithm.",
-               .psize  = 152,
-               .digest = "\xe3\x7b\x6a\x77\x5d\xc8\x7d\xba"
-                       "\xa4\xdf\xa9\xf9\x6e\x5e\x3f\xfd"
-                       "\xde\xbd\x71\xf8\x86\x72\x89\x86"
-                       "\x5d\xf5\xa3\x2d\x20\xcd\xc9\x44"
-                       "\xb6\x02\x2c\xac\x3c\x49\x82\xb1"
-                       "\x0d\x5e\xeb\x55\xc3\xe4\xde\x15"
-                       "\x13\x46\x76\xfb\x6d\xe0\x44\x60"
-                       "\x65\xc9\x74\x40\xfa\x8c\x6a\x58",
-       },
-};
-
 /*
  * DES test vectors.
  */
-#define DES_ENC_TEST_VECTORS           10
-#define DES_DEC_TEST_VECTORS           4
-#define DES_CBC_ENC_TEST_VECTORS       5
-#define DES_CBC_DEC_TEST_VECTORS       4
-#define DES3_EDE_ENC_TEST_VECTORS      3
-#define DES3_EDE_DEC_TEST_VECTORS      3
-#define DES3_EDE_CBC_ENC_TEST_VECTORS  1
-#define DES3_EDE_CBC_DEC_TEST_VECTORS  1
-
-static struct cipher_testvec des_enc_tv_template[] = {
-       { /* From Applied Cryptography */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7",
-               .ilen   = 8,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",
-               .rlen   = 8,
-       }, { /* Same key, different plaintext block */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x22\x33\x44\x55\x66\x77\x88\x99",
-               .ilen   = 8,
-               .result = "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",
-               .rlen   = 8,
-       }, { /* Sbox test from NBS */
-               .key    = "\x7c\xa1\x10\x45\x4a\x1a\x6e\x57",
-               .klen   = 8,
-               .input  = "\x01\xa1\xd6\xd0\x39\x77\x67\x42",
-               .ilen   = 8,
-               .result = "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",
-               .rlen   = 8,
-       }, { /* Three blocks */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\x22\x33\x44\x55\x66\x77\x88\x99"
-                         "\xca\xfe\xba\xbe\xfe\xed\xbe\xef",
-               .ilen   = 24,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"
-                         "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",
-               .rlen   = 24,
-       }, { /* Weak key */
-               .fail   = 1,
-               .wk     = 1,
-               .key    = "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7",
-               .ilen   = 8,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",
-               .rlen   = 8,
-       }, { /* Two blocks -- for testing encryption across pages */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\x22\x33\x44\x55\x66\x77\x88\x99",
-               .ilen   = 16,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",
-               .rlen   = 16,
-               .np     = 2,
-               .tap    = { 8, 8 }
-       }, { /* Four blocks -- for testing encryption with chunking */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\x22\x33\x44\x55\x66\x77\x88\x99"
-                         "\xca\xfe\xba\xbe\xfe\xed\xbe\xef"
-                         "\x22\x33\x44\x55\x66\x77\x88\x99",
-               .ilen   = 32,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"
-                         "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90"
-                         "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",
-               .rlen   = 32,
-               .np     = 3,
-               .tap    = { 14, 10, 8 }
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\x22\x33\x44\x55\x66\x77\x88\x99"
-                         "\xca\xfe\xba\xbe\xfe\xed\xbe\xef",
-               .ilen   = 24,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b"
-                         "\xb4\x99\x26\xf7\x1f\xe1\xd4\x90",
-               .rlen   = 24,
-               .np     = 4,
-               .tap    = { 2, 1, 3, 18 }
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\x22\x33\x44\x55\x66\x77\x88\x99",
-               .ilen   = 16,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\xf7\x9c\x89\x2a\x33\x8f\x4a\x8b",
-               .rlen   = 16,
-               .np     = 5,
-               .tap    = { 2, 2, 2, 2, 8 }
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xe7",
-               .ilen   = 8,
-               .result = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",
-               .rlen   = 8,
-               .np     = 8,
-               .tap    = { 1, 1, 1, 1, 1, 1, 1, 1 }
-       },
-};
-
-static struct cipher_testvec des_dec_tv_template[] = {
-       { /* From Applied Cryptography */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d",
-               .ilen   = 8,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xe7",
-               .rlen   = 8,
-       }, { /* Sbox test from NBS */
-               .key    = "\x7c\xa1\x10\x45\x4a\x1a\x6e\x57",
-               .klen   = 8,
-               .input  = "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",
-               .ilen   = 8,
-               .result = "\x01\xa1\xd6\xd0\x39\x77\x67\x42",
-               .rlen   = 8,
-       }, { /* Two blocks, for chunking test */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",
-               .ilen   = 16,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\xa3\x99\x7b\xca\xaf\x69\xa0\xf5",
-               .rlen   = 16,
-               .np     = 2,
-               .tap    = { 8, 8 }
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .input  = "\xc9\x57\x44\x25\x6a\x5e\xd3\x1d"
-                         "\x69\x0f\x5b\x0d\x9a\x26\x93\x9b",
-               .ilen   = 16,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xe7"
-                         "\xa3\x99\x7b\xca\xaf\x69\xa0\xf5",
-               .rlen   = 16,
-               .np     = 3,
-               .tap    = { 3, 12, 1 }
-       },
-};
-
-static struct cipher_testvec des_cbc_enc_tv_template[] = {
-       { /* From OpenSSL */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .input  = "\x37\x36\x35\x34\x33\x32\x31\x20"
-                         "\x4e\x6f\x77\x20\x69\x73\x20\x74"
-                         "\x68\x65\x20\x74\x69\x6d\x65\x20",
-               .ilen   = 24,
-               .result = "\xcc\xd1\x73\xff\xab\x20\x39\xf4"
-                         "\xac\xd8\xae\xfd\xdf\xd8\xa1\xeb"
-                         "\x46\x8e\x91\x15\x78\x88\xba\x68",
-               .rlen   = 24,
-       }, { /* FIPS Pub 81 */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\x12\x34\x56\x78\x90\xab\xcd\xef",
-               .input  = "\x4e\x6f\x77\x20\x69\x73\x20\x74",
-               .ilen   = 8,
-               .result = "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",
-               .rlen   = 8,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",
-               .input  = "\x68\x65\x20\x74\x69\x6d\x65\x20",
-               .ilen   = 8,
-               .result = "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",
-               .rlen   = 8,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",
-               .input  = "\x66\x6f\x72\x20\x61\x6c\x6c\x20",
-               .ilen   = 8,
-               .result = "\x68\x37\x88\x49\x9a\x7c\x05\xf6",
-               .rlen   = 8,
-       }, { /* Copy of openssl vector for chunk testing */
-            /* From OpenSSL */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .input  = "\x37\x36\x35\x34\x33\x32\x31\x20"
-                         "\x4e\x6f\x77\x20\x69\x73\x20\x74"
-                         "\x68\x65\x20\x74\x69\x6d\x65\x20",
-               .ilen   = 24,
-               .result = "\xcc\xd1\x73\xff\xab\x20\x39\xf4"
-                         "\xac\xd8\xae\xfd\xdf\xd8\xa1\xeb"
-                         "\x46\x8e\x91\x15\x78\x88\xba\x68",
-               .rlen   = 24,
-               .np     = 2,
-               .tap    = { 13, 11 }
-       },
-};
-
-static struct cipher_testvec des_cbc_dec_tv_template[] = {
-       { /* FIPS Pub 81 */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\x12\x34\x56\x78\x90\xab\xcd\xef",
-               .input  = "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",
-               .ilen   = 8,
-               .result = "\x4e\x6f\x77\x20\x69\x73\x20\x74",
-               .rlen   = 8,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\xe5\xc7\xcd\xde\x87\x2b\xf2\x7c",
-               .input  = "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",
-               .ilen   = 8,
-               .result = "\x68\x65\x20\x74\x69\x6d\x65\x20",
-               .rlen   = 8,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",
-               .input  = "\x68\x37\x88\x49\x9a\x7c\x05\xf6",
-               .ilen   = 8,
-               .result = "\x66\x6f\x72\x20\x61\x6c\x6c\x20",
-               .rlen   = 8,
-       }, { /* Copy of above, for chunk testing */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .klen   = 8,
-               .iv     = "\x43\xe9\x34\x00\x8c\x38\x9c\x0f",
-               .input  = "\x68\x37\x88\x49\x9a\x7c\x05\xf6",
-               .ilen   = 8,
-               .result = "\x66\x6f\x72\x20\x61\x6c\x6c\x20",
-               .rlen   = 8,
-               .np     = 2,
-               .tap    = { 4, 4 }
-       },
-};
-
-static struct cipher_testvec des3_ede_enc_tv_template[] = {
-       { /* These are from openssl */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\x55\x55\x55\x55\x55\x55\x55\x55"
-                         "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .klen   = 24,
-               .input  = "\x73\x6f\x6d\x65\x64\x61\x74\x61",
-               .ilen   = 8,
-               .result = "\x18\xd7\x48\xe5\x63\x62\x05\x72",
-               .rlen   = 8,
-       }, {
-               .key    = "\x03\x52\x02\x07\x67\x20\x82\x17"
-                         "\x86\x02\x87\x66\x59\x08\x21\x98"
-                         "\x64\x05\x6a\xbd\xfe\xa9\x34\x57",
-               .klen   = 24,
-               .input  = "\x73\x71\x75\x69\x67\x67\x6c\x65",
-               .ilen   = 8,
-               .result = "\xc0\x7d\x2a\x0f\xa5\x66\xfa\x30",
-               .rlen   = 8,
-       }, {
-               .key    = "\x10\x46\x10\x34\x89\x98\x80\x20"
-                         "\x91\x07\xd0\x15\x89\x19\x01\x01"
-                         "\x19\x07\x92\x10\x98\x1a\x01\x01",
-               .klen   = 24,
-               .input  = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .ilen   = 8,
-               .result = "\xe1\xef\x62\xc3\x32\xfe\x82\x5b",
-               .rlen   = 8,
-       },
-};
-
-static struct cipher_testvec des3_ede_dec_tv_template[] = {
-       { /* These are from openssl */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\x55\x55\x55\x55\x55\x55\x55\x55"
-                         "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .klen   = 24,
-               .input  = "\x18\xd7\x48\xe5\x63\x62\x05\x72",
-               .ilen   = 8,
-               .result = "\x73\x6f\x6d\x65\x64\x61\x74\x61",
-               .rlen   = 8,
-       }, {
-               .key    = "\x03\x52\x02\x07\x67\x20\x82\x17"
-                         "\x86\x02\x87\x66\x59\x08\x21\x98"
-                         "\x64\x05\x6a\xbd\xfe\xa9\x34\x57",
-               .klen   = 24,
-               .input  = "\xc0\x7d\x2a\x0f\xa5\x66\xfa\x30",
-               .ilen   = 8,
-               .result = "\x73\x71\x75\x69\x67\x67\x6c\x65",
-               .rlen   = 8,
-       }, {
-               .key    = "\x10\x46\x10\x34\x89\x98\x80\x20"
-                         "\x91\x07\xd0\x15\x89\x19\x01\x01"
-                         "\x19\x07\x92\x10\x98\x1a\x01\x01",
-               .klen   = 24,
-               .input  = "\xe1\xef\x62\xc3\x32\xfe\x82\x5b",
-               .ilen   = 8,
-               .result = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .rlen   = 8,
-       },
-};
-
-static struct cipher_testvec des3_ede_cbc_enc_tv_template[] = {
-       { /* Generated from openssl */
-               .key    = "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24"
-                         "\x44\x4D\x99\x5A\x12\xD6\x40\xC0"
-                         "\xEA\xC2\x84\xE8\x14\x95\xDB\xE8",
-               .klen   = 24,
-               .iv     = "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
-                         "\x53\x20\x63\x65\x65\x72\x73\x74"
-                         "\x54\x20\x6f\x6f\x4d\x20\x6e\x61"
-                         "\x20\x79\x65\x53\x72\x63\x74\x65"
-                         "\x20\x73\x6f\x54\x20\x6f\x61\x4d"
-                         "\x79\x6e\x53\x20\x63\x65\x65\x72"
-                         "\x73\x74\x54\x20\x6f\x6f\x4d\x20"
-                         "\x6e\x61\x20\x79\x65\x53\x72\x63"
-                         "\x74\x65\x20\x73\x6f\x54\x20\x6f"
-                         "\x61\x4d\x79\x6e\x53\x20\x63\x65"
-                         "\x65\x72\x73\x74\x54\x20\x6f\x6f"
-                         "\x4d\x20\x6e\x61\x20\x79\x65\x53"
-                         "\x72\x63\x74\x65\x20\x73\x6f\x54"
-                         "\x20\x6f\x61\x4d\x79\x6e\x53\x20"
-                         "\x63\x65\x65\x72\x73\x74\x54\x20"
-                         "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",
-               .ilen   = 128,
-               .result = "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"
-                         "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"
-                         "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"
-                         "\x12\x56\x5c\x53\x96\xb6\x00\x7d"
-                         "\x90\x48\xfc\xf5\x8d\x29\x39\xcc"
-                         "\x8a\xd5\x35\x18\x36\x23\x4e\xd7"
-                         "\x76\xd1\xda\x0c\x94\x67\xbb\x04"
-                         "\x8b\xf2\x03\x6c\xa8\xcf\xb6\xea"
-                         "\x22\x64\x47\xaa\x8f\x75\x13\xbf"
-                         "\x9f\xc2\xc3\xf0\xc9\x56\xc5\x7a"
-                         "\x71\x63\x2e\x89\x7b\x1e\x12\xca"
-                         "\xe2\x5f\xaf\xd8\xa4\xf8\xc9\x7a"
-                         "\xd6\xf9\x21\x31\x62\x44\x45\xa6"
-                         "\xd6\xbc\x5a\xd3\x2d\x54\x43\xcc"
-                         "\x9d\xde\xa5\x70\xe9\x42\x45\x8a"
-                         "\x6b\xfa\xb1\x91\x13\xb0\xd9\x19",
-               .rlen   = 128,
-       },
-};
-
-static struct cipher_testvec des3_ede_cbc_dec_tv_template[] = {
-       { /* Generated from openssl */
-               .key    = "\xE9\xC0\xFF\x2E\x76\x0B\x64\x24"
-                         "\x44\x4D\x99\x5A\x12\xD6\x40\xC0"
-                         "\xEA\xC2\x84\xE8\x14\x95\xDB\xE8",
-               .klen   = 24,
-               .iv     = "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
-               .input  = "\x0e\x2d\xb6\x97\x3c\x56\x33\xf4"
-                         "\x67\x17\x21\xc7\x6e\x8a\xd5\x49"
-                         "\x74\xb3\x49\x05\xc5\x1c\xd0\xed"
-                         "\x12\x56\x5c\x53\x96\xb6\x00\x7d"
-                         "\x90\x48\xfc\xf5\x8d\x29\x39\xcc"
-                         "\x8a\xd5\x35\x18\x36\x23\x4e\xd7"
-                         "\x76\xd1\xda\x0c\x94\x67\xbb\x04"
-                         "\x8b\xf2\x03\x6c\xa8\xcf\xb6\xea"
-                         "\x22\x64\x47\xaa\x8f\x75\x13\xbf"
-                         "\x9f\xc2\xc3\xf0\xc9\x56\xc5\x7a"
-                         "\x71\x63\x2e\x89\x7b\x1e\x12\xca"
-                         "\xe2\x5f\xaf\xd8\xa4\xf8\xc9\x7a"
-                         "\xd6\xf9\x21\x31\x62\x44\x45\xa6"
-                         "\xd6\xbc\x5a\xd3\x2d\x54\x43\xcc"
-                         "\x9d\xde\xa5\x70\xe9\x42\x45\x8a"
-                         "\x6b\xfa\xb1\x91\x13\xb0\xd9\x19",
-               .ilen   = 128,
-               .result = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
-                         "\x53\x20\x63\x65\x65\x72\x73\x74"
-                         "\x54\x20\x6f\x6f\x4d\x20\x6e\x61"
-                         "\x20\x79\x65\x53\x72\x63\x74\x65"
-                         "\x20\x73\x6f\x54\x20\x6f\x61\x4d"
-                         "\x79\x6e\x53\x20\x63\x65\x65\x72"
-                         "\x73\x74\x54\x20\x6f\x6f\x4d\x20"
-                         "\x6e\x61\x20\x79\x65\x53\x72\x63"
-                         "\x74\x65\x20\x73\x6f\x54\x20\x6f"
-                         "\x61\x4d\x79\x6e\x53\x20\x63\x65"
-                         "\x65\x72\x73\x74\x54\x20\x6f\x6f"
-                         "\x4d\x20\x6e\x61\x20\x79\x65\x53"
-                         "\x72\x63\x74\x65\x20\x73\x6f\x54"
-                         "\x20\x6f\x61\x4d\x79\x6e\x53\x20"
-                         "\x63\x65\x65\x72\x73\x74\x54\x20"
-                         "\x6f\x6f\x4d\x20\x6e\x61\x0a\x79",
-               .rlen   = 128,
-       },
-};
-
-/*
- * Blowfish test vectors.
- */
-#define BF_ENC_TEST_VECTORS    6
-#define BF_DEC_TEST_VECTORS    6
-#define BF_CBC_ENC_TEST_VECTORS        1
-#define BF_CBC_DEC_TEST_VECTORS        1
-
-static struct cipher_testvec bf_enc_tv_template[] = {
-       { /* DES test vectors from OpenSSL */
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 8,
-               .input  = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .ilen   = 8,
-               .result = "\x4e\xf9\x97\x45\x61\x98\xdd\x78",
-               .rlen   = 8,
-       }, {
-               .key    = "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e",
-               .klen   = 8,
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .ilen   = 8,
-               .result = "\xa7\x90\x79\x51\x08\xea\x3c\xae",
-               .rlen   = 8,
-       }, {
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",
-               .klen   = 8,
-               .input  = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .ilen   = 8,
-               .result = "\xe8\x7a\x24\x4e\x2c\xc8\x5e\x82",
-               .rlen   = 8,
-       }, { /* Vary the keylength... */
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"
-                         "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f",
-               .klen   = 16,
-               .input  = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .ilen   = 8,
-               .result = "\x93\x14\x28\x87\xee\x3b\xe1\x5c",
-               .rlen   = 8,
-       }, {
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"
-                         "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"
-                         "\x00\x11\x22\x33\x44",
-               .klen   = 21,
-               .input  = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .ilen   = 8,
-               .result = "\xe6\xf5\x1e\xd7\x9b\x9d\xb2\x1f",
-               .rlen   = 8,
-       }, { /* Generated with bf488 */
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"
-                         "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"
-                         "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x04\x68\x91\x04\xc2\xfd\x3b\x2f"
-                         "\x58\x40\x23\x64\x1a\xba\x61\x76"
-                         "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff",
-               .klen   = 56,
-               .input  = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .ilen   = 8,
-               .result = "\xc0\x45\x04\x01\x2e\x4e\x1f\x53",
-               .rlen   = 8,
-       },
-};
-
-static struct cipher_testvec bf_dec_tv_template[] = {
-       { /* DES test vectors from OpenSSL */
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 8,
-               .input  = "\x4e\xf9\x97\x45\x61\x98\xdd\x78",
-               .ilen   = 8,
-               .result = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .rlen   = 8,
-       }, {
-               .key    = "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e",
-               .klen   = 8,
-               .input  = "\xa7\x90\x79\x51\x08\xea\x3c\xae",
-               .ilen   = 8,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .rlen   = 8,
-       }, {
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",
-               .klen   = 8,
-               .input  = "\xe8\x7a\x24\x4e\x2c\xc8\x5e\x82",
-               .ilen   = 8,
-               .result = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .rlen   = 8,
-       }, { /* Vary the keylength... */
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"
-                         "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f",
-               .klen   = 16,
-               .input  = "\x93\x14\x28\x87\xee\x3b\xe1\x5c",
-               .ilen   = 8,
-               .result = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .rlen   = 8,
-       }, {
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"
-                         "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"
-                         "\x00\x11\x22\x33\x44",
-               .klen   = 21,
-               .input  = "\xe6\xf5\x1e\xd7\x9b\x9d\xb2\x1f",
-               .ilen   = 8,
-               .result = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .rlen   = 8,
-       }, { /* Generated with bf488, using OpenSSL, Libgcrypt and Nettle */
-               .key    = "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87"
-                         "\x78\x69\x5a\x4b\x3c\x2d\x1e\x0f"
-                         "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x04\x68\x91\x04\xc2\xfd\x3b\x2f"
-                         "\x58\x40\x23\x64\x1a\xba\x61\x76"
-                         "\x1f\x1f\x1f\x1f\x0e\x0e\x0e\x0e"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff",
-               .klen   = 56,
-               .input  = "\xc0\x45\x04\x01\x2e\x4e\x1f\x53",
-               .ilen   = 8,
-               .result = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .rlen   = 8,
-       },
-};
-
-static struct cipher_testvec bf_cbc_enc_tv_template[] = {
-       { /* From OpenSSL */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",
-               .klen   = 16,
-               .iv     = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .input  = "\x37\x36\x35\x34\x33\x32\x31\x20"
-                         "\x4e\x6f\x77\x20\x69\x73\x20\x74"
-                         "\x68\x65\x20\x74\x69\x6d\x65\x20"
-                         "\x66\x6f\x72\x20\x00\x00\x00\x00",
-               .ilen   = 32,
-               .result = "\x6b\x77\xb4\xd6\x30\x06\xde\xe6"
-                         "\x05\xb1\x56\xe2\x74\x03\x97\x93"
-                         "\x58\xde\xb9\xe7\x15\x46\x16\xd9"
-                         "\x59\xf1\x65\x2b\xd5\xff\x92\xcc",
-               .rlen   = 32,
-       },
-};
-
-static struct cipher_testvec bf_cbc_dec_tv_template[] = {
-       { /* From OpenSSL */
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xf0\xe1\xd2\xc3\xb4\xa5\x96\x87",
-               .klen   = 16,
-               .iv     = "\xfe\xdc\xba\x98\x76\x54\x32\x10",
-               .input  = "\x6b\x77\xb4\xd6\x30\x06\xde\xe6"
-                         "\x05\xb1\x56\xe2\x74\x03\x97\x93"
-                         "\x58\xde\xb9\xe7\x15\x46\x16\xd9"
-                         "\x59\xf1\x65\x2b\xd5\xff\x92\xcc",
-               .ilen   = 32,
-               .result = "\x37\x36\x35\x34\x33\x32\x31\x20"
-                         "\x4e\x6f\x77\x20\x69\x73\x20\x74"
-                         "\x68\x65\x20\x74\x69\x6d\x65\x20"
-                         "\x66\x6f\x72\x20\x00\x00\x00\x00",
-               .rlen   = 32,
-       },
-};
-
-/*
- * Twofish test vectors.
- */
-#define TF_ENC_TEST_VECTORS            3
-#define TF_DEC_TEST_VECTORS            3
-#define TF_CBC_ENC_TEST_VECTORS                4
-#define TF_CBC_DEC_TEST_VECTORS                4
-
-static struct cipher_testvec tf_enc_tv_template[] = {
-       {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",
-               .rlen   = 16,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xfe\xdc\xba\x98\x76\x54\x32\x10"
-                         "\x00\x11\x22\x33\x44\x55\x66\x77",
-               .klen   = 24,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\xcf\xd1\xd2\xe5\xa9\xbe\x9c\xdf"
-                         "\x50\x1f\x13\xb8\x92\xbd\x22\x48",
-               .rlen   = 16,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xfe\xdc\xba\x98\x76\x54\x32\x10"
-                         "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .klen   = 32,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x37\x52\x7b\xe0\x05\x23\x34\xb8"
-                         "\x9f\x0c\xfc\xca\xe8\x7c\xfa\x20",
-               .rlen   = 16,
-       },
-};
+#define DES3_SPEED_VECTORS     1
 
-static struct cipher_testvec tf_dec_tv_template[] = {
+static struct cipher_speed_template des3_speed_template[] = {
        {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .input  = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
                .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xfe\xdc\xba\x98\x76\x54\x32\x10"
-                         "\x00\x11\x22\x33\x44\x55\x66\x77",
-               .klen   = 24,
-               .input  = "\xcf\xd1\xd2\xe5\xa9\xbe\x9c\xdf"
-                         "\x50\x1f\x13\xb8\x92\xbd\x22\x48",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xfe\xdc\xba\x98\x76\x54\x32\x10"
-                         "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .klen   = 32,
-               .input  = "\x37\x52\x7b\xe0\x05\x23\x34\xb8"
-                         "\x9f\x0c\xfc\xca\xe8\x7c\xfa\x20",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       },
-};
-
-static struct cipher_testvec tf_cbc_enc_tv_template[] = {
-       { /* Generated with Nettle */
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = zeroed_string,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",
-               .rlen   = 16,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"
-                         "\x86\xcb\x08\x6b\x78\x9f\x54\x19",
-               .rlen   = 16,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"
-                         "\x86\xcb\x08\x6b\x78\x9f\x54\x19",
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x05\xef\x8c\x61\xa8\x11\x58\x26"
-                         "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",
-               .rlen   = 16,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = zeroed_string,
-               .input  = zeroed_string,
-               .ilen   = 48,
-               .result = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a"
-                         "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"
-                         "\x86\xcb\x08\x6b\x78\x9f\x54\x19"
-                         "\x05\xef\x8c\x61\xa8\x11\x58\x26"
-                         "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",
-               .rlen   = 48,
-       },
-};
-
-static struct cipher_testvec tf_cbc_dec_tv_template[] = {
-       { /* Reverse of the first four above */
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = zeroed_string,
-               .input  = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a",
-               .input  = "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"
-                         "\x86\xcb\x08\x6b\x78\x9f\x54\x19",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"
-                         "\x86\xcb\x08\x6b\x78\x9f\x54\x19",
-               .input  = "\x05\xef\x8c\x61\xa8\x11\x58\x26"
-                         "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 16,
-               .iv     = zeroed_string,
-               .input  = "\x9f\x58\x9f\x5c\xf6\x12\x2c\x32"
-                         "\xb6\xbf\xec\x2f\x2a\xe8\xc3\x5a"
-                         "\xd4\x91\xdb\x16\xe7\xb1\xc3\x9e"
-                         "\x86\xcb\x08\x6b\x78\x9f\x54\x19"
-                         "\x05\xef\x8c\x61\xa8\x11\x58\x26"
-                         "\x34\xba\x5c\xb7\x10\x6a\xa6\x41",
-               .ilen   = 48,
-               .result = zeroed_string,
-               .rlen   = 48,
-       },
-};
-
-/*
- * Serpent test vectors.  These are backwards because Serpent writes
- * octet sequences in right-to-left mode.
- */
-#define SERPENT_ENC_TEST_VECTORS       4
-#define SERPENT_DEC_TEST_VECTORS       4
-
-#define TNEPRES_ENC_TEST_VECTORS       4
-#define TNEPRES_DEC_TEST_VECTORS       4
-
-static struct cipher_testvec serpent_enc_tv_template[] = {
-       {
-               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .ilen   = 16,
-               .result = "\x12\x07\xfc\xce\x9b\xd0\xd6\x47"
-                         "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .klen   = 16,
-               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .ilen   = 16,
-               .result = "\x4c\x7d\x8a\x32\x80\x72\xa2\x2c"
-                         "\x82\x3e\x4a\x1f\x3a\xcd\xa1\x6d",
-               .rlen   = 16,
-       }, {
-               .key    = "\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",
-               .klen   = 32,
-               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .ilen   = 16,
-               .result = "\xde\x26\x9f\xf8\x33\xe4\x32\xb8"
-                         "\x5b\x2e\x88\xd2\x70\x1c\xe7\x5c",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",
-               .klen   = 16,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"
-                         "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",
-               .rlen   = 16,
-       },
-};
-
-static struct cipher_testvec tnepres_enc_tv_template[] = {
-       { /* KeySize=128, PT=0, I=1 */
-               .input  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .key    = "\x80\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 16,
-               .ilen   = 16,
-               .result = "\x49\xaf\xbf\xad\x9d\x5a\x34\x05"
-                         "\x2c\xd8\xff\xa5\x98\x6b\xd2\xdd",
-               .rlen   = 16,
-       }, { /* KeySize=192, PT=0, I=1 */
-               .key    = "\x80\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 24,
-               .input  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .ilen   = 16,
-               .result = "\xe7\x8e\x54\x02\xc7\x19\x55\x68"
-                         "\xac\x36\x78\xf7\xa3\xf6\x0c\x66",
-               .rlen   = 16,
-       }, { /* KeySize=256, PT=0, I=1 */
-               .key    = "\x80\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,
-               .input  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .ilen   = 16,
-               .result = "\xab\xed\x96\xe7\x66\xbf\x28\xcb"
-                         "\xc0\xeb\xd2\x1a\x82\xef\x08\x19",
-               .rlen   = 16,
-       }, { /* KeySize=256, I=257 */
-               .key    = "\x1f\x1e\x1d\x1c\x1b\x1a\x19\x18"
-                         "\x17\x16\x15\x14\x13\x12\x11\x10"
-                         "\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08"
-                         "\x07\x06\x05\x04\x03\x02\x01\x00",
-               .klen   = 32,
-               .input  = "\x0f\x0e\x0d\x0c\x0b\x0a\x09\x08"
-                         "\x07\x06\x05\x04\x03\x02\x01\x00",
-               .ilen   = 16,
-               .result = "\x5c\xe7\x1c\x70\xd2\x88\x2e\x5b"
-                         "\xb8\x32\xe4\x33\xf8\x9f\x26\xde",
-               .rlen   = 16,
-       },
-};
-
-
-static struct cipher_testvec serpent_dec_tv_template[] = {
-       {
-               .input  = "\x12\x07\xfc\xce\x9b\xd0\xd6\x47"
-                         "\x6a\xe9\x8f\xbe\xd1\x43\xa0\xe2",
-               .ilen   = 16,
-               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .klen   = 16,
-               .input  = "\x4c\x7d\x8a\x32\x80\x72\xa2\x2c"
-                         "\x82\x3e\x4a\x1f\x3a\xcd\xa1\x6d",
-               .ilen   = 16,
-               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .rlen   = 16,
-       }, {
-               .key    = "\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",
-               .klen   = 32,
-               .input  = "\xde\x26\x9f\xf8\x33\xe4\x32\xb8"
-                         "\x5b\x2e\x88\xd2\x70\x1c\xe7\x5c",
-               .ilen   = 16,
-               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",
-               .klen   = 16,
-               .input  = "\xdd\xd2\x6b\x98\xa5\xff\xd8\x2c"
-                         "\x05\x34\x5a\x9d\xad\xbf\xaf\x49",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       },
-};
-
-static struct cipher_testvec tnepres_dec_tv_template[] = {
-       {
-               .input  = "\x41\xcc\x6b\x31\x59\x31\x45\x97"
-                         "\x6d\x6f\xbb\x38\x4b\x37\x21\x28",
-               .ilen   = 16,
-               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .klen   = 16,
-               .input  = "\xea\xf4\xd7\xfc\xd8\x01\x34\x47"
-                         "\x81\x45\x0b\xfa\x0c\xd6\xad\x6e",
-               .ilen   = 16,
-               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .rlen   = 16,
-       }, {
-               .key    = "\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",
-               .klen   = 32,
-               .input  = "\x64\xa9\x1a\x37\xed\x9f\xe7\x49"
-                         "\xa8\x4e\x76\xd6\xf5\x0d\x78\xee",
-               .ilen   = 16,
-               .result = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .rlen   = 16,
-       }, { /* KeySize=128, I=121 */
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80",
-               .klen   = 16,
-               .input  = "\x3d\xda\xbf\xc0\x06\xda\xab\x06"
-                         "\x46\x2a\xf4\xef\x81\x54\x4e\x26",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       },
-};
-
-
-/* Cast6 test vectors from RFC 2612 */
-#define CAST6_ENC_TEST_VECTORS 3
-#define CAST6_DEC_TEST_VECTORS  3
-
-static struct cipher_testvec cast6_enc_tv_template[] = {
-       {
-               .key    = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"
-                         "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d",
-               .klen   = 16,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\xc8\x42\xa0\x89\x72\xb4\x3d\x20"
-                         "\x83\x6c\x91\xd1\xb7\x53\x0f\x6b",
-               .rlen   = 16,
-       }, {
-               .key    = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"
-                         "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"
-                         "\xba\xc7\x7a\x77\x17\x94\x28\x63",
-               .klen   = 24,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x1b\x38\x6c\x02\x10\xdc\xad\xcb"
-                         "\xdd\x0e\x41\xaa\x08\xa7\xa7\xe8",
-               .rlen   = 16,
-       }, {
-               .key    = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"
-                         "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"
-                         "\x8d\x7c\x47\xce\x26\x49\x08\x46"
-                         "\x1c\xc1\xb5\x13\x7a\xe6\xb6\x04",
-               .klen   = 32,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x4f\x6a\x20\x38\x28\x68\x97\xb9"
-                         "\xc9\x87\x01\x36\x55\x33\x17\xfa",
-               .rlen   = 16,
-       },
-};
-
-static struct cipher_testvec cast6_dec_tv_template[] = {
-       {
-               .key    = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"
-                         "\x0a\xf7\x56\x47\xf2\x9f\x61\x5d",
-               .klen   = 16,
-               .input  = "\xc8\x42\xa0\x89\x72\xb4\x3d\x20"
-                         "\x83\x6c\x91\xd1\xb7\x53\x0f\x6b",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"
-                         "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"
-                         "\xba\xc7\x7a\x77\x17\x94\x28\x63",
-               .klen   = 24,
-               .input  = "\x1b\x38\x6c\x02\x10\xdc\xad\xcb"
-                         "\xdd\x0e\x41\xaa\x08\xa7\xa7\xe8",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = "\x23\x42\xbb\x9e\xfa\x38\x54\x2c"
-                         "\xbe\xd0\xac\x83\x94\x0a\xc2\x98"
-                         "\x8d\x7c\x47\xce\x26\x49\x08\x46"
-                         "\x1c\xc1\xb5\x13\x7a\xe6\xb6\x04",
-               .klen   = 32,
-               .input  = "\x4f\x6a\x20\x38\x28\x68\x97\xb9"
-                         "\xc9\x87\x01\x36\x55\x33\x17\xfa",
-               .ilen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       },
-};
-
-
-/*
- * AES test vectors.
- */
-#define AES_ENC_TEST_VECTORS 3
-#define AES_DEC_TEST_VECTORS 3
-#define AES_CBC_ENC_TEST_VECTORS 4
-#define AES_CBC_DEC_TEST_VECTORS 4
-#define AES_LRW_ENC_TEST_VECTORS 8
-#define AES_LRW_DEC_TEST_VECTORS 8
-#define AES_XTS_ENC_TEST_VECTORS 4
-#define AES_XTS_DEC_TEST_VECTORS 4
-#define AES_CTR_ENC_TEST_VECTORS 7
-#define AES_CTR_DEC_TEST_VECTORS 6
-#define AES_GCM_ENC_TEST_VECTORS 9
-#define AES_GCM_DEC_TEST_VECTORS 8
-#define AES_CCM_ENC_TEST_VECTORS 7
-#define AES_CCM_DEC_TEST_VECTORS 7
-
-static struct cipher_testvec aes_enc_tv_template[] = {
-       { /* From FIPS-197 */
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .klen   = 16,
-               .input  = "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .ilen   = 16,
-               .result = "\x69\xc4\xe0\xd8\x6a\x7b\x04\x30"
-                         "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x10\x11\x12\x13\x14\x15\x16\x17",
-               .klen   = 24,
-               .input  = "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .ilen   = 16,
-               .result = "\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0"
-                         "\x6e\xaf\x70\xa0\xec\x0d\x71\x91",
-               .rlen   = 16,
-       }, {
-               .key    = "\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",
-               .klen   = 32,
-               .input  = "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .ilen   = 16,
-               .result = "\x8e\xa2\xb7\xca\x51\x67\x45\xbf"
-                         "\xea\xfc\x49\x90\x4b\x49\x60\x89",
-               .rlen   = 16,
-       },
-};
-
-static struct cipher_testvec aes_dec_tv_template[] = {
-       { /* From FIPS-197 */
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .klen   = 16,
-               .input  = "\x69\xc4\xe0\xd8\x6a\x7b\x04\x30"
-                         "\xd8\xcd\xb7\x80\x70\xb4\xc5\x5a",
-               .ilen   = 16,
-               .result = "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .rlen   = 16,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x10\x11\x12\x13\x14\x15\x16\x17",
-               .klen   = 24,
-               .input  = "\xdd\xa9\x7c\xa4\x86\x4c\xdf\xe0"
-                         "\x6e\xaf\x70\xa0\xec\x0d\x71\x91",
-               .ilen   = 16,
-               .result = "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .rlen   = 16,
-       }, {
-               .key    = "\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",
-               .klen   = 32,
-               .input  = "\x8e\xa2\xb7\xca\x51\x67\x45\xbf"
-                         "\xea\xfc\x49\x90\x4b\x49\x60\x89",
-               .ilen   = 16,
-               .result = "\x00\x11\x22\x33\x44\x55\x66\x77"
-                         "\x88\x99\xaa\xbb\xcc\xdd\xee\xff",
-               .rlen   = 16,
-       },
-};
-
-static struct cipher_testvec aes_cbc_enc_tv_template[] = {
-       { /* From RFC 3602 */
-               .key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"
-                         "\x51\x2e\x03\xd5\x34\x12\x00\x06",
-               .klen   = 16,
-               .iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
-                         "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
-               .input  = "Single block msg",
-               .ilen   = 16,
-               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
-                         "\x27\x08\x94\x2d\xbe\x77\x18\x1a",
-               .rlen   = 16,
-       }, {
-               .key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"
-                         "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",
-               .klen   = 16,
-               .iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
-                         "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
-               .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",
-               .ilen   = 32,
-               .result = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"
-                         "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"
-                         "\x75\x86\x60\x2d\x25\x3c\xff\xf9"
-                         "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1",
-               .rlen   = 32,
-       }, { /* From NIST SP800-38A */
-               .key    = "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"
-                         "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
-                         "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",
-               .klen   = 24,
-               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
-                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
-                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
-                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
-                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
-                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
-                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
-                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
-               .ilen   = 64,
-               .result = "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"
-                         "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"
-                         "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"
-                         "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"
-                         "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"
-                         "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"
-                         "\x08\xb0\xe2\x79\x88\x59\x88\x81"
-                         "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd",
-               .rlen   = 64,
-       }, {
-               .key    = "\x60\x3d\xeb\x10\x15\xca\x71\xbe"
-                         "\x2b\x73\xae\xf0\x85\x7d\x77\x81"
-                         "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"
-                         "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",
-               .klen   = 32,
-               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
-                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
-                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
-                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
-                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
-                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
-                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
-                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
-               .ilen   = 64,
-               .result = "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"
-                         "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"
-                         "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"
-                         "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"
-                         "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"
-                         "\xa5\x30\xe2\x63\x04\x23\x14\x61"
-                         "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"
-                         "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b",
-               .rlen   = 64,
-       },
-};
-
-static struct cipher_testvec aes_cbc_dec_tv_template[] = {
-       { /* From RFC 3602 */
-               .key    = "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"
-                         "\x51\x2e\x03\xd5\x34\x12\x00\x06",
-               .klen   = 16,
-               .iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
-                         "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
-               .input  = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
-                         "\x27\x08\x94\x2d\xbe\x77\x18\x1a",
-               .ilen   = 16,
-               .result = "Single block msg",
-               .rlen   = 16,
-       }, {
-               .key    = "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"
-                         "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",
-               .klen   = 16,
-               .iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
-                         "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
-               .input  = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"
-                         "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"
-                         "\x75\x86\x60\x2d\x25\x3c\xff\xf9"
-                         "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1",
-               .ilen   = 32,
-               .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",
-               .rlen   = 32,
-       }, { /* From NIST SP800-38A */
-               .key    = "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"
-                         "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
-                         "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",
-               .klen   = 24,
-               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .input  = "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"
-                         "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"
-                         "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"
-                         "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"
-                         "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"
-                         "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"
-                         "\x08\xb0\xe2\x79\x88\x59\x88\x81"
-                         "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd",
-               .ilen   = 64,
-               .result = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
-                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
-                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
-                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
-                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
-                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
-                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
-                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
-               .rlen   = 64,
-       }, {
-               .key    = "\x60\x3d\xeb\x10\x15\xca\x71\xbe"
-                         "\x2b\x73\xae\xf0\x85\x7d\x77\x81"
-                         "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"
-                         "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",
-               .klen   = 32,
-               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-               .input  = "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"
-                         "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"
-                         "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"
-                         "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"
-                         "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"
-                         "\xa5\x30\xe2\x63\x04\x23\x14\x61"
-                         "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"
-                         "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b",
-               .ilen   = 64,
-               .result = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
-                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
-                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
-                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
-                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
-                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
-                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
-                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
-               .rlen   = 64,
-       },
-};
-
-static struct cipher_testvec aes_lrw_enc_tv_template[] = {
-       /* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */
-       { /* LRW-32-AES 1 */
-               .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 = "\xf1\xb2\x73\xcd\x65\xa3\xdf\x5f"
-                         "\xe9\x5d\x48\x92\x54\x63\x4e\xb8",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 2 */
-               .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 = "\x00\xc8\x2b\xae\x95\xbb\xcd\xe5"
-                         "\x27\x4f\x07\x69\xb2\x60\xe1\x36",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 3 */
-               .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 = "\x76\x32\x21\x83\xed\x8f\xf1\x82"
-                         "\xf9\x59\x62\x03\x69\x0e\x5e\x01",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 4 */
-               .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 = "\x9c\x0f\x15\x2f\x55\xa2\xd8\xf0"
-                         "\xd6\x7b\x8f\x9e\x28\x22\xbc\x41",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 5 */
-               .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 = "\xd4\x27\x6a\x7f\x14\x91\x3d\x65"
-                         "\xc8\x60\x48\x02\x87\xe3\x34\x06",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 6 */
-               .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 = "\xbd\x06\xb8\xe1\xdb\x98\x89\x9e"
-                         "\xc4\x98\xe4\x91\xcf\x1c\x70\x2b",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 7 */
-               .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 = "\x5b\x90\x8e\xc1\xab\xdd\x67\x5f"
-                         "\x3d\x69\x8a\x95\x53\xc8\x9c\xe5",
-               .rlen   = 16,
-       }, {
-/* http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html */
-               .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 = "\x1a\x1d\xa9\x30\xad\xf9\x2f\x9b"
-                         "\xb6\x1d\xae\xef\xf0\x2f\xf8\x5a"
-                         "\x39\x3c\xbf\x2a\xb2\x45\xb2\x23"
-                         "\x1b\x63\x3c\xcf\xaa\xbe\xcf\x4e"
-                         "\xfa\xe8\x29\xc2\x20\x68\x2b\x3c"
-                         "\x2e\x8b\xf7\x6e\x25\xbd\xe3\x3d"
-                         "\x66\x27\xd6\xaf\xd6\x64\x3e\xe3"
-                         "\xe8\x58\x46\x97\x39\x51\x07\xde"
-                         "\xcb\x37\xbc\xa9\xc0\x5f\x75\xc3"
-                         "\x0e\x84\x23\x1d\x16\xd4\x1c\x59"
-                         "\x9c\x1a\x02\x55\xab\x3a\x97\x1d"
-                         "\xdf\xdd\xc7\x06\x51\xd7\x70\xae"
-                         "\x23\xc6\x8c\xf5\x1e\xa0\xe5\x82"
-                         "\xb8\xb2\xbf\x04\xa0\x32\x8e\x68"
-                         "\xeb\xaf\x6e\x2d\x94\x22\x2f\xce"
-                         "\x4c\xb5\x59\xe2\xa2\x2f\xa0\x98"
-                         "\x1a\x97\xc6\xd4\xb5\x00\x59\xf2"
-                         "\x84\x14\x72\xb1\x9a\x6e\xa3\x7f"
-                         "\xea\x20\xe7\xcb\x65\x77\x3a\xdf"
-                         "\xc8\x97\x67\x15\xc2\x2a\x27\xcc"
-                         "\x18\x55\xa1\x24\x0b\x24\x24\xaf"
-                         "\x5b\xec\x68\xb8\xc8\xf5\xba\x63"
-                         "\xff\xed\x89\xce\xd5\x3d\x88\xf3"
-                         "\x25\xef\x05\x7c\x3a\xef\xeb\xd8"
-                         "\x7a\x32\x0d\xd1\x1e\x58\x59\x99"
-                         "\x90\x25\xb5\x26\xb0\xe3\x2b\x6c"
-                         "\x4c\xa9\x8b\x84\x4f\x5e\x01\x50"
-                         "\x41\x30\x58\xc5\x62\x74\x52\x1d"
-                         "\x45\x24\x6a\x42\x64\x4f\x97\x1c"
-                         "\xa8\x66\xb5\x6d\x79\xd4\x0d\x48"
-                         "\xc5\x5f\xf3\x90\x32\xdd\xdd\xe1"
-                         "\xe4\xa9\x9f\xfc\xc3\x52\x5a\x46"
-                         "\xe4\x81\x84\x95\x36\x59\x7a\x6b"
-                         "\xaa\xb3\x60\xad\xce\x9f\x9f\x28"
-                         "\xe0\x01\x75\x22\xc4\x4e\xa9\x62"
-                         "\x5c\x62\x0d\x00\xcb\x13\xe8\x43"
-                         "\x72\xd4\x2d\x53\x46\xb5\xd1\x16"
-                         "\x22\x18\xdf\x34\x33\xf5\xd6\x1c"
-                         "\xb8\x79\x78\x97\x94\xff\x72\x13"
-                         "\x4c\x27\xfc\xcb\xbf\x01\x53\xa6"
-                         "\xb4\x50\x6e\xde\xdf\xb5\x43\xa4"
-                         "\x59\xdf\x52\xf9\x7c\xe0\x11\x6f"
-                         "\x2d\x14\x8e\x24\x61\x2c\xe1\x17"
-                         "\xcc\xce\x51\x0c\x19\x8a\x82\x30"
-                         "\x94\xd5\x3d\x6a\x53\x06\x5e\xbd"
-                         "\xb7\xeb\xfa\xfd\x27\x51\xde\x85"
-                         "\x1e\x86\x53\x11\x53\x94\x00\xee"
-                         "\x2b\x8c\x08\x2a\xbf\xdd\xae\x11"
-                         "\xcb\x1e\xa2\x07\x9a\x80\xcf\x62"
-                         "\x9b\x09\xdc\x95\x3c\x96\x8e\xb1"
-                         "\x09\xbd\xe4\xeb\xdb\xca\x70\x7a"
-                         "\x9e\xfa\x31\x18\x45\x3c\x21\x33"
-                         "\xb0\xb3\x2b\xea\xf3\x71\x2d\xe1"
-                         "\x03\xad\x1b\x48\xd4\x67\x27\xf0"
-                         "\x62\xe4\x3d\xfb\x9b\x08\x76\xe7"
-                         "\xdd\x2b\x01\x39\x04\x5a\x58\x7a"
-                         "\xf7\x11\x90\xec\xbd\x51\x5c\x32"
-                         "\x6b\xd7\x35\x39\x02\x6b\xf2\xa6"
-                         "\xd0\x0d\x07\xe1\x06\xc4\x5b\x7d"
-                         "\xe4\x6a\xd7\xee\x15\x1f\x83\xb4"
-                         "\xa3\xa7\x5e\xc3\x90\xb7\xef\xd3"
-                         "\xb7\x4f\xf8\x92\x4c\xb7\x3c\x29"
-                         "\xcd\x7e\x2b\x5d\x43\xea\x42\xe7"
-                         "\x74\x3f\x7d\x58\x88\x75\xde\x3e",
-               .rlen   = 512,
-       }
-};
-
-static struct cipher_testvec aes_lrw_dec_tv_template[] = {
-       /* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */
-       /* same as enc vectors with input and result reversed */
-       { /* LRW-32-AES 1 */
-               .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  = "\xf1\xb2\x73\xcd\x65\xa3\xdf\x5f"
-                         "\xe9\x5d\x48\x92\x54\x63\x4e\xb8",
-               .ilen   = 16,
-               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                         "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 2 */
-               .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  = "\x00\xc8\x2b\xae\x95\xbb\xcd\xe5"
-                         "\x27\x4f\x07\x69\xb2\x60\xe1\x36",
-               .ilen   = 16,
-               .result  = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                          "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 3 */
-               .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  = "\x76\x32\x21\x83\xed\x8f\xf1\x82"
-                         "\xf9\x59\x62\x03\x69\x0e\x5e\x01",
-               .ilen   = 16,
-               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                         "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 4 */
-               .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  = "\x9c\x0f\x15\x2f\x55\xa2\xd8\xf0"
-                         "\xd6\x7b\x8f\x9e\x28\x22\xbc\x41",
-               .ilen   = 16,
-               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                         "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 5 */
-               .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  = "\xd4\x27\x6a\x7f\x14\x91\x3d\x65"
-                         "\xc8\x60\x48\x02\x87\xe3\x34\x06",
-               .ilen   = 16,
-               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                         "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 6 */
-               .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  = "\xbd\x06\xb8\xe1\xdb\x98\x89\x9e"
-                         "\xc4\x98\xe4\x91\xcf\x1c\x70\x2b",
-               .ilen   = 16,
-               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                         "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, { /* LRW-32-AES 7 */
-               .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  = "\x5b\x90\x8e\xc1\xab\xdd\x67\x5f"
-                         "\x3d\x69\x8a\x95\x53\xc8\x9c\xe5",
-               .ilen   = 16,
-               .result = "\x30\x31\x32\x33\x34\x35\x36\x37"
-                         "\x38\x39\x41\x42\x43\x44\x45\x46",
-               .rlen   = 16,
-       }, {
-/* http://www.mail-archive.com/stds-p1619@listserv.ieee.org/msg00173.html */
-               .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  = "\x1a\x1d\xa9\x30\xad\xf9\x2f\x9b"
-                         "\xb6\x1d\xae\xef\xf0\x2f\xf8\x5a"
-                         "\x39\x3c\xbf\x2a\xb2\x45\xb2\x23"
-                         "\x1b\x63\x3c\xcf\xaa\xbe\xcf\x4e"
-                         "\xfa\xe8\x29\xc2\x20\x68\x2b\x3c"
-                         "\x2e\x8b\xf7\x6e\x25\xbd\xe3\x3d"
-                         "\x66\x27\xd6\xaf\xd6\x64\x3e\xe3"
-                         "\xe8\x58\x46\x97\x39\x51\x07\xde"
-                         "\xcb\x37\xbc\xa9\xc0\x5f\x75\xc3"
-                         "\x0e\x84\x23\x1d\x16\xd4\x1c\x59"
-                         "\x9c\x1a\x02\x55\xab\x3a\x97\x1d"
-                         "\xdf\xdd\xc7\x06\x51\xd7\x70\xae"
-                         "\x23\xc6\x8c\xf5\x1e\xa0\xe5\x82"
-                         "\xb8\xb2\xbf\x04\xa0\x32\x8e\x68"
-                         "\xeb\xaf\x6e\x2d\x94\x22\x2f\xce"
-                         "\x4c\xb5\x59\xe2\xa2\x2f\xa0\x98"
-                         "\x1a\x97\xc6\xd4\xb5\x00\x59\xf2"
-                         "\x84\x14\x72\xb1\x9a\x6e\xa3\x7f"
-                         "\xea\x20\xe7\xcb\x65\x77\x3a\xdf"
-                         "\xc8\x97\x67\x15\xc2\x2a\x27\xcc"
-                         "\x18\x55\xa1\x24\x0b\x24\x24\xaf"
-                         "\x5b\xec\x68\xb8\xc8\xf5\xba\x63"
-                         "\xff\xed\x89\xce\xd5\x3d\x88\xf3"
-                         "\x25\xef\x05\x7c\x3a\xef\xeb\xd8"
-                         "\x7a\x32\x0d\xd1\x1e\x58\x59\x99"
-                         "\x90\x25\xb5\x26\xb0\xe3\x2b\x6c"
-                         "\x4c\xa9\x8b\x84\x4f\x5e\x01\x50"
-                         "\x41\x30\x58\xc5\x62\x74\x52\x1d"
-                         "\x45\x24\x6a\x42\x64\x4f\x97\x1c"
-                         "\xa8\x66\xb5\x6d\x79\xd4\x0d\x48"
-                         "\xc5\x5f\xf3\x90\x32\xdd\xdd\xe1"
-                         "\xe4\xa9\x9f\xfc\xc3\x52\x5a\x46"
-                         "\xe4\x81\x84\x95\x36\x59\x7a\x6b"
-                         "\xaa\xb3\x60\xad\xce\x9f\x9f\x28"
-                         "\xe0\x01\x75\x22\xc4\x4e\xa9\x62"
-                         "\x5c\x62\x0d\x00\xcb\x13\xe8\x43"
-                         "\x72\xd4\x2d\x53\x46\xb5\xd1\x16"
-                         "\x22\x18\xdf\x34\x33\xf5\xd6\x1c"
-                         "\xb8\x79\x78\x97\x94\xff\x72\x13"
-                         "\x4c\x27\xfc\xcb\xbf\x01\x53\xa6"
-                         "\xb4\x50\x6e\xde\xdf\xb5\x43\xa4"
-                         "\x59\xdf\x52\xf9\x7c\xe0\x11\x6f"
-                         "\x2d\x14\x8e\x24\x61\x2c\xe1\x17"
-                         "\xcc\xce\x51\x0c\x19\x8a\x82\x30"
-                         "\x94\xd5\x3d\x6a\x53\x06\x5e\xbd"
-                         "\xb7\xeb\xfa\xfd\x27\x51\xde\x85"
-                         "\x1e\x86\x53\x11\x53\x94\x00\xee"
-                         "\x2b\x8c\x08\x2a\xbf\xdd\xae\x11"
-                         "\xcb\x1e\xa2\x07\x9a\x80\xcf\x62"
-                         "\x9b\x09\xdc\x95\x3c\x96\x8e\xb1"
-                         "\x09\xbd\xe4\xeb\xdb\xca\x70\x7a"
-                         "\x9e\xfa\x31\x18\x45\x3c\x21\x33"
-                         "\xb0\xb3\x2b\xea\xf3\x71\x2d\xe1"
-                         "\x03\xad\x1b\x48\xd4\x67\x27\xf0"
-                         "\x62\xe4\x3d\xfb\x9b\x08\x76\xe7"
-                         "\xdd\x2b\x01\x39\x04\x5a\x58\x7a"
-                         "\xf7\x11\x90\xec\xbd\x51\x5c\x32"
-                         "\x6b\xd7\x35\x39\x02\x6b\xf2\xa6"
-                         "\xd0\x0d\x07\xe1\x06\xc4\x5b\x7d"
-                         "\xe4\x6a\xd7\xee\x15\x1f\x83\xb4"
-                         "\xa3\xa7\x5e\xc3\x90\xb7\xef\xd3"
-                         "\xb7\x4f\xf8\x92\x4c\xb7\x3c\x29"
-                         "\xcd\x7e\x2b\x5d\x43\xea\x42\xe7"
-                         "\x74\x3f\x7d\x58\x88\x75\xde\x3e",
-               .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 aes_xts_enc_tv_template[] = {
-       /* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */
-       { /* XTS-AES 1 */
-               .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 = "\x91\x7c\xf6\x9e\xbd\x68\xb2\xec"
-                         "\x9b\x9f\xe9\xa3\xea\xdd\xa6\x92"
-                         "\xcd\x43\xd2\xf5\x95\x98\xed\x85"
-                         "\x8c\x02\xc2\x65\x2f\xbf\x92\x2e",
-               .rlen   = 32,
-       }, { /* XTS-AES 2 */
-               .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 = "\xc4\x54\x18\x5e\x6a\x16\x93\x6e"
-                         "\x39\x33\x40\x38\xac\xef\x83\x8b"
-                         "\xfb\x18\x6f\xff\x74\x80\xad\xc4"
-                         "\x28\x93\x82\xec\xd6\xd3\x94\xf0",
-               .rlen   = 32,
-       }, { /* XTS-AES 3 */
-               .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 = "\xaf\x85\x33\x6b\x59\x7a\xfc\x1a"
-                         "\x90\x0b\x2e\xb2\x1e\xc9\x49\xd2"
-                         "\x92\xdf\x4c\x04\x7e\x0b\x21\x53"
-                         "\x21\x86\xa5\x97\x1a\x22\x7a\x89",
-               .rlen   = 32,
-       }, { /* XTS-AES 4 */
-               .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 = "\x27\xa7\x47\x9b\xef\xa1\xd4\x76"
-                         "\x48\x9f\x30\x8c\xd4\xcf\xa6\xe2"
-                         "\xa9\x6e\x4b\xbe\x32\x08\xff\x25"
-                         "\x28\x7d\xd3\x81\x96\x16\xe8\x9c"
-                         "\xc7\x8c\xf7\xf5\xe5\x43\x44\x5f"
-                         "\x83\x33\xd8\xfa\x7f\x56\x00\x00"
-                         "\x05\x27\x9f\xa5\xd8\xb5\xe4\xad"
-                         "\x40\xe7\x36\xdd\xb4\xd3\x54\x12"
-                         "\x32\x80\x63\xfd\x2a\xab\x53\xe5"
-                         "\xea\x1e\x0a\x9f\x33\x25\x00\xa5"
-                         "\xdf\x94\x87\xd0\x7a\x5c\x92\xcc"
-                         "\x51\x2c\x88\x66\xc7\xe8\x60\xce"
-                         "\x93\xfd\xf1\x66\xa2\x49\x12\xb4"
-                         "\x22\x97\x61\x46\xae\x20\xce\x84"
-                         "\x6b\xb7\xdc\x9b\xa9\x4a\x76\x7a"
-                         "\xae\xf2\x0c\x0d\x61\xad\x02\x65"
-                         "\x5e\xa9\x2d\xc4\xc4\xe4\x1a\x89"
-                         "\x52\xc6\x51\xd3\x31\x74\xbe\x51"
-                         "\xa1\x0c\x42\x11\x10\xe6\xd8\x15"
-                         "\x88\xed\xe8\x21\x03\xa2\x52\xd8"
-                         "\xa7\x50\xe8\x76\x8d\xef\xff\xed"
-                         "\x91\x22\x81\x0a\xae\xb9\x9f\x91"
-                         "\x72\xaf\x82\xb6\x04\xdc\x4b\x8e"
-                         "\x51\xbc\xb0\x82\x35\xa6\xf4\x34"
-                         "\x13\x32\xe4\xca\x60\x48\x2a\x4b"
-                         "\xa1\xa0\x3b\x3e\x65\x00\x8f\xc5"
-                         "\xda\x76\xb7\x0b\xf1\x69\x0d\xb4"
-                         "\xea\xe2\x9c\x5f\x1b\xad\xd0\x3c"
-                         "\x5c\xcf\x2a\x55\xd7\x05\xdd\xcd"
-                         "\x86\xd4\x49\x51\x1c\xeb\x7e\xc3"
-                         "\x0b\xf1\x2b\x1f\xa3\x5b\x91\x3f"
-                         "\x9f\x74\x7a\x8a\xfd\x1b\x13\x0e"
-                         "\x94\xbf\xf9\x4e\xff\xd0\x1a\x91"
-                         "\x73\x5c\xa1\x72\x6a\xcd\x0b\x19"
-                         "\x7c\x4e\x5b\x03\x39\x36\x97\xe1"
-                         "\x26\x82\x6f\xb6\xbb\xde\x8e\xcc"
-                         "\x1e\x08\x29\x85\x16\xe2\xc9\xed"
-                         "\x03\xff\x3c\x1b\x78\x60\xf6\xde"
-                         "\x76\xd4\xce\xcd\x94\xc8\x11\x98"
-                         "\x55\xef\x52\x97\xca\x67\xe9\xf3"
-                         "\xe7\xff\x72\xb1\xe9\x97\x85\xca"
-                         "\x0a\x7e\x77\x20\xc5\xb3\x6d\xc6"
-                         "\xd7\x2c\xac\x95\x74\xc8\xcb\xbc"
-                         "\x2f\x80\x1e\x23\xe5\x6f\xd3\x44"
-                         "\xb0\x7f\x22\x15\x4b\xeb\xa0\xf0"
-                         "\x8c\xe8\x89\x1e\x64\x3e\xd9\x95"
-                         "\xc9\x4d\x9a\x69\xc9\xf1\xb5\xf4"
-                         "\x99\x02\x7a\x78\x57\x2a\xee\xbd"
-                         "\x74\xd2\x0c\xc3\x98\x81\xc2\x13"
-                         "\xee\x77\x0b\x10\x10\xe4\xbe\xa7"
-                         "\x18\x84\x69\x77\xae\x11\x9f\x7a"
-                         "\x02\x3a\xb5\x8c\xca\x0a\xd7\x52"
-                         "\xaf\xe6\x56\xbb\x3c\x17\x25\x6a"
-                         "\x9f\x6e\x9b\xf1\x9f\xdd\x5a\x38"
-                         "\xfc\x82\xbb\xe8\x72\xc5\x53\x9e"
-                         "\xdb\x60\x9e\xf4\xf7\x9c\x20\x3e"
-                         "\xbb\x14\x0f\x2e\x58\x3c\xb2\xad"
-                         "\x15\xb4\xaa\x5b\x65\x50\x16\xa8"
-                         "\x44\x92\x77\xdb\xd4\x77\xef\x2c"
-                         "\x8d\x6c\x01\x7d\xb7\x38\xb1\x8d"
-                         "\xeb\x4a\x42\x7d\x19\x23\xce\x3f"
-                         "\xf2\x62\x73\x57\x79\xa4\x18\xf2"
-                         "\x0a\x28\x2d\xf9\x20\x14\x7b\xea"
-                         "\xbe\x42\x1e\xe5\x31\x9d\x05\x68",
-               .rlen   = 512,
-       }
-};
-
-static struct cipher_testvec aes_xts_dec_tv_template[] = {
-       /* http://grouper.ieee.org/groups/1619/email/pdf00086.pdf */
-       { /* XTS-AES 1 */
-               .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 = "\x91\x7c\xf6\x9e\xbd\x68\xb2\xec"
-                        "\x9b\x9f\xe9\xa3\xea\xdd\xa6\x92"
-                        "\xcd\x43\xd2\xf5\x95\x98\xed\x85"
-                        "\x8c\x02\xc2\x65\x2f\xbf\x92\x2e",
-               .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,
-       }, { /* XTS-AES 2 */
-               .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  = "\xc4\x54\x18\x5e\x6a\x16\x93\x6e"
-                         "\x39\x33\x40\x38\xac\xef\x83\x8b"
-                         "\xfb\x18\x6f\xff\x74\x80\xad\xc4"
-                         "\x28\x93\x82\xec\xd6\xd3\x94\xf0",
-               .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,
-       }, { /* XTS-AES 3 */
-               .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 = "\xaf\x85\x33\x6b\x59\x7a\xfc\x1a"
-                         "\x90\x0b\x2e\xb2\x1e\xc9\x49\xd2"
-                         "\x92\xdf\x4c\x04\x7e\x0b\x21\x53"
-                         "\x21\x86\xa5\x97\x1a\x22\x7a\x89",
-               .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,
-       }, { /* XTS-AES 4 */
-               .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  = "\x27\xa7\x47\x9b\xef\xa1\xd4\x76"
-                         "\x48\x9f\x30\x8c\xd4\xcf\xa6\xe2"
-                         "\xa9\x6e\x4b\xbe\x32\x08\xff\x25"
-                         "\x28\x7d\xd3\x81\x96\x16\xe8\x9c"
-                         "\xc7\x8c\xf7\xf5\xe5\x43\x44\x5f"
-                         "\x83\x33\xd8\xfa\x7f\x56\x00\x00"
-                         "\x05\x27\x9f\xa5\xd8\xb5\xe4\xad"
-                         "\x40\xe7\x36\xdd\xb4\xd3\x54\x12"
-                         "\x32\x80\x63\xfd\x2a\xab\x53\xe5"
-                         "\xea\x1e\x0a\x9f\x33\x25\x00\xa5"
-                         "\xdf\x94\x87\xd0\x7a\x5c\x92\xcc"
-                         "\x51\x2c\x88\x66\xc7\xe8\x60\xce"
-                         "\x93\xfd\xf1\x66\xa2\x49\x12\xb4"
-                         "\x22\x97\x61\x46\xae\x20\xce\x84"
-                         "\x6b\xb7\xdc\x9b\xa9\x4a\x76\x7a"
-                         "\xae\xf2\x0c\x0d\x61\xad\x02\x65"
-                         "\x5e\xa9\x2d\xc4\xc4\xe4\x1a\x89"
-                         "\x52\xc6\x51\xd3\x31\x74\xbe\x51"
-                         "\xa1\x0c\x42\x11\x10\xe6\xd8\x15"
-                         "\x88\xed\xe8\x21\x03\xa2\x52\xd8"
-                         "\xa7\x50\xe8\x76\x8d\xef\xff\xed"
-                         "\x91\x22\x81\x0a\xae\xb9\x9f\x91"
-                         "\x72\xaf\x82\xb6\x04\xdc\x4b\x8e"
-                         "\x51\xbc\xb0\x82\x35\xa6\xf4\x34"
-                         "\x13\x32\xe4\xca\x60\x48\x2a\x4b"
-                         "\xa1\xa0\x3b\x3e\x65\x00\x8f\xc5"
-                         "\xda\x76\xb7\x0b\xf1\x69\x0d\xb4"
-                         "\xea\xe2\x9c\x5f\x1b\xad\xd0\x3c"
-                         "\x5c\xcf\x2a\x55\xd7\x05\xdd\xcd"
-                         "\x86\xd4\x49\x51\x1c\xeb\x7e\xc3"
-                         "\x0b\xf1\x2b\x1f\xa3\x5b\x91\x3f"
-                         "\x9f\x74\x7a\x8a\xfd\x1b\x13\x0e"
-                         "\x94\xbf\xf9\x4e\xff\xd0\x1a\x91"
-                         "\x73\x5c\xa1\x72\x6a\xcd\x0b\x19"
-                         "\x7c\x4e\x5b\x03\x39\x36\x97\xe1"
-                         "\x26\x82\x6f\xb6\xbb\xde\x8e\xcc"
-                         "\x1e\x08\x29\x85\x16\xe2\xc9\xed"
-                         "\x03\xff\x3c\x1b\x78\x60\xf6\xde"
-                         "\x76\xd4\xce\xcd\x94\xc8\x11\x98"
-                         "\x55\xef\x52\x97\xca\x67\xe9\xf3"
-                         "\xe7\xff\x72\xb1\xe9\x97\x85\xca"
-                         "\x0a\x7e\x77\x20\xc5\xb3\x6d\xc6"
-                         "\xd7\x2c\xac\x95\x74\xc8\xcb\xbc"
-                         "\x2f\x80\x1e\x23\xe5\x6f\xd3\x44"
-                         "\xb0\x7f\x22\x15\x4b\xeb\xa0\xf0"
-                         "\x8c\xe8\x89\x1e\x64\x3e\xd9\x95"
-                         "\xc9\x4d\x9a\x69\xc9\xf1\xb5\xf4"
-                         "\x99\x02\x7a\x78\x57\x2a\xee\xbd"
-                         "\x74\xd2\x0c\xc3\x98\x81\xc2\x13"
-                         "\xee\x77\x0b\x10\x10\xe4\xbe\xa7"
-                         "\x18\x84\x69\x77\xae\x11\x9f\x7a"
-                         "\x02\x3a\xb5\x8c\xca\x0a\xd7\x52"
-                         "\xaf\xe6\x56\xbb\x3c\x17\x25\x6a"
-                         "\x9f\x6e\x9b\xf1\x9f\xdd\x5a\x38"
-                         "\xfc\x82\xbb\xe8\x72\xc5\x53\x9e"
-                         "\xdb\x60\x9e\xf4\xf7\x9c\x20\x3e"
-                         "\xbb\x14\x0f\x2e\x58\x3c\xb2\xad"
-                         "\x15\xb4\xaa\x5b\x65\x50\x16\xa8"
-                         "\x44\x92\x77\xdb\xd4\x77\xef\x2c"
-                         "\x8d\x6c\x01\x7d\xb7\x38\xb1\x8d"
-                         "\xeb\x4a\x42\x7d\x19\x23\xce\x3f"
-                         "\xf2\x62\x73\x57\x79\xa4\x18\xf2"
-                         "\x0a\x28\x2d\xf9\x20\x14\x7b\xea"
-                         "\xbe\x42\x1e\xe5\x31\x9d\x05\x68",
-               .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\x5