projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d7250b4)
crypto: testmgr - unify the AEAD encryption and decryption test vectors
authorEric Biggers <ebiggers@google.com>
Sun, 13 Jan 2019 23:32:28 +0000 (15:32 -0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 18 Jan 2019 10:54:36 +0000 (18:54 +0800)
Currently testmgr has separate encryption and decryption test vectors
for AEADs.  That's massively redundant, since usually the decryption
tests are identical to the encryption tests, just with the input/result
swapped.  And for some algorithms it was forgotten to add decryption
test vectors, so for them currently only encryption is being tested.

Therefore, eliminate the redundancy by removing the AEAD decryption test
vectors and updating testmgr to test both AEAD encryption and decryption
using what used to be the encryption test vectors.  Naming is adjusted
accordingly: each aead_testvec now has a 'ptext' (plaintext), 'plen'
(plaintext length), 'ctext' (ciphertext), and 'clen' (ciphertext length)
instead of an 'input', 'ilen', 'result', and 'rlen'.  "Ciphertext" here
refers to the full ciphertext, including the authentication tag.

For now the scatterlist divisions are just given for the plaintext
length, not also the ciphertext length.  For decryption, the last
scatterlist element is just extended by the authentication tag length.

In total, this removes over 5000 lines from testmgr.h, with no reduction
in test coverage since prior patches already copied the few unique
decryption test vectors into the encryption test vectors.

The testmgr.h portion of this patch was automatically generated using
the following awk script, except that I also manually updated the
definition of 'struct aead_testvec' and fixed the location of the
comment describing the AEGIS-128 test vectors.

    BEGIN { OTHER = 0; ENCVEC = 1; DECVEC = 2; DECVEC_TAIL = 3; mode = OTHER }

    /^static const struct aead_testvec.*_enc_/ { sub("_enc", ""); mode = ENCVEC }
    /^static const struct aead_testvec.*_dec_/ { mode = DECVEC }
    mode == ENCVEC {
        sub(/\.input[[:space:]]*=/,     ".ptext\t=")
        sub(/\.result[[:space:]]*=/,    ".ctext\t=")
        sub(/\.ilen[[:space:]]*=/,      ".plen\t=")
        sub(/\.rlen[[:space:]]*=/,      ".clen\t=")
        print
    }
    mode == DECVEC_TAIL && /[^[:space:]]/ { mode = OTHER }
    mode == OTHER                         { print }
    mode == ENCVEC && /^};/               { mode = OTHER }
    mode == DECVEC && /^};/               { mode = DECVEC_TAIL }

Note that git's default diff algorithm gets confused by the testmgr.h
portion of this patch, and reports too many lines added and removed.
It's better viewed with 'git diff --minimal' (or 'git show --minimal'),
which reports "2 files changed, 1235 insertions(+), 6491 deletions(-)".

Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/testmgr.c patch | blob | history
crypto/testmgr.h patch | blob | history

diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 09f2f0f582bf72a8bb72927ed2cd57b74f0e8bd5..e4f3f5f688e7dcdf8b0d7487a71773776da25db6 100644 (file)
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -77,10 +77,8 @@ int alg_test(const char *driver, const char *alg, u32 type, u32 mask)
 #define DECRYPT 0
 
 struct aead_test_suite {
-       struct {
-               const struct aead_testvec *vecs;
-               unsigned int count;
-       } enc, dec;
+       const struct aead_testvec *vecs;
+       unsigned int count;
 };
 
 struct cipher_test_suite {
@@ -616,9 +614,6 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
        const char *e, *d;
        struct crypto_wait wait;
        unsigned int authsize, iv_len;
-       void *input;
-       void *output;
-       void *assoc;
        char *iv;
        char *xbuf[XBUFSIZE];
        char *xoutbuf[XBUFSIZE];
@@ -669,27 +664,41 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
        iv_len = crypto_aead_ivsize(tfm);
 
        for (i = 0, j = 0; i < tcount; i++) {
+               const char *input, *expected_output;
+               unsigned int inlen, outlen;
+               char *inbuf, *outbuf, *assocbuf;
+
                if (template[i].np)
                        continue;
-               if (enc && template[i].novrfy)
-                       continue;
+               if (enc) {
+                       if (template[i].novrfy)
+                               continue;
+                       input = template[i].ptext;
+                       inlen = template[i].plen;
+                       expected_output = template[i].ctext;
+                       outlen = template[i].clen;
+               } else {
+                       input = template[i].ctext;
+                       inlen = template[i].clen;
+                       expected_output = template[i].ptext;
+                       outlen = template[i].plen;
+               }
 
                j++;
 
                /* some templates have no input data but they will
                 * touch input
                 */
-               input = xbuf[0];
-               input += align_offset;
-               assoc = axbuf[0];
+               inbuf = xbuf[0] + align_offset;
+               assocbuf = axbuf[0];
 
                ret = -EINVAL;
-               if (WARN_ON(align_offset + template[i].ilen >
-                           PAGE_SIZE || template[i].alen > PAGE_SIZE))
+               if (WARN_ON(align_offset + template[i].clen > PAGE_SIZE ||
+                           template[i].alen > PAGE_SIZE))
                        goto out;
 
-               memcpy(input, template[i].input, template[i].ilen);
-               memcpy(assoc, template[i].assoc, template[i].alen);
+               memcpy(inbuf, input, inlen);
+               memcpy(assocbuf, template[i].assoc, template[i].alen);
                if (template[i].iv)
                        memcpy(iv, template[i].iv, iv_len);
                else
@@ -716,7 +725,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                } else if (ret)
                        continue;
 
-               authsize = abs(template[i].rlen - template[i].ilen);
+               authsize = template[i].clen - template[i].plen;
                ret = crypto_aead_setauthsize(tfm, authsize);
                if (ret) {
                        pr_err("alg: aead%s: Failed to set authsize to %u on test %d for %s\n",
@@ -726,23 +735,20 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
 
                k = !!template[i].alen;
                sg_init_table(sg, k + 1);
-               sg_set_buf(&sg[0], assoc, template[i].alen);
-               sg_set_buf(&sg[k], input,
-                          template[i].ilen + (enc ? authsize : 0));
-               output = input;
+               sg_set_buf(&sg[0], assocbuf, template[i].alen);
+               sg_set_buf(&sg[k], inbuf, template[i].clen);
+               outbuf = inbuf;
 
                if (diff_dst) {
                        sg_init_table(sgout, k + 1);
-                       sg_set_buf(&sgout[0], assoc, template[i].alen);
+                       sg_set_buf(&sgout[0], assocbuf, template[i].alen);
 
-                       output = xoutbuf[0];
-                       output += align_offset;
-                       sg_set_buf(&sgout[k], output,
-                                  template[i].rlen + (enc ? 0 : authsize));
+                       outbuf = xoutbuf[0] + align_offset;
+                       sg_set_buf(&sgout[k], outbuf, template[i].clen);
                }
 
-               aead_request_set_crypt(req, sg, (diff_dst) ? sgout : sg,
-                                      template[i].ilen, iv);
+               aead_request_set_crypt(req, sg, (diff_dst) ? sgout : sg, inlen,
+                                      iv);
 
                aead_request_set_ad(req, template[i].alen);
 
@@ -771,17 +777,19 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                        goto out;
                }
 
-               q = output;
-               if (memcmp(q, template[i].result, template[i].rlen)) {
+               if (memcmp(outbuf, expected_output, outlen)) {
                        pr_err("alg: aead%s: Test %d failed on %s for %s\n",
                               d, j, e, algo);
-                       hexdump(q, template[i].rlen);
+                       hexdump(outbuf, outlen);
                        ret = -EINVAL;
                        goto out;
                }
        }
 
        for (i = 0, j = 0; i < tcount; i++) {
+               const char *input, *expected_output;
+               unsigned int inlen, outlen;
+
                /* alignment tests are only done with continuous buffers */
                if (align_offset != 0)
                        break;
@@ -789,8 +797,19 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                if (!template[i].np)
                        continue;
 
-               if (enc && template[i].novrfy)
-                       continue;
+               if (enc) {
+                       if (template[i].novrfy)
+                               continue;
+                       input = template[i].ptext;
+                       inlen = template[i].plen;
+                       expected_output = template[i].ctext;
+                       outlen = template[i].clen;
+               } else {
+                       input = template[i].ctext;
+                       inlen = template[i].clen;
+                       expected_output = template[i].ptext;
+                       outlen = template[i].plen;
+               }
 
                j++;
 
@@ -818,7 +837,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                } else if (ret)
                        continue;
 
-               authsize = abs(template[i].rlen - template[i].ilen);
+               authsize = template[i].clen - template[i].plen;
 
                ret = -EINVAL;
                sg_init_table(sg, template[i].anp + template[i].np);
@@ -845,32 +864,32 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                }
 
                for (k = 0, temp = 0; k < template[i].np; k++) {
-                       if (WARN_ON(offset_in_page(IDX[k]) +
-                                   template[i].tap[k] > PAGE_SIZE))
+                       n = template[i].tap[k];
+                       if (k == template[i].np - 1 && !enc)
+                               n += authsize;
+
+                       if (WARN_ON(offset_in_page(IDX[k]) + n > 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]);
-                       sg_set_buf(&sg[template[i].anp + k],
-                                  q, template[i].tap[k]);
+                       memcpy(q, input + temp, n);
+                       sg_set_buf(&sg[template[i].anp + k], q, n);
 
                        if (diff_dst) {
                                q = xoutbuf[IDX[k] >> PAGE_SHIFT] +
                                    offset_in_page(IDX[k]);
 
-                               memset(q, 0, template[i].tap[k]);
+                               memset(q, 0, n);
 
-                               sg_set_buf(&sgout[template[i].anp + k],
-                                          q, template[i].tap[k]);
+                               sg_set_buf(&sgout[template[i].anp + k], q, n);
                        }
 
-                       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;
 
-                       temp += template[i].tap[k];
+                       temp += n;
                }
 
                ret = crypto_aead_setauthsize(tfm, authsize);
@@ -895,8 +914,7 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                }
 
                aead_request_set_crypt(req, sg, (diff_dst) ? sgout : sg,
-                                      template[i].ilen,
-                                      iv);
+                                      inlen, iv);
 
                aead_request_set_ad(req, template[i].alen);
 
@@ -935,10 +953,10 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
                                    offset_in_page(IDX[k]);
 
                        n = template[i].tap[k];
-                       if (k == template[i].np - 1)
-                               n += enc ? authsize : -authsize;
+                       if (k == template[i].np - 1 && enc)
+                               n += authsize;
 
-                       if (memcmp(q, template[i].result + temp, n)) {
+                       if (memcmp(q, expected_output + temp, n)) {
                                pr_err("alg: aead%s: Chunk test %d failed on %s at page %u for %s\n",
                                       d, j, e, k, algo);
                                hexdump(q, n);
@@ -947,9 +965,8 @@ static int __test_aead(struct crypto_aead *tfm, int enc,
 
                        q += n;
                        if (k == template[i].np - 1 && !enc) {
-                               if (!diff_dst &&
-                                       memcmp(q, template[i].input +
-                                             temp + n, authsize))
+                               if (!diff_dst && memcmp(q, input + temp + n,
+                                                       authsize))
                                        n = authsize;
                                else
                                        n = 0;
@@ -1721,8 +1738,9 @@ out:
 static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,
                         u32 type, u32 mask)
 {
+       const struct aead_test_suite *suite = &desc->suite.aead;
        struct crypto_aead *tfm;
-       int err = 0;
+       int err;
 
        tfm = crypto_alloc_aead(driver, type, mask);
        if (IS_ERR(tfm)) {
@@ -1731,18 +1749,10 @@ static int alg_test_aead(const struct alg_test_desc *desc, const char *driver,
                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);
+       err = test_aead(tfm, ENCRYPT, suite->vecs, suite->count);
+       if (!err)
+               err = test_aead(tfm, DECRYPT, suite->vecs, suite->count);
 
-out:
        crypto_free_aead(tfm);
        return err;
 }
@@ -2452,28 +2462,19 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "aegis128",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aegis128_enc_tv_template),
-                               .dec = __VECS(aegis128_dec_tv_template),
-                       }
+                       .aead = __VECS(aegis128_tv_template)
                }
        }, {
                .alg = "aegis128l",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aegis128l_enc_tv_template),
-                               .dec = __VECS(aegis128l_dec_tv_template),
-                       }
+                       .aead = __VECS(aegis128l_tv_template)
                }
        }, {
                .alg = "aegis256",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aegis256_enc_tv_template),
-                               .dec = __VECS(aegis256_dec_tv_template),
-                       }
+                       .aead = __VECS(aegis256_tv_template)
                }
        }, {
                .alg = "ansi_cprng",
@@ -2485,36 +2486,27 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(md5),ecb(cipher_null))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_md5_ecb_cipher_null_enc_tv_template),
-                               .dec = __VECS(hmac_md5_ecb_cipher_null_dec_tv_template)
-                       }
+                       .aead = __VECS(hmac_md5_ecb_cipher_null_tv_template)
                }
        }, {
                .alg = "authenc(hmac(sha1),cbc(aes))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha1_aes_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha1_aes_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha1),cbc(des))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha1_des_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha1_des_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha1),cbc(des3_ede))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha1_des3_ede_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha1_des3_ede_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha1),ctr(aes))",
@@ -2524,10 +2516,7 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(sha1),ecb(cipher_null))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha1_ecb_cipher_null_enc_tv_temp),
-                               .dec = __VECS(hmac_sha1_ecb_cipher_null_dec_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha1_ecb_cipher_null_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha1),rfc3686(ctr(aes)))",
@@ -2537,44 +2526,34 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(sha224),cbc(des))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha224_des_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha224_des_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha224),cbc(des3_ede))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha224_des3_ede_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha224_des3_ede_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha256),cbc(aes))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha256_aes_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha256_aes_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha256),cbc(des))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha256_des_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha256_des_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha256),cbc(des3_ede))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha256_des3_ede_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha256_des3_ede_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha256),ctr(aes))",
@@ -2588,18 +2567,14 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "authenc(hmac(sha384),cbc(des))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha384_des_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha384_des_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha384),cbc(des3_ede))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha384_des3_ede_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha384_des3_ede_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha384),ctr(aes))",
@@ -2614,26 +2589,20 @@ static const struct alg_test_desc alg_test_descs[] = {
                .fips_allowed = 1,
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha512_aes_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha512_aes_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha512),cbc(des))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha512_des_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha512_des_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha512),cbc(des3_ede))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(hmac_sha512_des3_ede_cbc_enc_tv_temp)
-                       }
+                       .aead = __VECS(hmac_sha512_des3_ede_cbc_tv_temp)
                }
        }, {
                .alg = "authenc(hmac(sha512),ctr(aes))",
@@ -2730,10 +2699,7 @@ static const struct alg_test_desc alg_test_descs[] = {
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aes_ccm_enc_tv_template),
-                               .dec = __VECS(aes_ccm_dec_tv_template)
-                       }
+                       .aead = __VECS(aes_ccm_tv_template)
                }
        }, {
                .alg = "cfb(aes)",
@@ -3144,10 +3110,7 @@ static const struct alg_test_desc alg_test_descs[] = {
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aes_gcm_enc_tv_template),
-                               .dec = __VECS(aes_gcm_dec_tv_template)
-                       }
+                       .aead = __VECS(aes_gcm_tv_template)
                }
        }, {
                .alg = "ghash",
@@ -3342,19 +3305,13 @@ static const struct alg_test_desc alg_test_descs[] = {
                .alg = "morus1280",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(morus1280_enc_tv_template),
-                               .dec = __VECS(morus1280_dec_tv_template),
-                       }
+                       .aead = __VECS(morus1280_tv_template)
                }
        }, {
                .alg = "morus640",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(morus640_enc_tv_template),
-                               .dec = __VECS(morus640_dec_tv_template),
-                       }
+                       .aead = __VECS(morus640_tv_template)
                }
        }, {
                .alg = "nhpoly1305",
@@ -3419,47 +3376,32 @@ static const struct alg_test_desc alg_test_descs[] = {
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aes_gcm_rfc4106_enc_tv_template),
-                               .dec = __VECS(aes_gcm_rfc4106_dec_tv_template)
-                       }
+                       .aead = __VECS(aes_gcm_rfc4106_tv_template)
                }
        }, {
                .alg = "rfc4309(ccm(aes))",
                .test = alg_test_aead,
                .fips_allowed = 1,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aes_ccm_rfc4309_enc_tv_template),
-                               .dec = __VECS(aes_ccm_rfc4309_dec_tv_template)
-                       }
+                       .aead = __VECS(aes_ccm_rfc4309_tv_template)
                }
        }, {
                .alg = "rfc4543(gcm(aes))",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(aes_gcm_rfc4543_enc_tv_template),
-                               .dec = __VECS(aes_gcm_rfc4543_dec_tv_template),
-                       }
+                       .aead = __VECS(aes_gcm_rfc4543_tv_template)
                }
        }, {
                .alg = "rfc7539(chacha20,poly1305)",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(rfc7539_enc_tv_template),
-                               .dec = __VECS(rfc7539_dec_tv_template),
-                       }
+                       .aead = __VECS(rfc7539_tv_template)
                }
        }, {
                .alg = "rfc7539esp(chacha20,poly1305)",
                .test = alg_test_aead,
                .suite = {
-                       .aead = {
-                               .enc = __VECS(rfc7539esp_enc_tv_template),
-                               .dec = __VECS(rfc7539esp_dec_tv_template),
-                       }
+                       .aead = __VECS(rfc7539esp_tv_template)
                }
        }, {
                .alg = "rmd128",
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 8d1c2dfe3becb1f6b6896d6ff1cd30ef68485118..95297240b0f1c4d8d715070a6ed8348361a268ee 100644 (file)
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -76,23 +76,45 @@ struct cipher_testvec {
        bool generates_iv;
 };
 
+/*
+ * aead_testvec:       structure to describe an AEAD test
+ * @key:       Pointer to key
+ * @iv:                Pointer to IV.  If NULL, an all-zeroes IV is used.
+ * @ptext:     Pointer to plaintext
+ * @assoc:     Pointer to associated data
+ * @ctext:     Pointer to the full authenticated ciphertext.  For AEADs that
+ *             produce a separate "ciphertext" and "authentication tag", these
+ *             two parts are concatenated: ciphertext || tag.
+ * @tap:       How to distribute ptext data in @np SGs
+ * @atap:      How to distribute assoc data in @anp SGs
+ * @np:                Numbers of SG to distribute ptext data in
+ * @anp:       Numbers of SG to distribute assoc data in
+ * @fail:      setkey() failure expected?
+ * @novrfy:    Decryption verification failure expected?
+ * @wk:                Does the test need CRYPTO_TFM_REQ_WEAK_KEY?
+ *             (e.g. setkey() needs to fail due to a weak key)
+ * @klen:      Length of @key in bytes
+ * @plen:      Length of @ptext in bytes
+ * @alen:      Length of @assoc in bytes
+ * @clen:      Length of @ctext in bytes
+ */
 struct aead_testvec {
        const char *key;
        const char *iv;
-       const char *input;
+       const char *ptext;
        const char *assoc;
-       const char *result;
+       const char *ctext;
        unsigned char tap[MAX_TAP];
        unsigned char atap[MAX_TAP];
        int np;
        int anp;
        bool fail;
-       unsigned char novrfy;   /* ccm dec verification failure expected */
-       unsigned char wk; /* weak key flag */
+       unsigned char novrfy;
+       unsigned char wk;
        unsigned char klen;
-       unsigned short ilen;
+       unsigned short plen;
+       unsigned short clen;
        unsigned short alen;
-       unsigned short rlen;
 };
 
 struct cprng_testvec {
@@ -12898,7 +12920,7 @@ static const struct cipher_testvec aes_cfb_tv_template[] = {
        },
 };
 
-static const struct aead_testvec hmac_md5_ecb_cipher_null_enc_tv_template[] = {
+static const struct aead_testvec hmac_md5_ecb_cipher_null_tv_template[] = {
        { /* Input data from RFC 2410 Case 1 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -12912,12 +12934,12 @@ static const struct aead_testvec hmac_md5_ecb_cipher_null_enc_tv_template[] = {
                          "\x00\x00\x00\x00\x00\x00\x00\x00",
                .klen   = 8 + 16 + 0,
                .iv     = "",
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .ilen   = 8,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xef"
+               .ptext  = "\x01\x23\x45\x67\x89\xab\xcd\xef",
+               .plen   = 8,
+               .ctext  = "\x01\x23\x45\x67\x89\xab\xcd\xef"
                          "\xaa\x42\xfe\x43\x8d\xea\xa3\x5a"
                          "\xb9\x3d\x9f\xb1\xa3\x8e\x9b\xae",
-               .rlen   = 8 + 16,
+               .clen   = 8 + 16,
        }, { /* Input data from RFC 2410 Case 2 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -12931,58 +12953,16 @@ static const struct aead_testvec hmac_md5_ecb_cipher_null_enc_tv_template[] = {
                          "\x00\x00\x00\x00\x00\x00\x00\x00",
                .klen   = 8 + 16 + 0,
                .iv     = "",
-               .input  = "Network Security People Have A Strange Sense Of Humor",
-               .ilen   = 53,
-               .result = "Network Security People Have A Strange Sense Of Humor"
-                         "\x73\xa5\x3e\x1c\x08\x0e\x8a\x8a"
-                         "\x8e\xb5\x5f\x90\x8e\xfe\x13\x23",
-               .rlen   = 53 + 16,
-       },
-};
-
-static const struct aead_testvec hmac_md5_ecb_cipher_null_dec_tv_template[] = {
-       {
-#ifdef __LITTLE_ENDIAN
-               .key    = "\x08\x00"            /* rta length */
-                         "\x01\x00"            /* rta type */
-#else
-               .key    = "\x00\x08"            /* rta length */
-                         "\x00\x01"            /* rta type */
-#endif
-                         "\x00\x00\x00\x00"    /* enc key length */
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 8 + 16 + 0,
-               .iv     = "",
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\xaa\x42\xfe\x43\x8d\xea\xa3\x5a"
-                         "\xb9\x3d\x9f\xb1\xa3\x8e\x9b\xae",
-               .ilen   = 8 + 16,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .rlen   = 8,
-       }, {
-#ifdef __LITTLE_ENDIAN
-               .key    = "\x08\x00"            /* rta length */
-                         "\x01\x00"            /* rta type */
-#else
-               .key    = "\x00\x08"            /* rta length */
-                         "\x00\x01"            /* rta type */
-#endif
-                         "\x00\x00\x00\x00"    /* enc key length */
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 8 + 16 + 0,
-               .iv     = "",
-               .input  = "Network Security People Have A Strange Sense Of Humor"
+               .ptext  = "Network Security People Have A Strange Sense Of Humor",
+               .plen   = 53,
+               .ctext  = "Network Security People Have A Strange Sense Of Humor"
                          "\x73\xa5\x3e\x1c\x08\x0e\x8a\x8a"
                          "\x8e\xb5\x5f\x90\x8e\xfe\x13\x23",
-               .ilen   = 53 + 16,
-               .result = "Network Security People Have A Strange Sense Of Humor",
-               .rlen   = 53,
+               .clen   = 53 + 16,
        },
 };
 
-static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha1_aes_cbc_tv_temp[] = {
        { /* RFC 3602 Case 1 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13003,14 +12983,14 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
                          "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
                .alen   = 16,
-               .input  = "Single block msg",
-               .ilen   = 16,
-               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
+               .ptext  = "Single block msg",
+               .plen   = 16,
+               .ctext  = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
                          "\x27\x08\x94\x2d\xbe\x77\x18\x1a"
                          "\x1b\x13\xcb\xaf\x89\x5e\xe1\x2c"
                          "\x13\xc5\x2e\xa3\xcc\xed\xdc\xb5"
                          "\x03\x71\xa2\x06",
-               .rlen   = 16 + 20,
+               .clen   = 16 + 20,
        }, { /* RFC 3602 Case 2 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13031,19 +13011,19 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
                          "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
                .alen   = 16,
-               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+               .ptext  = "\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"
+               .plen   = 32,
+               .ctext  = "\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"
                          "\xad\x9b\x4c\x5c\x85\xe1\xda\xae"
                          "\xee\x81\x4e\xd7\xdb\x74\xcf\x58"
                          "\x65\x39\xf8\xde",
-               .rlen   = 32 + 20,
+               .clen   = 32 + 20,
        }, { /* RFC 3602 Case 3 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13064,9 +13044,9 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\xc7\x82\xdc\x4c\x09\x8c\x66\xcb"
                          "\xd9\xcd\x27\xd8\x25\x68\x2c\x81",
                .alen   = 16,
-               .input  = "This is a 48-byte message (exactly 3 AES blocks)",
-               .ilen   = 48,
-               .result = "\xd0\xa0\x2b\x38\x36\x45\x17\x53"
+               .ptext  = "This is a 48-byte message (exactly 3 AES blocks)",
+               .plen   = 48,
+               .ctext  = "\xd0\xa0\x2b\x38\x36\x45\x17\x53"
                          "\xd4\x93\x66\x5d\x33\xf0\xe8\x86"
                          "\x2d\xea\x54\xcd\xb2\x93\xab\xc7"
                          "\x50\x69\x39\x27\x67\x72\xf8\xd5"
@@ -13075,7 +13055,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\xc2\xec\x0c\xf8\x7f\x05\xba\xca"
                          "\xff\xee\x4c\xd0\x93\xe6\x36\x7f"
                          "\x8d\x62\xf2\x1e",
-               .rlen   = 48 + 20,
+               .clen   = 48 + 20,
        }, { /* RFC 3602 Case 4 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13096,7 +13076,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x8c\xe8\x2e\xef\xbe\xa0\xda\x3c"
                          "\x44\x69\x9e\xd7\xdb\x51\xb7\xd9",
                .alen   = 16,
-               .input  = "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+               .ptext  = "\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"
@@ -13104,8 +13084,8 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
                          "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
                          "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
-               .ilen   = 64,
-               .result = "\xc3\x0e\x32\xff\xed\xc0\x77\x4e"
+               .plen   = 64,
+               .ctext  = "\xc3\x0e\x32\xff\xed\xc0\x77\x4e"
                          "\x6a\xff\x6a\xf0\x86\x9f\x71\xaa"
                          "\x0f\x3a\xf0\x7a\x9a\x31\xa9\xc6"
                          "\x84\xdb\x20\x7e\xb0\xef\x8e\x4e"
@@ -13116,7 +13096,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\x1c\x45\x57\xa9\x56\xcb\xa9\x2d"
                          "\x18\xac\xf1\xc7\x5d\xd1\xcd\x0d"
                          "\x1d\xbe\xc6\xe9",
-               .rlen   = 64 + 20,
+               .clen   = 64 + 20,
        }, { /* RFC 3602 Case 5 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13138,7 +13118,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\xe9\x6e\x8c\x08\xab\x46\x57\x63"
                          "\xfd\x09\x8d\x45\xdd\x3f\xf8\x93",
                .alen   = 24,
-               .input  = "\x08\x00\x0e\xbd\xa7\x0a\x00\x00"
+               .ptext  = "\x08\x00\x0e\xbd\xa7\x0a\x00\x00"
                          "\x8e\x9c\x08\x3d\xb9\x5b\x07\x00"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
                          "\x10\x11\x12\x13\x14\x15\x16\x17"
@@ -13148,8 +13128,8 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\x30\x31\x32\x33\x34\x35\x36\x37"
                          "\x01\x02\x03\x04\x05\x06\x07\x08"
                          "\x09\x0a\x0b\x0c\x0d\x0e\x0e\x01",
-               .ilen   = 80,
-               .result = "\xf6\x63\xc2\x5d\x32\x5c\x18\xc6"
+               .plen   = 80,
+               .ctext  = "\xf6\x63\xc2\x5d\x32\x5c\x18\xc6"
                          "\xa9\x45\x3e\x19\x4e\x12\x08\x49"
                          "\xa4\x87\x0b\x66\xcc\x6b\x99\x65"
                          "\x33\x00\x13\xb4\x89\x8d\xc8\x56"
@@ -13162,7 +13142,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\x58\xc6\x84\x75\xe4\xe9\x6b\x0c"
                          "\xe1\xc5\x0b\x73\x4d\x82\x55\xa8"
                          "\x85\xe1\x59\xf7",
-               .rlen   = 80 + 20,
+               .clen   = 80 + 20,
        }, { /* NIST SP800-38A F.2.3 CBC-AES192.Encrypt */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13184,7 +13164,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
                .alen   = 16,
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+               .ptext  = "\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"
@@ -13192,8 +13172,8 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 64,
+               .ctext  = "\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"
@@ -13204,7 +13184,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\x73\xe3\x19\x3f\x8b\xc9\xc6\xf4"
                          "\x5a\xf1\x5b\xa8\x98\x07\xc5\x36"
                          "\x47\x4c\xfc\x36",
-               .rlen   = 64 + 20,
+               .clen   = 64 + 20,
        }, { /* NIST SP800-38A F.2.5 CBC-AES256.Encrypt */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13227,7 +13207,7 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
                .alen   = 16,
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+               .ptext  = "\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"
@@ -13235,8 +13215,8 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 64,
+               .ctext  = "\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"
@@ -13247,11 +13227,11 @@ static const struct aead_testvec hmac_sha1_aes_cbc_enc_tv_temp[] = {
                          "\xa3\xe8\x9b\x17\xe3\xf4\x7f\xde"
                          "\x1b\x9f\xc6\x81\x26\x43\x4a\x87"
                          "\x51\xee\xd6\x4e",
-               .rlen   = 64 + 20,
+               .clen   = 64 + 20,
        },
 };
 
-static const struct aead_testvec hmac_sha1_ecb_cipher_null_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha1_ecb_cipher_null_tv_temp[] = {
        { /* Input data from RFC 2410 Case 1 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13266,13 +13246,13 @@ static const struct aead_testvec hmac_sha1_ecb_cipher_null_enc_tv_temp[] = {
                          "\x00\x00\x00\x00",
                .klen   = 8 + 20 + 0,
                .iv     = "",
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .ilen   = 8,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xef"
+               .ptext  = "\x01\x23\x45\x67\x89\xab\xcd\xef",
+               .plen   = 8,
+               .ctext  = "\x01\x23\x45\x67\x89\xab\xcd\xef"
                          "\x40\xc3\x0a\xa1\xc9\xa0\x28\xab"
                          "\x99\x5e\x19\x04\xd1\x72\xef\xb8"
                          "\x8c\x5e\xe4\x08",
-               .rlen   = 8 + 20,
+               .clen   = 8 + 20,
        }, { /* Input data from RFC 2410 Case 2 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13287,63 +13267,17 @@ static const struct aead_testvec hmac_sha1_ecb_cipher_null_enc_tv_temp[] = {
                          "\x00\x00\x00\x00",
                .klen   = 8 + 20 + 0,
                .iv     = "",
-               .input  = "Network Security People Have A Strange Sense Of Humor",
-               .ilen   = 53,
-               .result = "Network Security People Have A Strange Sense Of Humor"
-                         "\x75\x6f\x42\x1e\xf8\x50\x21\xd2"
-                         "\x65\x47\xee\x8e\x1a\xef\x16\xf6"
-                         "\x91\x56\xe4\xd6",
-               .rlen   = 53 + 20,
-       },
-};
-
-static const struct aead_testvec hmac_sha1_ecb_cipher_null_dec_tv_temp[] = {
-       {
-#ifdef __LITTLE_ENDIAN
-               .key    = "\x08\x00"            /* rta length */
-                         "\x01\x00"            /* rta type */
-#else
-               .key    = "\x00\x08"            /* rta length */
-                         "\x00\x01"            /* rta type */
-#endif
-                         "\x00\x00\x00\x00"    /* enc key length */
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00",
-               .klen   = 8 + 20 + 0,
-               .iv     = "",
-               .input  = "\x01\x23\x45\x67\x89\xab\xcd\xef"
-                         "\x40\xc3\x0a\xa1\xc9\xa0\x28\xab"
-                         "\x99\x5e\x19\x04\xd1\x72\xef\xb8"
-                         "\x8c\x5e\xe4\x08",
-               .ilen   = 8 + 20,
-               .result = "\x01\x23\x45\x67\x89\xab\xcd\xef",
-               .rlen   = 8,
-       }, {
-#ifdef __LITTLE_ENDIAN
-               .key    = "\x08\x00"            /* rta length */
-                         "\x01\x00"            /* rta type */
-#else
-               .key    = "\x00\x08"            /* rta length */
-                         "\x00\x01"            /* rta type */
-#endif
-                         "\x00\x00\x00\x00"    /* enc key length */
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00",
-               .klen   = 8 + 20 + 0,
-               .iv     = "",
-               .input  = "Network Security People Have A Strange Sense Of Humor"
+               .ptext  = "Network Security People Have A Strange Sense Of Humor",
+               .plen   = 53,
+               .ctext  = "Network Security People Have A Strange Sense Of Humor"
                          "\x75\x6f\x42\x1e\xf8\x50\x21\xd2"
                          "\x65\x47\xee\x8e\x1a\xef\x16\xf6"
                          "\x91\x56\xe4\xd6",
-               .ilen   = 53 + 20,
-               .result = "Network Security People Have A Strange Sense Of Humor",
-               .rlen   = 53,
+               .clen   = 53 + 20,
        },
 };
 
-static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha256_aes_cbc_tv_temp[] = {
        { /* RFC 3602 Case 1 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13365,15 +13299,15 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
                          "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
                .alen   = 16,
-               .input  = "Single block msg",
-               .ilen   = 16,
-               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
+               .ptext  = "Single block msg",
+               .plen   = 16,
+               .ctext  = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
                          "\x27\x08\x94\x2d\xbe\x77\x18\x1a"
                          "\xcc\xde\x2d\x6a\xae\xf1\x0b\xcc"
                          "\x38\x06\x38\x51\xb4\xb8\xf3\x5b"
                          "\x5c\x34\xa6\xa3\x6e\x0b\x05\xe5"
                          "\x6a\x6d\x44\xaa\x26\xa8\x44\xa5",
-               .rlen   = 16 + 32,
+               .clen   = 16 + 32,
        }, { /* RFC 3602 Case 2 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13395,12 +13329,12 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
                          "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
                .alen   = 16,
-               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+               .ptext  = "\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"
+               .plen   = 32,
+               .ctext  = "\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"
@@ -13408,7 +13342,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\x0e\x06\x58\x8f\xba\xf6\x06\xda"
                          "\x49\x69\x0d\x5b\xd4\x36\x06\x62"
                          "\x35\x5e\x54\x58\x53\x4d\xdf\xbf",
-               .rlen   = 32 + 32,
+               .clen   = 32 + 32,
        }, { /* RFC 3602 Case 3 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13430,9 +13364,9 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\xc7\x82\xdc\x4c\x09\x8c\x66\xcb"
                          "\xd9\xcd\x27\xd8\x25\x68\x2c\x81",
                .alen   = 16,
-               .input  = "This is a 48-byte message (exactly 3 AES blocks)",
-               .ilen   = 48,
-               .result = "\xd0\xa0\x2b\x38\x36\x45\x17\x53"
+               .ptext  = "This is a 48-byte message (exactly 3 AES blocks)",
+               .plen   = 48,
+               .ctext  = "\xd0\xa0\x2b\x38\x36\x45\x17\x53"
                          "\xd4\x93\x66\x5d\x33\xf0\xe8\x86"
                          "\x2d\xea\x54\xcd\xb2\x93\xab\xc7"
                          "\x50\x69\x39\x27\x67\x72\xf8\xd5"
@@ -13442,7 +13376,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\xe7\xc6\xce\x10\x31\x2f\x9b\x1d"
                          "\x24\x78\xfb\xbe\x02\xe0\x4f\x40"
                          "\x10\xbd\xaa\xc6\xa7\x79\xe0\x1a",
-               .rlen   = 48 + 32,
+               .clen   = 48 + 32,
        }, { /* RFC 3602 Case 4 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13464,7 +13398,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x8c\xe8\x2e\xef\xbe\xa0\xda\x3c"
                          "\x44\x69\x9e\xd7\xdb\x51\xb7\xd9",
                .alen   = 16,
-               .input  = "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+               .ptext  = "\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"
@@ -13472,8 +13406,8 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
                          "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
                          "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
-               .ilen   = 64,
-               .result = "\xc3\x0e\x32\xff\xed\xc0\x77\x4e"
+               .plen   = 64,
+               .ctext  = "\xc3\x0e\x32\xff\xed\xc0\x77\x4e"
                          "\x6a\xff\x6a\xf0\x86\x9f\x71\xaa"
                          "\x0f\x3a\xf0\x7a\x9a\x31\xa9\xc6"
                          "\x84\xdb\x20\x7e\xb0\xef\x8e\x4e"
@@ -13485,7 +13419,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\xe0\x93\xec\xc9\x9f\xf7\xce\xd8"
                          "\x3f\x54\xe2\x49\x39\xe3\x71\x25"
                          "\x2b\x6c\xe9\x5d\xec\xec\x2b\x64",
-               .rlen   = 64 + 32,
+               .clen   = 64 + 32,
        }, { /* RFC 3602 Case 5 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13508,7 +13442,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\xe9\x6e\x8c\x08\xab\x46\x57\x63"
                          "\xfd\x09\x8d\x45\xdd\x3f\xf8\x93",
                .alen   = 24,
-               .input  = "\x08\x00\x0e\xbd\xa7\x0a\x00\x00"
+               .ptext  = "\x08\x00\x0e\xbd\xa7\x0a\x00\x00"
                          "\x8e\x9c\x08\x3d\xb9\x5b\x07\x00"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
                          "\x10\x11\x12\x13\x14\x15\x16\x17"
@@ -13518,8 +13452,8 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\x30\x31\x32\x33\x34\x35\x36\x37"
                          "\x01\x02\x03\x04\x05\x06\x07\x08"
                          "\x09\x0a\x0b\x0c\x0d\x0e\x0e\x01",
-               .ilen   = 80,
-               .result = "\xf6\x63\xc2\x5d\x32\x5c\x18\xc6"
+               .plen   = 80,
+               .ctext  = "\xf6\x63\xc2\x5d\x32\x5c\x18\xc6"
                          "\xa9\x45\x3e\x19\x4e\x12\x08\x49"
                          "\xa4\x87\x0b\x66\xcc\x6b\x99\x65"
                          "\x33\x00\x13\xb4\x89\x8d\xc8\x56"
@@ -13533,7 +13467,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\x3a\xd2\xe1\x03\x86\xa5\x59\xb7"
                          "\x73\xc3\x46\x20\x2c\xb1\xef\x68"
                          "\xbb\x8a\x32\x7e\x12\x8c\x69\xcf",
-               .rlen   = 80 + 32,
+               .clen   = 80 + 32,
        }, { /* NIST SP800-38A F.2.3 CBC-AES192.Encrypt */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13556,7 +13490,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
                .alen   = 16,
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+               .ptext  = "\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"
@@ -13564,8 +13498,8 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 64,
+               .ctext  = "\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"
@@ -13577,7 +13511,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\x61\x81\x31\xea\x5b\x3d\x8e\xfb"
                          "\xca\x71\x85\x93\xf7\x85\x55\x8b"
                          "\x7a\xe4\x94\xca\x8b\xba\x19\x33",
-               .rlen   = 64 + 32,
+               .clen   = 64 + 32,
        }, { /* NIST SP800-38A F.2.5 CBC-AES256.Encrypt */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13601,7 +13535,7 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
                .alen   = 16,
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+               .ptext  = "\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"
@@ -13609,8 +13543,8 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 64,
+               .ctext  = "\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"
@@ -13622,11 +13556,11 @@ static const struct aead_testvec hmac_sha256_aes_cbc_enc_tv_temp[] = {
                          "\x8f\x74\xbd\x17\x92\x03\xbe\x8f"
                          "\xf3\x61\xde\x1c\xe9\xdb\xcd\xd0"
                          "\xcc\xce\xe9\x85\x57\xcf\x6f\x5f",
-               .rlen   = 64 + 32,
+               .clen   = 64 + 32,
        },
 };
 
-static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha512_aes_cbc_tv_temp[] = {
        { /* RFC 3602 Case 1 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13652,9 +13586,9 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
                          "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
                .alen   = 16,
-               .input  = "Single block msg",
-               .ilen   = 16,
-               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
+               .ptext  = "Single block msg",
+               .plen   = 16,
+               .ctext  = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
                          "\x27\x08\x94\x2d\xbe\x77\x18\x1a"
                          "\x3f\xdc\xad\x90\x03\x63\x5e\x68"
                          "\xc3\x13\xdd\xa4\x5c\x4d\x54\xa7"
@@ -13664,7 +13598,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\xe8\x9a\x7c\x06\x3d\xcb\xff\xb2"
                          "\xfa\x20\x89\xdd\x9c\xac\x9e\x16"
                          "\x18\x8a\xa0\x6d\x01\x6c\xa3\x3a",
-               .rlen   = 16 + 64,
+               .clen   = 16 + 64,
        }, { /* RFC 3602 Case 2 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13690,12 +13624,12 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
                          "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
                .alen   = 16,
-               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+               .ptext  = "\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"
+               .plen   = 32,
+               .ctext  = "\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"
@@ -13707,7 +13641,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\x46\x32\x7c\x41\x9c\x59\x3e\xe9"
                          "\x8f\x9f\xd4\x31\xd6\x22\xbd\xf8"
                          "\xf7\x0a\x94\xe5\xa9\xc3\xf6\x9d",
-               .rlen   = 32 + 64,
+               .clen   = 32 + 64,
        }, { /* RFC 3602 Case 3 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13733,9 +13667,9 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\xc7\x82\xdc\x4c\x09\x8c\x66\xcb"
                          "\xd9\xcd\x27\xd8\x25\x68\x2c\x81",
                .alen   = 16,
-               .input  = "This is a 48-byte message (exactly 3 AES blocks)",
-               .ilen   = 48,
-               .result = "\xd0\xa0\x2b\x38\x36\x45\x17\x53"
+               .ptext  = "This is a 48-byte message (exactly 3 AES blocks)",
+               .plen   = 48,
+               .ctext  = "\xd0\xa0\x2b\x38\x36\x45\x17\x53"
                          "\xd4\x93\x66\x5d\x33\xf0\xe8\x86"
                          "\x2d\xea\x54\xcd\xb2\x93\xab\xc7"
                          "\x50\x69\x39\x27\x67\x72\xf8\xd5"
@@ -13749,7 +13683,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\x08\xea\x29\x6c\x74\x67\x3f\xb0"
                          "\xac\x7f\x5c\x1d\xf5\xee\x22\x66"
                          "\x27\xa6\xb6\x13\xba\xba\xf0\xc2",
-               .rlen   = 48 + 64,
+               .clen   = 48 + 64,
        }, { /* RFC 3602 Case 4 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13775,7 +13709,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x8c\xe8\x2e\xef\xbe\xa0\xda\x3c"
                          "\x44\x69\x9e\xd7\xdb\x51\xb7\xd9",
                .alen   = 16,
-               .input  = "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+               .ptext  = "\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"
@@ -13783,8 +13717,8 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
                          "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
                          "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
-               .ilen   = 64,
-               .result = "\xc3\x0e\x32\xff\xed\xc0\x77\x4e"
+               .plen   = 64,
+               .ctext  = "\xc3\x0e\x32\xff\xed\xc0\x77\x4e"
                          "\x6a\xff\x6a\xf0\x86\x9f\x71\xaa"
                          "\x0f\x3a\xf0\x7a\x9a\x31\xa9\xc6"
                          "\x84\xdb\x20\x7e\xb0\xef\x8e\x4e"
@@ -13800,7 +13734,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\xbc\x6f\xed\xd5\x8d\xde\x23\x7c"
                          "\x62\x98\x14\xd7\x2f\x37\x8d\xdf"
                          "\xf4\x33\x80\xeb\x8e\xb4\xa4\xda",
-               .rlen   = 64 + 64,
+               .clen   = 64 + 64,
        }, { /* RFC 3602 Case 5 */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13827,7 +13761,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\xe9\x6e\x8c\x08\xab\x46\x57\x63"
                          "\xfd\x09\x8d\x45\xdd\x3f\xf8\x93",
                .alen   = 24,
-               .input  = "\x08\x00\x0e\xbd\xa7\x0a\x00\x00"
+               .ptext  = "\x08\x00\x0e\xbd\xa7\x0a\x00\x00"
                          "\x8e\x9c\x08\x3d\xb9\x5b\x07\x00"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
                          "\x10\x11\x12\x13\x14\x15\x16\x17"
@@ -13837,8 +13771,8 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\x30\x31\x32\x33\x34\x35\x36\x37"
                          "\x01\x02\x03\x04\x05\x06\x07\x08"
                          "\x09\x0a\x0b\x0c\x0d\x0e\x0e\x01",
-               .ilen   = 80,
-               .result = "\xf6\x63\xc2\x5d\x32\x5c\x18\xc6"
+               .plen   = 80,
+               .ctext  = "\xf6\x63\xc2\x5d\x32\x5c\x18\xc6"
                          "\xa9\x45\x3e\x19\x4e\x12\x08\x49"
                          "\xa4\x87\x0b\x66\xcc\x6b\x99\x65"
                          "\x33\x00\x13\xb4\x89\x8d\xc8\x56"
@@ -13856,7 +13790,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\x92\x26\xc1\x76\x20\x11\xeb\xba"
                          "\x62\x4f\x9a\x62\x25\xc3\x75\x80"
                          "\xb7\x0a\x17\xf5\xd7\x94\xb4\x14",
-               .rlen   = 80 + 64,
+               .clen   = 80 + 64,
        }, { /* NIST SP800-38A F.2.3 CBC-AES192.Encrypt */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13883,7 +13817,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
                .alen   = 16,
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+               .ptext  = "\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"
@@ -13891,8 +13825,8 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 64,
+               .ctext  = "\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"
@@ -13908,7 +13842,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\xba\x03\xd5\x32\xfa\x5f\x41\x58"
                          "\x8d\x43\x98\xa7\x94\x16\x07\x02"
                          "\x0f\xb6\x81\x50\x28\x95\x2e\x75",
-               .rlen   = 64 + 64,
+               .clen   = 64 + 64,
        }, { /* NIST SP800-38A F.2.5 CBC-AES256.Encrypt */
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13936,7 +13870,7 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
                .alen   = 16,
-               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+               .ptext  = "\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"
@@ -13944,8 +13878,8 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 64,
+               .ctext  = "\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"
@@ -13961,11 +13895,11 @@ static const struct aead_testvec hmac_sha512_aes_cbc_enc_tv_temp[] = {
                          "\xe3\x8d\x64\xc3\x8d\xff\x7c\x8c"
                          "\xdb\xbf\xa0\xb4\x01\xa2\xa8\xa2"
                          "\x2c\xb1\x62\x2c\x10\xca\xf1\x21",
-               .rlen   = 64 + 64,
+               .clen   = 64 + 64,
        },
 };
 
-static const struct aead_testvec hmac_sha1_des_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha1_des_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -13984,7 +13918,7 @@ static const struct aead_testvec hmac_sha1_des_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14000,8 +13934,8 @@ static const struct aead_testvec hmac_sha1_des_cbc_enc_tv_temp[] = {
                          "\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 = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
+               .plen   = 128,
+               .ctext  = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
                          "\x54\x31\x85\x37\xed\x6b\x01\x8d"
                          "\xe3\xcc\xe0\x1d\x5e\xf3\xfe\xf1"
                          "\x41\xaa\x33\x91\xa7\x7d\x99\x88"
@@ -14020,11 +13954,11 @@ static const struct aead_testvec hmac_sha1_des_cbc_enc_tv_temp[] = {
                          "\x95\x16\x20\x09\xf5\x95\x19\xfd"
                          "\x3c\xc7\xe0\x42\xc0\x14\x69\xfa"
                          "\x5c\x44\xa9\x37",
-                         .rlen = 128 + 20,
+                         .clen = 128 + 20,
        },
 };
 
-static const struct aead_testvec hmac_sha224_des_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha224_des_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14043,7 +13977,7 @@ static const struct aead_testvec hmac_sha224_des_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14059,8 +13993,8 @@ static const struct aead_testvec hmac_sha224_des_cbc_enc_tv_temp[] = {
                          "\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 = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
+               .plen   = 128,
+               .ctext  = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
                          "\x54\x31\x85\x37\xed\x6b\x01\x8d"
                          "\xe3\xcc\xe0\x1d\x5e\xf3\xfe\xf1"
                          "\x41\xaa\x33\x91\xa7\x7d\x99\x88"
@@ -14079,11 +14013,11 @@ static const struct aead_testvec hmac_sha224_des_cbc_enc_tv_temp[] = {
                          "\x9c\x2d\x7e\xee\x20\x34\x55\x0a"
                          "\xce\xb5\x4e\x64\x53\xe7\xbf\x91"
                          "\xab\xd4\xd9\xda\xc9\x12\xae\xf7",
-               .rlen   = 128 + 24,
+               .clen   = 128 + 24,
        },
 };
 
-static const struct aead_testvec hmac_sha256_des_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha256_des_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14103,7 +14037,7 @@ static const struct aead_testvec hmac_sha256_des_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14119,8 +14053,8 @@ static const struct aead_testvec hmac_sha256_des_cbc_enc_tv_temp[] = {
                          "\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 = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
+               .plen   = 128,
+               .ctext  = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
                          "\x54\x31\x85\x37\xed\x6b\x01\x8d"
                          "\xe3\xcc\xe0\x1d\x5e\xf3\xfe\xf1"
                          "\x41\xaa\x33\x91\xa7\x7d\x99\x88"
@@ -14140,11 +14074,11 @@ static const struct aead_testvec hmac_sha256_des_cbc_enc_tv_temp[] = {
                          "\x50\xf6\x5d\xab\x4b\x51\x4e\x5e"
                          "\xde\x63\xde\x76\x52\xde\x9f\xba"
                          "\x90\xcf\x15\xf2\xbb\x6e\x84\x00",
-               .rlen   = 128 + 32,
+               .clen   = 128 + 32,
        },
 };
 
-static const struct aead_testvec hmac_sha384_des_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha384_des_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14166,7 +14100,7 @@ static const struct aead_testvec hmac_sha384_des_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14182,8 +14116,8 @@ static const struct aead_testvec hmac_sha384_des_cbc_enc_tv_temp[] = {
                          "\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 = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
+               .plen   = 128,
+               .ctext  = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
                          "\x54\x31\x85\x37\xed\x6b\x01\x8d"
                          "\xe3\xcc\xe0\x1d\x5e\xf3\xfe\xf1"
                          "\x41\xaa\x33\x91\xa7\x7d\x99\x88"
@@ -14205,11 +14139,11 @@ static const struct aead_testvec hmac_sha384_des_cbc_enc_tv_temp[] = {
                          "\x5e\x67\xb5\x74\xe7\xe7\x85\x61"
                          "\x6a\x95\x26\x75\xcc\x53\x89\xf3"
                          "\x74\xc9\x2a\x76\x20\xa2\x64\x62",
-               .rlen   = 128 + 48,
+               .clen   = 128 + 48,
        },
 };
 
-static const struct aead_testvec hmac_sha512_des_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha512_des_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14233,7 +14167,7 @@ static const struct aead_testvec hmac_sha512_des_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14249,8 +14183,8 @@ static const struct aead_testvec hmac_sha512_des_cbc_enc_tv_temp[] = {
                          "\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 = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
+               .plen   = 128,
+               .ctext  = "\x70\xd6\xde\x64\x87\x17\xf1\xe8"
                          "\x54\x31\x85\x37\xed\x6b\x01\x8d"
                          "\xe3\xcc\xe0\x1d\x5e\xf3\xfe\xf1"
                          "\x41\xaa\x33\x91\xa7\x7d\x99\x88"
@@ -14274,11 +14208,11 @@ static const struct aead_testvec hmac_sha512_des_cbc_enc_tv_temp[] = {
                          "\x97\xe2\xe3\xb8\xaa\x48\x85\xee"
                          "\x8c\xf6\x07\x95\x1f\xa6\x6c\x96"
                          "\x99\xc7\x5c\x8d\xd8\xb5\x68\x7b",
-               .rlen   = 128 + 64,
+               .clen   = 128 + 64,
        },
 };
 
-static const struct aead_testvec hmac_sha1_des3_ede_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha1_des3_ede_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14299,7 +14233,7 @@ static const struct aead_testvec hmac_sha1_des3_ede_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14315,8 +14249,8 @@ static const struct aead_testvec hmac_sha1_des3_ede_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 128,
+               .ctext  = "\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"
@@ -14335,11 +14269,11 @@ static const struct aead_testvec hmac_sha1_des3_ede_cbc_enc_tv_temp[] = {
                          "\x67\x6d\xb1\xf5\xb8\x10\xdc\xc6"
                          "\x75\x86\x96\x6b\xb1\xc5\xe4\xcf"
                          "\xd1\x60\x91\xb3",
-                         .rlen = 128 + 20,
+                         .clen = 128 + 20,
        },
 };
 
-static const struct aead_testvec hmac_sha224_des3_ede_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha224_des3_ede_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14360,7 +14294,7 @@ static const struct aead_testvec hmac_sha224_des3_ede_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14376,8 +14310,8 @@ static const struct aead_testvec hmac_sha224_des3_ede_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 128,
+               .ctext  = "\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"
@@ -14396,11 +14330,11 @@ static const struct aead_testvec hmac_sha224_des3_ede_cbc_enc_tv_temp[] = {
                          "\x15\x24\x7f\x5a\x45\x4a\x66\xce"
                          "\x2b\x0b\x93\x99\x2f\x9d\x0c\x6c"
                          "\x56\x1f\xe1\xa6\x41\xb2\x4c\xd0",
-                         .rlen = 128 + 24,
+                         .clen = 128 + 24,
        },
 };
 
-static const struct aead_testvec hmac_sha256_des3_ede_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha256_des3_ede_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14422,7 +14356,7 @@ static const struct aead_testvec hmac_sha256_des3_ede_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14438,8 +14372,8 @@ static const struct aead_testvec hmac_sha256_des3_ede_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 128,
+               .ctext  = "\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"
@@ -14459,11 +14393,11 @@ static const struct aead_testvec hmac_sha256_des3_ede_cbc_enc_tv_temp[] = {
                          "\x56\x38\x44\xc0\xdb\xe3\x4f\x71"
                          "\xf7\xce\xd1\xd3\xf8\xbd\x3e\x4f"
                          "\xca\x43\x95\xdf\x80\x61\x81\xa9",
-               .rlen   = 128 + 32,
+               .clen   = 128 + 32,
        },
 };
 
-static const struct aead_testvec hmac_sha384_des3_ede_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha384_des3_ede_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14487,7 +14421,7 @@ static const struct aead_testvec hmac_sha384_des3_ede_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14503,8 +14437,8 @@ static const struct aead_testvec hmac_sha384_des3_ede_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 128,
+               .ctext  = "\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"
@@ -14526,11 +14460,11 @@ static const struct aead_testvec hmac_sha384_des3_ede_cbc_enc_tv_temp[] = {
                          "\xa4\x32\x8a\x0b\x46\xd7\xf0\x39"
                          "\x36\x5d\x13\x2f\x86\x10\x78\xd6"
                          "\xd6\xbe\x5c\xb9\x15\x89\xf9\x1b",
-               .rlen   = 128 + 48,
+               .clen   = 128 + 48,
        },
 };
 
-static const struct aead_testvec hmac_sha512_des3_ede_cbc_enc_tv_temp[] = {
+static const struct aead_testvec hmac_sha512_des3_ede_cbc_tv_temp[] = {
        { /*Generated with cryptopp*/
 #ifdef __LITTLE_ENDIAN
                .key    = "\x08\x00"            /* rta length */
@@ -14556,7 +14490,7 @@ static const struct aead_testvec hmac_sha512_des3_ede_cbc_enc_tv_temp[] = {
                .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01"
                          "\x7D\x33\x88\x93\x0F\x93\xB2\x42",
                .alen   = 16,
-               .input  = "\x6f\x54\x20\x6f\x61\x4d\x79\x6e"
+               .ptext  = "\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"
@@ -14572,8 +14506,8 @@ static const struct aead_testvec hmac_sha512_des3_ede_cbc_enc_tv_temp[] = {
                          "\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"
+               .plen   = 128,
+               .ctext  = "\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"
@@ -14597,7 +14531,7 @@ static const struct aead_testvec hmac_sha512_des3_ede_cbc_enc_tv_temp[] = {
                          "\x2a\x74\xd4\x65\x12\xcb\x55\xf2"
                          "\xd5\x02\x6d\xe6\xaf\xc9\x2f\xf2"
                          "\x57\xaa\x85\xf7\xf3\x6a\xcb\xdb",
-               .rlen   = 128 + 64,
+               .clen   = 128 + 64,
        },
 };
 
@@ -16732,30 +16666,30 @@ static const struct cipher_testvec aes_ofb_tv_template[] = {
        }
 };
 
-static const struct aead_testvec aes_gcm_enc_tv_template[] = {
+static const struct aead_testvec aes_gcm_tv_template[] = {
        { /* From McGrew & Viega - http://citeseer.ist.psu.edu/656989.html */
                .key    = zeroed_string,
                .klen   = 16,
-               .result = "\x58\xe2\xfc\xce\xfa\x7e\x30\x61"
+               .ctext  = "\x58\xe2\xfc\xce\xfa\x7e\x30\x61"
                          "\x36\x7f\x1d\x57\xa4\xe7\x45\x5a",
-               .rlen   = 16,
+               .clen   = 16,
        }, {
                .key    = zeroed_string,
                .klen   = 16,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x03\x88\xda\xce\x60\xb6\xa3\x92"
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .ctext  = "\x03\x88\xda\xce\x60\xb6\xa3\x92"
                          "\xf3\x28\xc2\xb9\x71\xb2\xfe\x78"
                          "\xab\x6e\x47\xd4\x2c\xec\x13\xbd"
                          "\xf5\x3a\x67\xb2\x12\x57\xbd\xdf",
-               .rlen   = 32,
+               .clen   = 32,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08",
                .klen   = 16,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16763,8 +16697,8 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",
-               .ilen   = 64,
-               .result = "\x42\x83\x1e\xc2\x21\x77\x74\x24"
+               .plen   = 64,
+               .ctext  = "\x42\x83\x1e\xc2\x21\x77\x74\x24"
                          "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"
                          "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"
                          "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"
@@ -16774,14 +16708,14 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x3d\x58\xe0\x91\x47\x3f\x59\x85"
                          "\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"
                          "\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08",
                .klen   = 16,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16789,12 +16723,12 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39",
-               .ilen   = 60,
+               .plen   = 60,
                .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xab\xad\xda\xd2",
                .alen   = 20,
-               .result = "\x42\x83\x1e\xc2\x21\x77\x74\x24"
+               .ctext  = "\x42\x83\x1e\xc2\x21\x77\x74\x24"
                          "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"
                          "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"
                          "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"
@@ -16804,23 +16738,23 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x3d\x58\xe0\x91"
                          "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"
                          "\x94\xfa\xe9\x5a\xe7\x12\x1a\x47",
-               .rlen   = 76,
+               .clen   = 76,
        }, {
                .key    = zeroed_string,
                .klen   = 24,
-               .result = "\xcd\x33\xb2\x8a\xc7\x73\xf7\x4b"
+               .ctext  = "\xcd\x33\xb2\x8a\xc7\x73\xf7\x4b"
                          "\xa0\x0e\xd1\xf3\x12\x57\x24\x35",
-               .rlen   = 16,
+               .clen   = 16,
        }, {
                .key    = zeroed_string,
                .klen   = 24,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .ctext  = "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"
                          "\x1c\x26\x7e\x43\x84\xb0\xf6\x00"
                          "\x2f\xf5\x8d\x80\x03\x39\x27\xab"
                          "\x8e\xf4\xd4\x58\x75\x14\xf0\xfb",
-               .rlen   = 32,
+               .clen   = 32,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
@@ -16828,7 +16762,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                .klen   = 24,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16836,8 +16770,8 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",
-               .ilen   = 64,
-               .result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
+               .plen   = 64,
+               .ctext  = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
                          "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"
                          "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
                          "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"
@@ -16847,7 +16781,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\xcc\xda\x27\x10\xac\xad\xe2\x56"
                          "\x99\x24\xa7\xc8\x58\x73\x36\xbf"
                          "\xb1\x18\x02\x4d\xb8\x67\x4a\x14",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
@@ -16855,7 +16789,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                .klen   = 24,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16863,12 +16797,12 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39",
-               .ilen   = 60,
+               .plen   = 60,
                .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xab\xad\xda\xd2",
                .alen   = 20,
-               .result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
+               .ctext  = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
                          "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"
                          "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
                          "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"
@@ -16878,7 +16812,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\xcc\xda\x27\x10"
                          "\x25\x19\x49\x8e\x80\xf1\x47\x8f"
                          "\x37\xba\x55\xbd\x6d\x27\x61\x8c",
-               .rlen   = 76,
+               .clen   = 76,
                .np     = 2,
                .tap    = { 32, 28 },
                .anp    = 2,
@@ -16886,19 +16820,19 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
        }, {
                .key    = zeroed_string,
                .klen   = 32,
-               .result = "\x53\x0f\x8a\xfb\xc7\x45\x36\xb9"
+               .ctext  = "\x53\x0f\x8a\xfb\xc7\x45\x36\xb9"
                          "\xa9\x63\xb4\xf1\xc4\xcb\x73\x8b",
-               .rlen   = 16,
+               .clen   = 16,
        }, {
                .key    = zeroed_string,
                .klen   = 32,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .result = "\xce\xa7\x40\x3d\x4d\x60\x6b\x6e"
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .ctext  = "\xce\xa7\x40\x3d\x4d\x60\x6b\x6e"
                          "\x07\x4e\xc5\xd3\xba\xf3\x9d\x18"
                          "\xd0\xd1\xc8\xa7\x99\x99\x6b\xf0"
                          "\x26\x5b\x98\xb5\xd4\x8a\xb9\x19",
-               .rlen   = 32,
+               .clen   = 32,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
@@ -16907,7 +16841,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                .klen   = 32,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16915,8 +16849,8 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",
-               .ilen   = 64,
-               .result = "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"
+               .plen   = 64,
+               .ctext  = "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"
                          "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"
                          "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"
                          "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"
@@ -16926,7 +16860,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\xbc\xc9\xf6\x62\x89\x80\x15\xad"
                          "\xb0\x94\xda\xc5\xd9\x34\x71\xbd"
                          "\xec\x1a\x50\x22\x70\xe3\xcc\x6c",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
@@ -16935,7 +16869,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                .klen   = 32,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16943,12 +16877,12 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39",
-               .ilen   = 60,
+               .plen   = 60,
                .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xab\xad\xda\xd2",
                .alen   = 20,
-               .result = "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"
+               .ctext  = "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"
                          "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"
                          "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"
                          "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"
@@ -16958,7 +16892,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\xbc\xc9\xf6\x62"
                          "\x76\xfc\x6e\xce\x0f\x4e\x17\x68"
                          "\xcd\xdf\x88\x53\xbb\x2d\x55\x1b",
-               .rlen   = 76,
+               .clen   = 76,
                .np     = 2,
                .tap    = { 48, 12 },
                .anp    = 3,
@@ -16970,7 +16904,7 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                .klen   = 24,
                .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
                          "\xde\xca\xf8\x88",
-               .input  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
+               .ptext  = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
                          "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
                          "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
                          "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
@@ -16978,12 +16912,12 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
                          "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
                          "\xba\x63\x7b\x39",
-               .ilen   = 60,
+               .plen   = 60,
                .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
                          "\xab\xad\xda\xd2",
                .alen   = 20,
-               .result = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
+               .ctext  = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
                          "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"
                          "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
                          "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"
@@ -16993,300 +16927,98 @@ static const struct aead_testvec aes_gcm_enc_tv_template[] = {
                          "\xcc\xda\x27\x10"
                          "\x25\x19\x49\x8e\x80\xf1\x47\x8f"
                          "\x37\xba\x55\xbd\x6d\x27\x61\x8c",
-               .rlen   = 76,
+               .clen   = 76,
        }
 };
 
-static const struct aead_testvec aes_gcm_dec_tv_template[] = {
-       { /* From McGrew & Viega - http://citeseer.ist.psu.edu/656989.html */
+static const struct aead_testvec aes_gcm_rfc4106_tv_template[] = {
+       { /* Generated using Crypto++ */
                .key    = zeroed_string,
-               .klen   = 32,
-               .input  = "\xce\xa7\x40\x3d\x4d\x60\x6b\x6e"
-                         "\x07\x4e\xc5\xd3\xba\xf3\x9d\x18"
-                         "\xd0\xd1\xc8\xa7\x99\x99\x6b\xf0"
-                         "\x26\x5b\x98\xb5\xd4\x8a\xb9\x19",
-               .ilen   = 32,
-               .result  = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+               .klen   = 20,
+               .iv     = zeroed_string,
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .assoc  = zeroed_string,
+               .alen   = 16,
+               .ctext  = "\x03\x88\xDA\xCE\x60\xB6\xA3\x92"
+                         "\xF3\x28\xC2\xB9\x71\xB2\xFE\x78"
+                         "\x97\xFE\x4C\x23\x37\x42\x01\xE0"
+                         "\x81\x9F\x8D\xC5\xD7\x41\xA0\x1B",
+               .clen   = 32,
+       },{
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08",
-               .klen   = 32,
-               .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
-                         "\xde\xca\xf8\x88",
-               .input  = "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"
-                         "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"
-                         "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"
-                         "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"
-                         "\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d"
-                         "\xa7\xb0\x8b\x10\x56\x82\x88\x38"
-                         "\xc5\xf6\x1e\x63\x93\xba\x7a\x0a"
-                         "\xbc\xc9\xf6\x62\x89\x80\x15\xad"
-                         "\xb0\x94\xda\xc5\xd9\x34\x71\xbd"
-                         "\xec\x1a\x50\x22\x70\xe3\xcc\x6c",
-               .ilen   = 80,
-               .result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
-                         "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
-                         "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
-                         "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
-                         "\x1c\x3c\x0c\x95\x95\x68\x09\x53"
-                         "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
-                         "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
-                         "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",
-               .rlen   = 64,
+                         "\x00\x00\x00\x00",
+               .klen   = 20,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .alen   = 16,
+               .ctext  = "\xC0\x0D\x8B\x42\x0F\x8F\x34\x18"
+                         "\x88\xB1\xC5\xBC\xC5\xB6\xD6\x28"
+                         "\x6A\x9D\xDF\x11\x5E\xFE\x5E\x9D"
+                         "\x2F\x70\x44\x92\xF7\xF2\xE3\xEF",
+               .clen   = 32,
+
        }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08",
-               .klen   = 32,
-               .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
-                         "\xde\xca\xf8\x88",
-               .input  = "\x52\x2d\xc1\xf0\x99\x56\x7d\x07"
-                         "\xf4\x7f\x37\xa3\x2a\x84\x42\x7d"
-                         "\x64\x3a\x8c\xdc\xbf\xe5\xc0\xc9"
-                         "\x75\x98\xa2\xbd\x25\x55\xd1\xaa"
-                         "\x8c\xb0\x8e\x48\x59\x0d\xbb\x3d"
-                         "\xa7\xb0\x8b\x10\x56\x82\x88\x38"
-                         "\xc5\xf6\x1e\x63\x93\xba\x7a\x0a"
-                         "\xbc\xc9\xf6\x62"
-                         "\x76\xfc\x6e\xce\x0f\x4e\x17\x68"
-                         "\xcd\xdf\x88\x53\xbb\x2d\x55\x1b",
-               .ilen   = 76,
-               .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
-                         "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
-                         "\xab\xad\xda\xd2",
-               .alen   = 20,
-               .result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
-                         "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
-                         "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
-                         "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
-                         "\x1c\x3c\x0c\x95\x95\x68\x09\x53"
-                         "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
-                         "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
-                         "\xba\x63\x7b\x39",
-               .rlen   = 60,
-               .np     = 2,
-               .tap    = { 48, 28 },
-               .anp    = 3,
-               .atap   = { 8, 8, 4 }
+                         "\x00\x00\x00\x00",
+               .klen   = 20,
+               .iv     = zeroed_string,
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01",
+               .plen   = 16,
+               .assoc  = zeroed_string,
+               .alen   = 16,
+               .ctext  = "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"
+                         "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"
+                         "\x0B\x8F\x88\x69\x17\xE6\xB4\x3C"
+                         "\xB1\x68\xFD\x14\x52\x64\x61\xB2",
+               .clen   = 32,
        }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08",
-               .klen   = 16,
-               .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
-                         "\xde\xca\xf8\x88",
-               .input  = "\x42\x83\x1e\xc2\x21\x77\x74\x24"
-                         "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"
-                         "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"
-                         "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"
-                         "\x21\xd5\x14\xb2\x54\x66\x93\x1c"
-                         "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"
-                         "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"
-                         "\x3d\x58\xe0\x91\x47\x3f\x59\x85"
-                         "\x4d\x5c\x2a\xf3\x27\xcd\x64\xa6"
-                         "\x2c\xf3\x5a\xbd\x2b\xa6\xfa\xb4",
-               .ilen   = 80,
-               .result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
-                         "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
-                         "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
-                         "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
-                         "\x1c\x3c\x0c\x95\x95\x68\x09\x53"
-                         "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
-                         "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
-                         "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",
-               .rlen   = 64,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08",
-               .klen   = 16,
-               .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
-                         "\xde\xca\xf8\x88",
-               .input  = "\x42\x83\x1e\xc2\x21\x77\x74\x24"
-                         "\x4b\x72\x21\xb7\x84\xd0\xd4\x9c"
-                         "\xe3\xaa\x21\x2f\x2c\x02\xa4\xe0"
-                         "\x35\xc1\x7e\x23\x29\xac\xa1\x2e"
-                         "\x21\xd5\x14\xb2\x54\x66\x93\x1c"
-                         "\x7d\x8f\x6a\x5a\xac\x84\xaa\x05"
-                         "\x1b\xa3\x0b\x39\x6a\x0a\xac\x97"
-                         "\x3d\x58\xe0\x91"
-                         "\x5b\xc9\x4f\xbc\x32\x21\xa5\xdb"
-                         "\x94\xfa\xe9\x5a\xe7\x12\x1a\x47",
-               .ilen   = 76,
-               .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
-                         "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
-                         "\xab\xad\xda\xd2",
-               .alen   = 20,
-               .result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
-                         "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
-                         "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
-                         "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
-                         "\x1c\x3c\x0c\x95\x95\x68\x09\x53"
-                         "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
-                         "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
-                         "\xba\x63\x7b\x39",
-               .rlen   = 60,
-       }, {
-               .key    = zeroed_string,
-               .klen   = 24,
-               .input  = "\x98\xe7\x24\x7c\x07\xf0\xfe\x41"
-                         "\x1c\x26\x7e\x43\x84\xb0\xf6\x00"
-                         "\x2f\xf5\x8d\x80\x03\x39\x27\xab"
-                         "\x8e\xf4\xd4\x58\x75\x14\xf0\xfb",
-               .ilen   = 32,
-               .result  = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\xfe\xff\xe9\x92\x86\x65\x73\x1c",
-               .klen   = 24,
-               .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
-                         "\xde\xca\xf8\x88",
-               .input  = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
-                         "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"
-                         "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
-                         "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"
-                         "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"
-                         "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"
-                         "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"
-                         "\xcc\xda\x27\x10\xac\xad\xe2\x56"
-                         "\x99\x24\xa7\xc8\x58\x73\x36\xbf"
-                         "\xb1\x18\x02\x4d\xb8\x67\x4a\x14",
-               .ilen   = 80,
-               .result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
-                         "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
-                         "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
-                         "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
-                         "\x1c\x3c\x0c\x95\x95\x68\x09\x53"
-                         "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
-                         "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
-                         "\xba\x63\x7b\x39\x1a\xaf\xd2\x55",
-               .rlen   = 64,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\xfe\xff\xe9\x92\x86\x65\x73\x1c",
-               .klen   = 24,
-               .iv     = "\xca\xfe\xba\xbe\xfa\xce\xdb\xad"
-                         "\xde\xca\xf8\x88",
-               .input  = "\x39\x80\xca\x0b\x3c\x00\xe8\x41"
-                         "\xeb\x06\xfa\xc4\x87\x2a\x27\x57"
-                         "\x85\x9e\x1c\xea\xa6\xef\xd9\x84"
-                         "\x62\x85\x93\xb4\x0c\xa1\xe1\x9c"
-                         "\x7d\x77\x3d\x00\xc1\x44\xc5\x25"
-                         "\xac\x61\x9d\x18\xc8\x4a\x3f\x47"
-                         "\x18\xe2\x44\x8b\x2f\xe3\x24\xd9"
-                         "\xcc\xda\x27\x10"
-                         "\x25\x19\x49\x8e\x80\xf1\x47\x8f"
-                         "\x37\xba\x55\xbd\x6d\x27\x61\x8c",
-               .ilen   = 76,
-               .assoc  = "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
-                         "\xfe\xed\xfa\xce\xde\xad\xbe\xef"
-                         "\xab\xad\xda\xd2",
-               .alen   = 20,
-               .result = "\xd9\x31\x32\x25\xf8\x84\x06\xe5"
-                         "\xa5\x59\x09\xc5\xaf\xf5\x26\x9a"
-                         "\x86\xa7\xa9\x53\x15\x34\xf7\xda"
-                         "\x2e\x4c\x30\x3d\x8a\x31\x8a\x72"
-                         "\x1c\x3c\x0c\x95\x95\x68\x09\x53"
-                         "\x2f\xcf\x0e\x24\x49\xa6\xb5\x25"
-                         "\xb1\x6a\xed\xf5\xaa\x0d\xe6\x57"
-                         "\xba\x63\x7b\x39",
-               .rlen   = 60,
-       }
-};
-
-static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
-       { /* Generated using Crypto++ */
-               .key    = zeroed_string,
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .result = "\x03\x88\xDA\xCE\x60\xB6\xA3\x92"
-                         "\xF3\x28\xC2\xB9\x71\xB2\xFE\x78"
-                         "\x97\xFE\x4C\x23\x37\x42\x01\xE0"
-                         "\x81\x9F\x8D\xC5\xD7\x41\xA0\x1B",
-               .rlen   = 32,
-       },{
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = "\xC0\x0D\x8B\x42\x0F\x8F\x34\x18"
-                         "\x88\xB1\xC5\xBC\xC5\xB6\xD6\x28"
-                         "\x6A\x9D\xDF\x11\x5E\xFE\x5E\x9D"
-                         "\x2F\x70\x44\x92\xF7\xF2\xE3\xEF",
-               .rlen   = 32,
-
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 16,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .result = "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"
-                         "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"
-                         "\x0B\x8F\x88\x69\x17\xE6\xB4\x3C"
-                         "\xB1\x68\xFD\x14\x52\x64\x61\xB2",
-               .rlen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 16,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .result = "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"
-                         "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"
-                         "\x90\x92\xB7\xE3\x5F\xA3\x9A\x63"
-                         "\x7E\xD7\x1F\xD8\xD3\x7C\x4B\xF5",
-               .rlen   = 32,
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
+                         "\x00\x00\x00\x00",
+               .klen   = 20,
+               .iv     = zeroed_string,
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01",
+               .plen   = 16,
+               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .alen   = 16,
+               .ctext  = "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"
+                         "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"
+                         "\x90\x92\xB7\xE3\x5F\xA3\x9A\x63"
+                         "\x7E\xD7\x1F\xD8\xD3\x7C\x4B\xF5",
+               .clen   = 32,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
                          "\x00\x00\x00\x00",
                .klen   = 20,
                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 16,
+               .plen   = 16,
                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x00\x00\x00\x00\x00\x00\x00\x01",
                .alen   = 16,
-               .result = "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"
+               .ctext  = "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"
                          "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"
                          "\x64\x50\xF9\x32\x13\xFB\x74\x61"
                          "\xF4\xED\x52\xD3\xC5\x10\x55\x3C",
-               .rlen   = 32,
+               .clen   = 32,
        }, {
                .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
                          "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
                          "\x00\x00\x00\x00",
                .klen   = 20,
                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x01\x01\x01\x01\x01\x01\x01\x01"
@@ -17294,11 +17026,11 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 64,
+               .plen   = 64,
                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
                          "\x00\x00\x00\x00\x00\x00\x00\x01",
                .alen   = 16,
-               .result = "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"
+               .ctext  = "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"
                          "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"
                          "\x98\x14\xA1\x42\x37\x80\xFD\x90"
                          "\x68\x12\x01\xA8\x91\x89\xB9\x83"
@@ -17308,14 +17040,14 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xDC\xD3\xDA\x65\x73\xAF\x80\xCD"
                          "\xD2\xB6\xC2\x4A\x76\xC2\x92\x85"
                          "\xBD\xCF\x62\x98\x58\x14\xE5\xBD",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
                          "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
                          "\x00\x00\x00\x00",
                .klen   = 20,
                .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",
-               .input  = "\xff\xff\xff\xff\xff\xff\xff\xff"
+               .ptext  = "\xff\xff\xff\xff\xff\xff\xff\xff"
                          "\xff\xff\xff\xff\xff\xff\xff\xff"
                          "\xff\xff\xff\xff\xff\xff\xff\xff"
                          "\xff\xff\xff\xff\xff\xff\xff\xff"
@@ -17339,12 +17071,12 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xff\xff\xff\xff\xff\xff\xff\xff"
                          "\xff\xff\xff\xff\xff\xff\xff\xff"
                          "\xff\xff\xff\xff\xff\xff\xff\xff",
-               .ilen   = 192,
+               .plen   = 192,
                .assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
                          "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"
                          "\x89\xab\xcd\xef",
                .alen   = 20,
-               .result = "\xC1\x76\x33\x85\xE2\x9B\x5F\xDE"
+               .ctext  = "\xC1\x76\x33\x85\xE2\x9B\x5F\xDE"
                          "\xDE\x89\x3D\x42\xE7\xC9\x69\x8A"
                          "\x44\x6D\xC3\x88\x46\x2E\xC2\x01"
                          "\x5E\xF6\x0C\x39\xF0\xC4\xA5\x82"
@@ -17370,14 +17102,14 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x2E\xD5\x03\x2E\x86\x7E\xAA\x3B"
                          "\x37\x08\x1C\xCF\xBA\x5D\x71\x46"
                          "\x80\x72\xB0\x4C\x82\x0D\x60\x3C",
-               .rlen   = 208,
+               .clen   = 208,
        }, { /* From draft-mcgrew-gcm-test-01 */
                .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
                          "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
                          "\x2E\x44\x3B\x68",
                .klen   = 20,
                .iv     = "\x49\x56\xED\x7E\x3B\x24\x4C\xFE",
-               .input  = "\x45\x00\x00\x48\x69\x9A\x00\x00"
+               .ptext  = "\x45\x00\x00\x48\x69\x9A\x00\x00"
                          "\x80\x11\x4D\xB7\xC0\xA8\x01\x02"
                          "\xC0\xA8\x01\x01\x0A\x9B\xF1\x56"
                          "\x38\xD3\x01\x00\x00\x01\x00\x00"
@@ -17386,12 +17118,12 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x69\x70\x09\x63\x79\x62\x65\x72"
                          "\x63\x69\x74\x79\x02\x64\x6B\x00"
                          "\x00\x21\x00\x01\x01\x02\x02\x01",
-               .ilen   = 72,
+               .plen   = 72,
                .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
                          "\x00\x00\x00\x00\x49\x56\xED\x7E"
                          "\x3B\x24\x4C\xFE",
                .alen   = 20,
-               .result = "\xFE\xCF\x53\x7E\x72\x9D\x5B\x07"
+               .ctext  = "\xFE\xCF\x53\x7E\x72\x9D\x5B\x07"
                          "\xDC\x30\xDF\x52\x8D\xD2\x2B\x76"
                          "\x8D\x1B\x98\x73\x66\x96\xA6\xFD"
                          "\x34\x85\x09\xFA\x13\xCE\xAC\x34"
@@ -17402,14 +17134,14 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x61\xBC\x17\xD7\x68\xFD\x97\x32"
                          "\x45\x90\x18\x14\x8F\x6C\xBE\x72"
                          "\x2F\xD0\x47\x96\x56\x2D\xFD\xB4",
-               .rlen   = 88,
+               .clen   = 88,
        }, {
                .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
                          "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
                          "\xCA\xFE\xBA\xBE",
                .klen   = 20,
                .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .input  = "\x45\x00\x00\x3E\x69\x8F\x00\x00"
+               .ptext  = "\x45\x00\x00\x3E\x69\x8F\x00\x00"
                          "\x80\x11\x4D\xCC\xC0\xA8\x01\x02"
                          "\xC0\xA8\x01\x01\x0A\x98\x00\x35"
                          "\x00\x2A\x23\x43\xB2\xD0\x01\x00"
@@ -17417,11 +17149,11 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x03\x73\x69\x70\x09\x63\x79\x62"
                          "\x65\x72\x63\x69\x74\x79\x02\x64"
                          "\x6B\x00\x00\x01\x00\x01\x00\x01",
-               .ilen   = 64,
+               .plen   = 64,
                .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
                          "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
                .alen   = 16,
-               .result = "\xDE\xB2\x2C\xD9\xB0\x7C\x72\xC1"
+               .ctext  = "\xDE\xB2\x2C\xD9\xB0\x7C\x72\xC1"
                          "\x6E\x3A\x65\xBE\xEB\x8D\xF3\x04"
                          "\xA5\xA5\x89\x7D\x33\xAE\x53\x0F"
                          "\x1B\xA7\x6D\x5D\x11\x4D\x2A\x5C"
@@ -17431,7 +17163,7 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xEC\x3B\x9B\xA9\x5D\x91\x8B\xD1"
                          "\x83\xB7\x0D\x3A\xA8\xBC\x6E\xE4"
                          "\xC3\x09\xE9\xD8\x5A\x41\xAD\x4A",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
                          "\x34\x45\x56\x67\x78\x89\x9A\xAB"
@@ -17440,18 +17172,18 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x11\x22\x33\x44",
                .klen   = 36,
                .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .input  = "\x45\x00\x00\x30\x69\xA6\x40\x00"
+               .ptext  = "\x45\x00\x00\x30\x69\xA6\x40\x00"
                          "\x80\x06\x26\x90\xC0\xA8\x01\x02"
                          "\x93\x89\x15\x5E\x0A\x9E\x00\x8B"
                          "\x2D\xC5\x7E\xE0\x00\x00\x00\x00"
                          "\x70\x02\x40\x00\x20\xBF\x00\x00"
                          "\x02\x04\x05\xB4\x01\x01\x04\x02"
                          "\x01\x02\x02\x01",
-               .ilen   = 52,
+               .plen   = 52,
                .assoc  = "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"
                          "\x01\x02\x03\x04\x05\x06\x07\x08",
                .alen   = 16,
-               .result = "\xFF\x42\x5C\x9B\x72\x45\x99\xDF"
+               .ctext  = "\xFF\x42\x5C\x9B\x72\x45\x99\xDF"
                          "\x7A\x3B\xCD\x51\x01\x94\xE0\x0D"
                          "\x6A\x78\x10\x7F\x1B\x0B\x1C\xBF"
                          "\x06\xEF\xAE\x9D\x65\xA5\xD7\x63"
@@ -17460,14 +17192,14 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xEF\x84\x2D\x8E\xB3\x35\xF4\xEE"
                          "\xCF\xDB\xF8\x31\x82\x4B\x4C\x49"
                          "\x15\x95\x6C\x96",
-               .rlen   = 68,
+               .clen   = 68,
        }, {
                .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
                          "\x00\x00\x00\x00\x00\x00\x00\x00"
                          "\x00\x00\x00\x00",
                .klen   = 20,
                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .input  = "\x45\x00\x00\x3C\x99\xC5\x00\x00"
+               .ptext  = "\x45\x00\x00\x3C\x99\xC5\x00\x00"
                          "\x80\x01\xCB\x7A\x40\x67\x93\x18"
                          "\x01\x01\x01\x01\x08\x00\x07\x5C"
                          "\x02\x00\x44\x00\x61\x62\x63\x64"
@@ -17475,11 +17207,11 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
                          "\x75\x76\x77\x61\x62\x63\x64\x65"
                          "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .ilen   = 64,
+               .plen   = 64,
                .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x01"
                          "\x00\x00\x00\x00\x00\x00\x00\x00",
                .alen   = 16,
-               .result = "\x46\x88\xDA\xF2\xF9\x73\xA3\x92"
+               .ctext  = "\x46\x88\xDA\xF2\xF9\x73\xA3\x92"
                          "\x73\x29\x09\xC3\x31\xD5\x6D\x60"
                          "\xF6\x94\xAB\xAA\x41\x4B\x5E\x7F"
                          "\xF5\xFD\xCD\xFF\xF5\xE9\xA2\x84"
@@ -17489,14 +17221,14 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x1D\x19\xD4\xD5\xC8\xC1\x8A\xF3"
                          "\xF8\x21\xD4\x96\xEE\xB0\x96\xE9"
                          "\x8A\xD2\xB6\x9E\x47\x99\xC7\x1D",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
                          "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
                          "\x57\x69\x0E\x43",
                .klen   = 20,
                .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x3C\x99\xC3\x00\x00"
+               .ptext  = "\x45\x00\x00\x3C\x99\xC3\x00\x00"
                          "\x80\x01\xCB\x7C\x40\x67\x93\x18"
                          "\x01\x01\x01\x01\x08\x00\x08\x5C"
                          "\x02\x00\x43\x00\x61\x62\x63\x64"
@@ -17504,12 +17236,12 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
                          "\x75\x76\x77\x61\x62\x63\x64\x65"
                          "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .ilen   = 64,
+               .plen   = 64,
                .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
                          "\x10\x10\x10\x10\x4E\x28\x00\x00"
                          "\xA2\xFC\xA1\xA3",
                .alen   = 20,
-               .result = "\xFB\xA2\xCA\xA4\x85\x3C\xF9\xF0"
+               .ctext  = "\xFB\xA2\xCA\xA4\x85\x3C\xF9\xF0"
                          "\xF2\x2C\xB1\x0D\x86\xDD\x83\xB0"
                          "\xFE\xC7\x56\x91\xCF\x1A\x04\xB0"
                          "\x0D\x11\x38\xEC\x9C\x35\x79\x17"
@@ -17519,29 +17251,29 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x1F\x5E\x22\x73\x95\x30\x32\x0A"
                          "\xE0\xD7\x31\xCC\x97\x8E\xCA\xFA"
                          "\xEA\xE8\x8F\x00\xE8\x0D\x6E\x48",
-               .rlen   = 80,
+               .clen   = 80,
        }, {
                .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
                          "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
                          "\x57\x69\x0E\x43",
                .klen   = 20,
                .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x1C\x42\xA2\x00\x00"
+               .ptext  = "\x45\x00\x00\x1C\x42\xA2\x00\x00"
                          "\x80\x01\x44\x1F\x40\x67\x93\xB6"
                          "\xE0\x00\x00\x02\x0A\x00\xF5\xFF"
                          "\x01\x02\x02\x01",
-               .ilen   = 28,
+               .plen   = 28,
                .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
                          "\x10\x10\x10\x10\x4E\x28\x00\x00"
                          "\xA2\xFC\xA1\xA3",
                .alen   = 20,
-               .result = "\xFB\xA2\xCA\x84\x5E\x5D\xF9\xF0"
+               .ctext  = "\xFB\xA2\xCA\x84\x5E\x5D\xF9\xF0"
                          "\xF2\x2C\x3E\x6E\x86\xDD\x83\x1E"
                          "\x1F\xC6\x57\x92\xCD\x1A\xF9\x13"
                          "\x0E\x13\x79\xED\x36\x9F\x07\x1F"
                          "\x35\xE0\x34\xBE\x95\xF1\x12\xE4"
                          "\xE7\xD0\x5D\x35",
-               .rlen   = 44,
+               .clen   = 44,
        }, {
                .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
                          "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
@@ -17549,30 +17281,30 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xCA\xFE\xBA\xBE",
                .klen   = 28,
                .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .input  = "\x45\x00\x00\x28\xA4\xAD\x40\x00"
+               .ptext  = "\x45\x00\x00\x28\xA4\xAD\x40\x00"
                          "\x40\x06\x78\x80\x0A\x01\x03\x8F"
                          "\x0A\x01\x06\x12\x80\x23\x06\xB8"
                          "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"
                          "\x50\x10\x16\xD0\x75\x68\x00\x01",
-               .ilen   = 40,
+               .plen   = 40,
                .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
                          "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
                .alen   = 16,
-               .result = "\xA5\xB1\xF8\x06\x60\x29\xAE\xA4"
+               .ctext  = "\xA5\xB1\xF8\x06\x60\x29\xAE\xA4"
                          "\x0E\x59\x8B\x81\x22\xDE\x02\x42"
                          "\x09\x38\xB3\xAB\x33\xF8\x28\xE6"
                          "\x87\xB8\x85\x8B\x5B\xFB\xDB\xD0"
                          "\x31\x5B\x27\x45\x21\x44\xCC\x77"
                          "\x95\x45\x7B\x96\x52\x03\x7F\x53"
                          "\x18\x02\x7B\x5B\x4C\xD7\xA6\x36",
-               .rlen   = 56,
+               .clen   = 56,
        }, {
                .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
                          "\x34\x45\x56\x67\x78\x89\x9A\xAB"
                          "\xDE\xCA\xF8\x88",
                .klen   = 20,
                .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .input  = "\x45\x00\x00\x49\x33\xBA\x00\x00"
+               .ptext  = "\x45\x00\x00\x49\x33\xBA\x00\x00"
                          "\x7F\x11\x91\x06\xC3\xFB\x1D\x10"
                          "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
                          "\x00\x35\xDD\x7B\x80\x03\x02\xD5"
@@ -17582,12 +17314,12 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x92\xC9\x63\xBA\xC0\x46\xEC\x95"
                          "\x9B\x62\x66\xC0\x47\x22\xB1\x49"
                          "\x23\x01\x01\x01",
-               .ilen   = 76,
+               .plen   = 76,
                .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
                          "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
                          "\xCE\xFA\xCE\x74",
                .alen   = 20,
-               .result = "\x18\xA6\xFD\x42\xF7\x2C\xBF\x4A"
+               .ctext  = "\x18\xA6\xFD\x42\xF7\x2C\xBF\x4A"
                          "\xB2\xA2\xEA\x90\x1F\x73\xD8\x14"
                          "\xE3\xE7\xF2\x43\xD9\x54\x12\xE1"
                          "\xC3\x49\xC1\xD2\xFB\xEC\x16\x8F"
@@ -17599,7 +17331,7 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xE7\x84\x5D\x68\x65\x1F\x57\xE6"
                          "\x5F\x35\x4F\x75\xFF\x17\x01\x57"
                          "\x69\x62\x34\x36",
-               .rlen   = 92,
+               .clen   = 92,
        }, {
                .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
                          "\x34\x45\x56\x67\x78\x89\x9A\xAB"
@@ -17608,31 +17340,31 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x73\x61\x6C\x74",
                .klen   = 36,
                .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .input  = "\x45\x08\x00\x28\x73\x2C\x00\x00"
+               .ptext  = "\x45\x08\x00\x28\x73\x2C\x00\x00"
                          "\x40\x06\xE9\xF9\x0A\x01\x06\x12"
                          "\x0A\x01\x03\x8F\x06\xB8\x80\x23"
                          "\xDD\x6B\xAF\xBE\xCB\x71\x26\x02"
                          "\x50\x10\x1F\x64\x6D\x54\x00\x01",
-               .ilen   = 40,
+               .plen   = 40,
                .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
                          "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
                          "\x69\x76\x65\x63",
                .alen   = 20,
-               .result = "\xF2\xD6\x9E\xCD\xBD\x5A\x0D\x5B"
+               .ctext  = "\xF2\xD6\x9E\xCD\xBD\x5A\x0D\x5B"
                          "\x8D\x5E\xF3\x8B\xAD\x4D\xA5\x8D"
                          "\x1F\x27\x8F\xDE\x98\xEF\x67\x54"
                          "\x9D\x52\x4A\x30\x18\xD9\xA5\x7F"
                          "\xF4\xD3\xA3\x1C\xE6\x73\x11\x9E"
                          "\x45\x16\x26\xC2\x41\x57\x71\xE3"
                          "\xB7\xEE\xBC\xA6\x14\xC8\x9B\x35",
-               .rlen   = 56,
+               .clen   = 56,
        }, {
                .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
                          "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
                          "\x57\x69\x0E\x43",
                .klen   = 20,
                .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x49\x33\x3E\x00\x00"
+               .ptext  = "\x45\x00\x00\x49\x33\x3E\x00\x00"
                          "\x7F\x11\x91\x82\xC3\xFB\x1D\x10"
                          "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
                          "\x00\x35\xCB\x45\x80\x03\x02\x5B"
@@ -17642,12 +17374,12 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x76\x4D\x6E\x5E\xE0\x49\x6B\x32"
                          "\x5A\xE2\x70\xC0\x38\x99\x49\x39"
                          "\x15\x01\x01\x01",
-               .ilen   = 76,
+               .plen   = 76,
                .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
                          "\x10\x10\x10\x10\x4E\x28\x00\x00"
                          "\xA2\xFC\xA1\xA3",
                .alen   = 20,
-               .result = "\xFB\xA2\xCA\xD1\x2F\xC1\xF9\xF0"
+               .ctext  = "\xFB\xA2\xCA\xD1\x2F\xC1\xF9\xF0"
                          "\x0D\x3C\xEB\xF3\x05\x41\x0D\xB8"
                          "\x3D\x77\x84\xB6\x07\x32\x3D\x22"
                          "\x0F\x24\xB0\xA9\x7D\x54\x18\x28"
@@ -17659,7 +17391,7 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\xE5\x16\x09\x75\xCD\xB6\x08\xC5"
                          "\x76\x91\x89\x60\x97\x63\xB8\xE1"
                          "\x8C\xAA\x81\xE2",
-               .rlen   = 92,
+               .clen   = 92,
        }, {
                .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
                          "\x34\x45\x56\x67\x78\x89\x9A\xAB"
@@ -17668,7 +17400,7 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x73\x61\x6C\x74",
                .klen   = 36,
                .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .input  = "\x63\x69\x73\x63\x6F\x01\x72\x75"
+               .ptext  = "\x63\x69\x73\x63\x6F\x01\x72\x75"
                          "\x6C\x65\x73\x01\x74\x68\x65\x01"
                          "\x6E\x65\x74\x77\x65\x01\x64\x65"
                          "\x66\x69\x6E\x65\x01\x74\x68\x65"
@@ -17677,12 +17409,12 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x74\x77\x69\x6C\x6C\x01\x64\x65"
                          "\x66\x69\x6E\x65\x74\x6F\x6D\x6F"
                          "\x72\x72\x6F\x77\x01\x02\x02\x01",
-               .ilen   = 72,
+               .plen   = 72,
                .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
                          "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
                          "\x69\x76\x65\x63",
                .alen   = 20,
-               .result = "\xD4\xB7\xED\x86\xA1\x77\x7F\x2E"
+               .ctext  = "\xD4\xB7\xED\x86\xA1\x77\x7F\x2E"
                          "\xA1\x3D\x69\x73\xD3\x24\xC6\x9E"
                          "\x7B\x43\xF8\x26\xFB\x56\x83\x12"
                          "\x26\x50\x8B\xEB\xD2\xDC\xEB\x18"
@@ -17693,42 +17425,42 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x12\xA4\x93\x63\x41\x23\x64\xF8"
                          "\xC0\xCA\xC5\x87\xF2\x49\xE5\x6B"
                          "\x11\xE2\x4F\x30\xE4\x4C\xCC\x76",
-               .rlen   = 88,
+               .clen   = 88,
        }, {
                .key    = "\x7D\x77\x3D\x00\xC1\x44\xC5\x25"
                          "\xAC\x61\x9D\x18\xC8\x4A\x3F\x47"
                          "\xD9\x66\x42\x67",
                .klen   = 20,
                .iv     = "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .input  = "\x01\x02\x02\x01",
-               .ilen   = 4,
+               .ptext  = "\x01\x02\x02\x01",
+               .plen   = 4,
                .assoc  = "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"
                          "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
                .alen   = 16,
-               .result = "\x43\x7F\x86\x6B\xCB\x3F\x69\x9F"
+               .ctext  = "\x43\x7F\x86\x6B\xCB\x3F\x69\x9F"
                          "\xE9\xB0\x82\x2B\xAC\x96\x1C\x45"
                          "\x04\xBE\xF2\x70",
-               .rlen   = 20,
+               .clen   = 20,
        }, {
                .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
                          "\x34\x45\x56\x67\x78\x89\x9A\xAB"
                          "\xDE\xCA\xF8\x88",
                .klen   = 20,
                .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .input  = "\x74\x6F\x01\x62\x65\x01\x6F\x72"
+               .ptext  = "\x74\x6F\x01\x62\x65\x01\x6F\x72"
                          "\x01\x6E\x6F\x74\x01\x74\x6F\x01"
                          "\x62\x65\x00\x01",
-               .ilen   = 20,
+               .plen   = 20,
                .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
                          "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
                          "\xCE\xFA\xCE\x74",
                .alen   = 20,
-               .result = "\x29\xC9\xFC\x69\xA1\x97\xD0\x38"
+               .ctext  = "\x29\xC9\xFC\x69\xA1\x97\xD0\x38"
                          "\xCC\xDD\x14\xE2\xDD\xFC\xAA\x05"
                          "\x43\x33\x21\x64\x41\x25\x03\x52"
                          "\x43\x03\xED\x3C\x6C\x5F\x28\x38"
                          "\x43\xAF\x8C\x3E",
-               .rlen   = 36,
+               .clen   = 36,
        }, {
                .key    = "\x6C\x65\x67\x61\x6C\x69\x7A\x65"
                          "\x6D\x61\x72\x69\x6A\x75\x61\x6E"
@@ -17737,19 +17469,19 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x74\x75\x72\x6E",
                .klen   = 36,
                .iv     = "\x33\x30\x21\x69\x67\x65\x74\x6D",
-               .input  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
+               .ptext  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
                          "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
                          "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
                          "\x02\x00\x07\x00\x61\x62\x63\x64"
                          "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
                          "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
                          "\x01\x02\x02\x01",
-               .ilen   = 52,
+               .plen   = 52,
                .assoc  = "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"
                          "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"
                          "\x67\x65\x74\x6D",
                .alen   = 20,
-               .result = "\xF9\x7A\xB2\xAA\x35\x6D\x8E\xDC"
+               .ctext  = "\xF9\x7A\xB2\xAA\x35\x6D\x8E\xDC"
                          "\xE1\x76\x44\xAC\x8C\x78\xE2\x5D"
                          "\xD2\x4D\xED\xBB\x29\xEB\xF1\xB6"
                          "\x4A\x27\x4B\x39\xB4\x9C\x3A\x86"
@@ -17758,26 +17490,26 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x1D\xCC\x63\xB9\xD0\x93\x7B\xA2"
                          "\x94\x5F\x66\x93\x68\x66\x1A\x32"
                          "\x9F\xB4\xC0\x53",
-               .rlen   = 68,
+               .clen   = 68,
        }, {
                .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
                          "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
                          "\x57\x69\x0E\x43",
                .klen   = 20,
                .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
+               .ptext  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
                          "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
                          "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
                          "\x02\x00\x07\x00\x61\x62\x63\x64"
                          "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
                          "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
                          "\x01\x02\x02\x01",
-               .ilen   = 52,
+               .plen   = 52,
                .assoc  = "\x3F\x7E\xF6\x42\x10\x10\x10\x10"
                          "\x10\x10\x10\x10\x4E\x28\x00\x00"
                          "\xA2\xFC\xA1\xA3",
                .alen   = 20,
-               .result = "\xFB\xA2\xCA\xA8\xC6\xC5\xF9\xF0"
+               .ctext  = "\xFB\xA2\xCA\xA8\xC6\xC5\xF9\xF0"
                          "\xF2\x2C\xA5\x4A\x06\x12\x10\xAD"
                          "\x3F\x6E\x57\x91\xCF\x1A\xCA\x21"
                          "\x0D\x11\x7C\xEC\x9C\x35\x79\x17"
@@ -17786,7485 +17518,2757 @@ static const struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = {
                          "\x63\x21\x93\x06\x84\xEE\xCA\xDB"
                          "\x56\x91\x25\x46\xE7\xA9\x5C\x97"
                          "\x40\xD7\xCB\x05",
-               .rlen   = 68,
+               .clen   = 68,
        }, {
                .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
                          "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
                          "\x22\x43\x3C\x64",
                .klen   = 20,
                .iv     = "\x48\x55\xEC\x7D\x3A\x23\x4B\xFD",
-               .input  = "\x08\x00\xC6\xCD\x02\x00\x07\x00"
+               .ptext  = "\x08\x00\xC6\xCD\x02\x00\x07\x00"
                          "\x61\x62\x63\x64\x65\x66\x67\x68"
                          "\x69\x6A\x6B\x6C\x6D\x6E\x6F\x70"
                          "\x71\x72\x73\x74\x01\x02\x02\x01",
-               .ilen   = 32,
+               .plen   = 32,
                .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
                          "\x00\x00\x00\x07\x48\x55\xEC\x7D"
                          "\x3A\x23\x4B\xFD",
                .alen   = 20,
-               .result = "\x74\x75\x2E\x8A\xEB\x5D\x87\x3C"
+               .ctext  = "\x74\x75\x2E\x8A\xEB\x5D\x87\x3C"
                          "\xD7\xC0\xF4\xAC\xC3\x6C\x4B\xFF"
                          "\x84\xB7\xD7\xB9\x8F\x0C\xA8\xB6"
                          "\xAC\xDA\x68\x94\xBC\x61\x90\x69"
                          "\xEF\x9C\xBC\x28\xFE\x1B\x56\xA7"
                          "\xC4\xE0\xD5\x8C\x86\xCD\x2B\xC0",
-               .rlen   = 48,
+               .clen   = 48,
        }
 };
 
-static const struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {
-       { /* Generated using Crypto++ */
-               .key    = zeroed_string,
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .input  = "\x03\x88\xDA\xCE\x60\xB6\xA3\x92"
-                         "\xF3\x28\xC2\xB9\x71\xB2\xFE\x78"
-                         "\x97\xFE\x4C\x23\x37\x42\x01\xE0"
-                         "\x81\x9F\x8D\xC5\xD7\x41\xA0\x1B",
-               .ilen   = 32,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-
-       },{
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\xC0\x0D\x8B\x42\x0F\x8F\x34\x18"
-                         "\x88\xB1\xC5\xBC\xC5\xB6\xD6\x28"
-                         "\x6A\x9D\xDF\x11\x5E\xFE\x5E\x9D"
-                         "\x2F\x70\x44\x92\xF7\xF2\xE3\xEF",
-               .ilen   = 32,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = zeroed_string,
-               .rlen   = 16,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
+static const struct aead_testvec aes_gcm_rfc4543_tv_template[] = {
+       { /* From draft-mcgrew-gcm-test-01 */
+               .key    = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda"
+                         "\x90\x6a\xc7\x3c\x36\x13\xa6\x34"
+                         "\x22\x43\x3c\x64",
                .klen   = 20,
-               .iv     = zeroed_string,
-               .input  = "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"
-                         "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"
-                         "\x0B\x8F\x88\x69\x17\xE6\xB4\x3C"
-                         "\xB1\x68\xFD\x14\x52\x64\x61\xB2",
-               .ilen   = 32,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 16,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
+               .iv     = zeroed_string,
+               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x07"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .alen   = 16,
+               .ptext  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
+                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
+                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
+                         "\x02\x00\x07\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
+                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
+                         "\x01\x02\x02\x01",
+               .plen   = 52,
+               .ctext  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
+                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
+                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
+                         "\x02\x00\x07\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
+                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
+                         "\x01\x02\x02\x01\xf2\xa9\xa8\x36"
+                         "\xe1\x55\x10\x6a\xa8\xdc\xd6\x18"
+                         "\xe4\x09\x9a\xaa",
+               .clen   = 68,
+       }, { /* nearly same as previous, but should fail */
+               .key    = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda"
+                         "\x90\x6a\xc7\x3c\x36\x13\xa6\x34"
+                         "\x22\x43\x3c\x64",
                .klen   = 20,
-               .iv     = zeroed_string,
-               .input  = "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"
-                         "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"
-                         "\x90\x92\xB7\xE3\x5F\xA3\x9A\x63"
-                         "\x7E\xD7\x1F\xD8\xD3\x7C\x4B\xF5",
-               .ilen   = 32,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+               .iv     = zeroed_string,
+               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x07"
                          "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 16,
+               .alen   = 16,
+               .ptext  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
+                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
+                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
+                         "\x02\x00\x07\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
+                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
+                         "\x01\x02\x02\x01",
+               .plen   = 52,
+               .novrfy = 1,
+               .ctext  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
+                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
+                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
+                         "\x02\x00\x07\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
+                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
+                         "\x01\x02\x02\x01\xf2\xa9\xa8\x36"
+                         "\xe1\x55\x10\x6a\xa8\xdc\xd6\x18"
+                         "\x00\x00\x00\x00",
+               .clen   = 68,
+       },
+};
 
+static const struct aead_testvec aes_ccm_tv_template[] = {
+       { /* From RFC 3610 */
+               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+               .klen   = 16,
+               .iv     = "\x01\x00\x00\x00\x03\x02\x01\x00"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
+               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07",
+               .alen   = 8,
+               .ptext  = "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e",
+               .plen   = 23,
+               .ctext  = "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"
+                         "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"
+                         "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"
+                         "\xe8\xd1\x2c\xfd\xf9\x26\xe0",
+               .clen   = 31,
        }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"
-                         "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"
-                         "\x64\x50\xF9\x32\x13\xFB\x74\x61"
-                         "\xF4\xED\x52\xD3\xC5\x10\x55\x3C",
-               .ilen   = 32,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 16,
+               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+               .klen   = 16,
+               .iv     = "\x01\x00\x00\x00\x07\x06\x05\x04"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
+               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b",
+               .alen   = 12,
+               .ptext  = "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
+                         "\x14\x15\x16\x17\x18\x19\x1a\x1b"
+                         "\x1c\x1d\x1e\x1f",
+               .plen   = 20,
+               .ctext  = "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"
+                         "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"
+                         "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"
+                         "\x7d\x9c\x2d\x93",
+               .clen   = 28,
        }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"
-                         "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"
-                         "\x98\x14\xA1\x42\x37\x80\xFD\x90"
-                         "\x68\x12\x01\xA8\x91\x89\xB9\x83"
-                         "\x5B\x11\x77\x12\x9B\xFF\x24\x89"
-                         "\x94\x5F\x18\x12\xBA\x27\x09\x39"
-                         "\x99\x96\x76\x42\x15\x1C\xCD\xCB"
-                         "\xDC\xD3\xDA\x65\x73\xAF\x80\xCD"
-                         "\xD2\xB6\xC2\x4A\x76\xC2\x92\x85"
-                         "\xBD\xCF\x62\x98\x58\x14\xE5\xBD",
-               .ilen   = 80,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 64,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",
-               .input  = "\xC1\x76\x33\x85\xE2\x9B\x5F\xDE"
-                         "\xDE\x89\x3D\x42\xE7\xC9\x69\x8A"
-                         "\x44\x6D\xC3\x88\x46\x2E\xC2\x01"
-                         "\x5E\xF6\x0C\x39\xF0\xC4\xA5\x82"
-                         "\xCD\xE8\x31\xCC\x0A\x4C\xE4\x44"
-                         "\x41\xA9\x82\x6F\x22\xA1\x23\x1A"
-                         "\xA8\xE3\x16\xFD\x31\x5C\x27\x31"
-                         "\xF1\x7F\x01\x63\xA3\xAF\x70\xA1"
-                         "\xCF\x07\x57\x41\x67\xD0\xC4\x42"
-                         "\xDB\x18\xC6\x4C\x4C\xE0\x3D\x9F"
-                         "\x05\x07\xFB\x13\x7D\x4A\xCA\x5B"
-                         "\xF0\xBF\x64\x7E\x05\xB1\x72\xEE"
-                         "\x7C\x3B\xD4\xCD\x14\x03\xB2\x2C"
-                         "\xD3\xA9\xEE\xFA\x17\xFC\x9C\xDF"
-                         "\xC7\x75\x40\xFF\xAE\xAD\x1E\x59"
-                         "\x2F\x30\x24\xFB\xAD\x6B\x10\xFA"
-                         "\x6C\x9F\x5B\xE7\x25\xD5\xD0\x25"
-                         "\xAC\x4A\x4B\xDA\xFC\x7A\x85\x1B"
-                         "\x7E\x13\x06\x82\x08\x17\xA4\x35"
-                         "\xEC\xC5\x8D\x63\x96\x81\x0A\x8F"
-                         "\xA3\x05\x38\x95\x20\x1A\x47\x04"
-                         "\x6F\x6D\xDA\x8F\xEF\xC1\x76\x35"
-                         "\x6B\xC7\x4D\x0F\x94\x12\xCA\x3E"
-                         "\x2E\xD5\x03\x2E\x86\x7E\xAA\x3B"
-                         "\x37\x08\x1C\xCF\xBA\x5D\x71\x46"
-                         "\x80\x72\xB0\x4C\x82\x0D\x60\x3C",
-               .ilen   = 208,
-               .assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"
-                         "\x89\xab\xcd\xef",
-               .alen   = 20,
-               .result = "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff",
-               .rlen   = 192,
-       }, {
-               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
-                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
-                         "\x2E\x44\x3B\x68",
-               .klen   = 20,
-               .iv     = "\x49\x56\xED\x7E\x3B\x24\x4C\xFE",
-               .result = "\x45\x00\x00\x48\x69\x9A\x00\x00"
-                         "\x80\x11\x4D\xB7\xC0\xA8\x01\x02"
-                         "\xC0\xA8\x01\x01\x0A\x9B\xF1\x56"
-                         "\x38\xD3\x01\x00\x00\x01\x00\x00"
-                         "\x00\x00\x00\x00\x04\x5F\x73\x69"
-                         "\x70\x04\x5F\x75\x64\x70\x03\x73"
-                         "\x69\x70\x09\x63\x79\x62\x65\x72"
-                         "\x63\x69\x74\x79\x02\x64\x6B\x00"
-                         "\x00\x21\x00\x01\x01\x02\x02\x01",
-               .rlen   = 72,
-               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
-                         "\x00\x00\x00\x00\x49\x56\xED\x7E"
-                         "\x3B\x24\x4C\xFE",
-               .alen   = 20,
-               .input  = "\xFE\xCF\x53\x7E\x72\x9D\x5B\x07"
-                         "\xDC\x30\xDF\x52\x8D\xD2\x2B\x76"
-                         "\x8D\x1B\x98\x73\x66\x96\xA6\xFD"
-                         "\x34\x85\x09\xFA\x13\xCE\xAC\x34"
-                         "\xCF\xA2\x43\x6F\x14\xA3\xF3\xCF"
-                         "\x65\x92\x5B\xF1\xF4\xA1\x3C\x5D"
-                         "\x15\xB2\x1E\x18\x84\xF5\xFF\x62"
-                         "\x47\xAE\xAB\xB7\x86\xB9\x3B\xCE"
-                         "\x61\xBC\x17\xD7\x68\xFD\x97\x32"
-                         "\x45\x90\x18\x14\x8F\x6C\xBE\x72"
-                         "\x2F\xD0\x47\x96\x56\x2D\xFD\xB4",
-               .ilen   = 88,
-       }, {
-               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
-                         "\xCA\xFE\xBA\xBE",
-               .klen   = 20,
-               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .result = "\x45\x00\x00\x3E\x69\x8F\x00\x00"
-                         "\x80\x11\x4D\xCC\xC0\xA8\x01\x02"
-                         "\xC0\xA8\x01\x01\x0A\x98\x00\x35"
-                         "\x00\x2A\x23\x43\xB2\xD0\x01\x00"
-                         "\x00\x01\x00\x00\x00\x00\x00\x00"
-                         "\x03\x73\x69\x70\x09\x63\x79\x62"
-                         "\x65\x72\x63\x69\x74\x79\x02\x64"
-                         "\x6B\x00\x00\x01\x00\x01\x00\x01",
-               .rlen   = 64,
-               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
-                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .alen   = 16,
-               .input  = "\xDE\xB2\x2C\xD9\xB0\x7C\x72\xC1"
-                         "\x6E\x3A\x65\xBE\xEB\x8D\xF3\x04"
-                         "\xA5\xA5\x89\x7D\x33\xAE\x53\x0F"
-                         "\x1B\xA7\x6D\x5D\x11\x4D\x2A\x5C"
-                         "\x3D\xE8\x18\x27\xC1\x0E\x9A\x4F"
-                         "\x51\x33\x0D\x0E\xEC\x41\x66\x42"
-                         "\xCF\xBB\x85\xA5\xB4\x7E\x48\xA4"
-                         "\xEC\x3B\x9B\xA9\x5D\x91\x8B\xD1"
-                         "\x83\xB7\x0D\x3A\xA8\xBC\x6E\xE4"
-                         "\xC3\x09\xE9\xD8\x5A\x41\xAD\x4A",
-               .ilen   = 80,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x11\x22\x33\x44",
-               .klen   = 36,
-               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .result = "\x45\x00\x00\x30\x69\xA6\x40\x00"
-                         "\x80\x06\x26\x90\xC0\xA8\x01\x02"
-                         "\x93\x89\x15\x5E\x0A\x9E\x00\x8B"
-                         "\x2D\xC5\x7E\xE0\x00\x00\x00\x00"
-                         "\x70\x02\x40\x00\x20\xBF\x00\x00"
-                         "\x02\x04\x05\xB4\x01\x01\x04\x02"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-               .assoc  = "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"
-                         "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .alen   = 16,
-               .input  = "\xFF\x42\x5C\x9B\x72\x45\x99\xDF"
-                         "\x7A\x3B\xCD\x51\x01\x94\xE0\x0D"
-                         "\x6A\x78\x10\x7F\x1B\x0B\x1C\xBF"
-                         "\x06\xEF\xAE\x9D\x65\xA5\xD7\x63"
-                         "\x74\x8A\x63\x79\x85\x77\x1D\x34"
-                         "\x7F\x05\x45\x65\x9F\x14\xE9\x9D"
-                         "\xEF\x84\x2D\x8E\xB3\x35\xF4\xEE"
-                         "\xCF\xDB\xF8\x31\x82\x4B\x4C\x49"
-                         "\x15\x95\x6C\x96",
-               .ilen   = 68,
-       }, {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00",
-               .klen   = 20,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .result = "\x45\x00\x00\x3C\x99\xC5\x00\x00"
-                         "\x80\x01\xCB\x7A\x40\x67\x93\x18"
-                         "\x01\x01\x01\x01\x08\x00\x07\x5C"
-                         "\x02\x00\x44\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x75\x76\x77\x61\x62\x63\x64\x65"
-                         "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .rlen   = 64,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x46\x88\xDA\xF2\xF9\x73\xA3\x92"
-                         "\x73\x29\x09\xC3\x31\xD5\x6D\x60"
-                         "\xF6\x94\xAB\xAA\x41\x4B\x5E\x7F"
-                         "\xF5\xFD\xCD\xFF\xF5\xE9\xA2\x84"
-                         "\x45\x64\x76\x49\x27\x19\xFF\xB6"
-                         "\x4D\xE7\xD9\xDC\xA1\xE1\xD8\x94"
-                         "\xBC\x3B\xD5\x78\x73\xED\x4D\x18"
-                         "\x1D\x19\xD4\xD5\xC8\xC1\x8A\xF3"
-                         "\xF8\x21\xD4\x96\xEE\xB0\x96\xE9"
-                         "\x8A\xD2\xB6\x9E\x47\x99\xC7\x1D",
-               .ilen   = 80,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E\x43",
-               .klen   = 20,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x3C\x99\xC3\x00\x00"
-                         "\x80\x01\xCB\x7C\x40\x67\x93\x18"
-                         "\x01\x01\x01\x01\x08\x00\x08\x5C"
-                         "\x02\x00\x43\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x75\x76\x77\x61\x62\x63\x64\x65"
-                         "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .rlen   = 64,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\xFB\xA2\xCA\xA4\x85\x3C\xF9\xF0"
-                         "\xF2\x2C\xB1\x0D\x86\xDD\x83\xB0"
-                         "\xFE\xC7\x56\x91\xCF\x1A\x04\xB0"
-                         "\x0D\x11\x38\xEC\x9C\x35\x79\x17"
-                         "\x65\xAC\xBD\x87\x01\xAD\x79\x84"
-                         "\x5B\xF9\xFE\x3F\xBA\x48\x7B\xC9"
-                         "\x17\x55\xE6\x66\x2B\x4C\x8D\x0D"
-                         "\x1F\x5E\x22\x73\x95\x30\x32\x0A"
-                         "\xE0\xD7\x31\xCC\x97\x8E\xCA\xFA"
-                         "\xEA\xE8\x8F\x00\xE8\x0D\x6E\x48",
-               .ilen   = 80,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E\x43",
-               .klen   = 20,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x1C\x42\xA2\x00\x00"
-                         "\x80\x01\x44\x1F\x40\x67\x93\xB6"
-                         "\xE0\x00\x00\x02\x0A\x00\xF5\xFF"
-                         "\x01\x02\x02\x01",
-               .rlen   = 28,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\xFB\xA2\xCA\x84\x5E\x5D\xF9\xF0"
-                         "\xF2\x2C\x3E\x6E\x86\xDD\x83\x1E"
-                         "\x1F\xC6\x57\x92\xCD\x1A\xF9\x13"
-                         "\x0E\x13\x79\xED\x36\x9F\x07\x1F"
-                         "\x35\xE0\x34\xBE\x95\xF1\x12\xE4"
-                         "\xE7\xD0\x5D\x35",
-               .ilen   = 44,
-       }, {
-               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
-                         "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\xCA\xFE\xBA\xBE",
-               .klen   = 28,
-               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .result = "\x45\x00\x00\x28\xA4\xAD\x40\x00"
-                         "\x40\x06\x78\x80\x0A\x01\x03\x8F"
-                         "\x0A\x01\x06\x12\x80\x23\x06\xB8"
-                         "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"
-                         "\x50\x10\x16\xD0\x75\x68\x00\x01",
-               .rlen   = 40,
-               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
-                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .alen   = 16,
-               .input  = "\xA5\xB1\xF8\x06\x60\x29\xAE\xA4"
-                         "\x0E\x59\x8B\x81\x22\xDE\x02\x42"
-                         "\x09\x38\xB3\xAB\x33\xF8\x28\xE6"
-                         "\x87\xB8\x85\x8B\x5B\xFB\xDB\xD0"
-                         "\x31\x5B\x27\x45\x21\x44\xCC\x77"
-                         "\x95\x45\x7B\x96\x52\x03\x7F\x53"
-                         "\x18\x02\x7B\x5B\x4C\xD7\xA6\x36",
-               .ilen   = 56,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xDE\xCA\xF8\x88",
-               .klen   = 20,
-               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .result = "\x45\x00\x00\x49\x33\xBA\x00\x00"
-                         "\x7F\x11\x91\x06\xC3\xFB\x1D\x10"
-                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
-                         "\x00\x35\xDD\x7B\x80\x03\x02\xD5"
-                         "\x00\x00\x4E\x20\x00\x1E\x8C\x18"
-                         "\xD7\x5B\x81\xDC\x91\xBA\xA0\x47"
-                         "\x6B\x91\xB9\x24\xB2\x80\x38\x9D"
-                         "\x92\xC9\x63\xBA\xC0\x46\xEC\x95"
-                         "\x9B\x62\x66\xC0\x47\x22\xB1\x49"
-                         "\x23\x01\x01\x01",
-               .rlen   = 76,
-               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
-                         "\xCE\xFA\xCE\x74",
-               .alen   = 20,
-               .input  = "\x18\xA6\xFD\x42\xF7\x2C\xBF\x4A"
-                         "\xB2\xA2\xEA\x90\x1F\x73\xD8\x14"
-                         "\xE3\xE7\xF2\x43\xD9\x54\x12\xE1"
-                         "\xC3\x49\xC1\xD2\xFB\xEC\x16\x8F"
-                         "\x91\x90\xFE\xEB\xAF\x2C\xB0\x19"
-                         "\x84\xE6\x58\x63\x96\x5D\x74\x72"
-                         "\xB7\x9D\xA3\x45\xE0\xE7\x80\x19"
-                         "\x1F\x0D\x2F\x0E\x0F\x49\x6C\x22"
-                         "\x6F\x21\x27\xB2\x7D\xB3\x57\x24"
-                         "\xE7\x84\x5D\x68\x65\x1F\x57\xE6"
-                         "\x5F\x35\x4F\x75\xFF\x17\x01\x57"
-                         "\x69\x62\x34\x36",
-               .ilen   = 92,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x73\x61\x6C\x74",
-               .klen   = 36,
-               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .result = "\x45\x08\x00\x28\x73\x2C\x00\x00"
-                         "\x40\x06\xE9\xF9\x0A\x01\x06\x12"
-                         "\x0A\x01\x03\x8F\x06\xB8\x80\x23"
-                         "\xDD\x6B\xAF\xBE\xCB\x71\x26\x02"
-                         "\x50\x10\x1F\x64\x6D\x54\x00\x01",
-               .rlen   = 40,
-               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
-                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
-                         "\x69\x76\x65\x63",
-               .alen   = 20,
-               .input  = "\xF2\xD6\x9E\xCD\xBD\x5A\x0D\x5B"
-                         "\x8D\x5E\xF3\x8B\xAD\x4D\xA5\x8D"
-                         "\x1F\x27\x8F\xDE\x98\xEF\x67\x54"
-                         "\x9D\x52\x4A\x30\x18\xD9\xA5\x7F"
-                         "\xF4\xD3\xA3\x1C\xE6\x73\x11\x9E"
-                         "\x45\x16\x26\xC2\x41\x57\x71\xE3"
-                         "\xB7\xEE\xBC\xA6\x14\xC8\x9B\x35",
-               .ilen   = 56,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E\x43",
-               .klen   = 20,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x49\x33\x3E\x00\x00"
-                         "\x7F\x11\x91\x82\xC3\xFB\x1D\x10"
-                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
-                         "\x00\x35\xCB\x45\x80\x03\x02\x5B"
-                         "\x00\x00\x01\xE0\x00\x1E\x8C\x18"
-                         "\xD6\x57\x59\xD5\x22\x84\xA0\x35"
-                         "\x2C\x71\x47\x5C\x88\x80\x39\x1C"
-                         "\x76\x4D\x6E\x5E\xE0\x49\x6B\x32"
-                         "\x5A\xE2\x70\xC0\x38\x99\x49\x39"
-                         "\x15\x01\x01\x01",
-               .rlen   = 76,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\xFB\xA2\xCA\xD1\x2F\xC1\xF9\xF0"
-                         "\x0D\x3C\xEB\xF3\x05\x41\x0D\xB8"
-                         "\x3D\x77\x84\xB6\x07\x32\x3D\x22"
-                         "\x0F\x24\xB0\xA9\x7D\x54\x18\x28"
-                         "\x00\xCA\xDB\x0F\x68\xD9\x9E\xF0"
-                         "\xE0\xC0\xC8\x9A\xE9\xBE\xA8\x88"
-                         "\x4E\x52\xD6\x5B\xC1\xAF\xD0\x74"
-                         "\x0F\x74\x24\x44\x74\x7B\x5B\x39"
-                         "\xAB\x53\x31\x63\xAA\xD4\x55\x0E"
-                         "\xE5\x16\x09\x75\xCD\xB6\x08\xC5"
-                         "\x76\x91\x89\x60\x97\x63\xB8\xE1"
-                         "\x8C\xAA\x81\xE2",
-               .ilen   = 92,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x73\x61\x6C\x74",
-               .klen   = 36,
-               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .result = "\x63\x69\x73\x63\x6F\x01\x72\x75"
-                         "\x6C\x65\x73\x01\x74\x68\x65\x01"
-                         "\x6E\x65\x74\x77\x65\x01\x64\x65"
-                         "\x66\x69\x6E\x65\x01\x74\x68\x65"
-                         "\x74\x65\x63\x68\x6E\x6F\x6C\x6F"
-                         "\x67\x69\x65\x73\x01\x74\x68\x61"
-                         "\x74\x77\x69\x6C\x6C\x01\x64\x65"
-                         "\x66\x69\x6E\x65\x74\x6F\x6D\x6F"
-                         "\x72\x72\x6F\x77\x01\x02\x02\x01",
-               .rlen   = 72,
-               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
-                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
-                         "\x69\x76\x65\x63",
-               .alen   = 20,
-               .input  = "\xD4\xB7\xED\x86\xA1\x77\x7F\x2E"
-                         "\xA1\x3D\x69\x73\xD3\x24\xC6\x9E"
-                         "\x7B\x43\xF8\x26\xFB\x56\x83\x12"
-                         "\x26\x50\x8B\xEB\xD2\xDC\xEB\x18"
-                         "\xD0\xA6\xDF\x10\xE5\x48\x7D\xF0"
-                         "\x74\x11\x3E\x14\xC6\x41\x02\x4E"
-                         "\x3E\x67\x73\xD9\x1A\x62\xEE\x42"
-                         "\x9B\x04\x3A\x10\xE3\xEF\xE6\xB0"
-                         "\x12\xA4\x93\x63\x41\x23\x64\xF8"
-                         "\xC0\xCA\xC5\x87\xF2\x49\xE5\x6B"
-                         "\x11\xE2\x4F\x30\xE4\x4C\xCC\x76",
-               .ilen   = 88,
-       }, {
-               .key    = "\x7D\x77\x3D\x00\xC1\x44\xC5\x25"
-                         "\xAC\x61\x9D\x18\xC8\x4A\x3F\x47"
-                         "\xD9\x66\x42\x67",
-               .klen   = 20,
-               .iv     = "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .result = "\x01\x02\x02\x01",
-               .rlen   = 4,
-               .assoc  = "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"
-                         "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .alen   = 16,
-               .input  = "\x43\x7F\x86\x6B\xCB\x3F\x69\x9F"
-                         "\xE9\xB0\x82\x2B\xAC\x96\x1C\x45"
-                         "\x04\xBE\xF2\x70",
-               .ilen   = 20,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xDE\xCA\xF8\x88",
-               .klen   = 20,
-               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .result = "\x74\x6F\x01\x62\x65\x01\x6F\x72"
-                         "\x01\x6E\x6F\x74\x01\x74\x6F\x01"
-                         "\x62\x65\x00\x01",
-               .rlen   = 20,
-               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
-                         "\xCE\xFA\xCE\x74",
-               .alen   = 20,
-               .input  = "\x29\xC9\xFC\x69\xA1\x97\xD0\x38"
-                         "\xCC\xDD\x14\xE2\xDD\xFC\xAA\x05"
-                         "\x43\x33\x21\x64\x41\x25\x03\x52"
-                         "\x43\x03\xED\x3C\x6C\x5F\x28\x38"
-                         "\x43\xAF\x8C\x3E",
-               .ilen   = 36,
-       }, {
-               .key    = "\x6C\x65\x67\x61\x6C\x69\x7A\x65"
-                         "\x6D\x61\x72\x69\x6A\x75\x61\x6E"
-                         "\x61\x61\x6E\x64\x64\x6F\x69\x74"
-                         "\x62\x65\x66\x6F\x72\x65\x69\x61"
-                         "\x74\x75\x72\x6E",
-               .klen   = 36,
-               .iv     = "\x33\x30\x21\x69\x67\x65\x74\x6D",
-               .result = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
-                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
-                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-               .assoc  = "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"
-                         "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"
-                         "\x67\x65\x74\x6D",
-               .alen   = 20,
-               .input  = "\xF9\x7A\xB2\xAA\x35\x6D\x8E\xDC"
-                         "\xE1\x76\x44\xAC\x8C\x78\xE2\x5D"
-                         "\xD2\x4D\xED\xBB\x29\xEB\xF1\xB6"
-                         "\x4A\x27\x4B\x39\xB4\x9C\x3A\x86"
-                         "\x4C\xD3\xD7\x8C\xA4\xAE\x68\xA3"
-                         "\x2B\x42\x45\x8F\xB5\x7D\xBE\x82"
-                         "\x1D\xCC\x63\xB9\xD0\x93\x7B\xA2"
-                         "\x94\x5F\x66\x93\x68\x66\x1A\x32"
-                         "\x9F\xB4\xC0\x53",
-               .ilen   = 68,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E\x43",
-               .klen   = 20,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
-                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
-                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-               .assoc  = "\x3F\x7E\xF6\x42\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\xFB\xA2\xCA\xA8\xC6\xC5\xF9\xF0"
-                         "\xF2\x2C\xA5\x4A\x06\x12\x10\xAD"
-                         "\x3F\x6E\x57\x91\xCF\x1A\xCA\x21"
-                         "\x0D\x11\x7C\xEC\x9C\x35\x79\x17"
-                         "\x65\xAC\xBD\x87\x01\xAD\x79\x84"
-                         "\x5B\xF9\xFE\x3F\xBA\x48\x7B\xC9"
-                         "\x63\x21\x93\x06\x84\xEE\xCA\xDB"
-                         "\x56\x91\x25\x46\xE7\xA9\x5C\x97"
-                         "\x40\xD7\xCB\x05",
-               .ilen   = 68,
-       }, {
-               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
-                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
-                         "\x22\x43\x3C\x64",
-               .klen   = 20,
-               .iv     = "\x48\x55\xEC\x7D\x3A\x23\x4B\xFD",
-               .result = "\x08\x00\xC6\xCD\x02\x00\x07\x00"
-                         "\x61\x62\x63\x64\x65\x66\x67\x68"
-                         "\x69\x6A\x6B\x6C\x6D\x6E\x6F\x70"
-                         "\x71\x72\x73\x74\x01\x02\x02\x01",
-               .rlen   = 32,
-               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
-                         "\x00\x00\x00\x07\x48\x55\xEC\x7D"
-                         "\x3A\x23\x4B\xFD",
-               .alen   = 20,
-               .input  = "\x74\x75\x2E\x8A\xEB\x5D\x87\x3C"
-                         "\xD7\xC0\xF4\xAC\xC3\x6C\x4B\xFF"
-                         "\x84\xB7\xD7\xB9\x8F\x0C\xA8\xB6"
-                         "\xAC\xDA\x68\x94\xBC\x61\x90\x69"
-                         "\xEF\x9C\xBC\x28\xFE\x1B\x56\xA7"
-                         "\xC4\xE0\xD5\x8C\x86\xCD\x2B\xC0",
-               .ilen   = 48,
-       }
-};
-
-static const struct aead_testvec aes_gcm_rfc4543_enc_tv_template[] = {
-       { /* From draft-mcgrew-gcm-test-01 */
-               .key    = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda"
-                         "\x90\x6a\xc7\x3c\x36\x13\xa6\x34"
-                         "\x22\x43\x3c\x64",
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x07"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .ilen   = 52,
-               .result = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01\xf2\xa9\xa8\x36"
-                         "\xe1\x55\x10\x6a\xa8\xdc\xd6\x18"
-                         "\xe4\x09\x9a\xaa",
-               .rlen   = 68,
-       }, { /* nearly same as previous, but should fail */
-               .key    = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda"
-                         "\x90\x6a\xc7\x3c\x36\x13\xa6\x34"
-                         "\x22\x43\x3c\x64",
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x07"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .ilen   = 52,
-               .novrfy = 1,
-               .result = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01\xf2\xa9\xa8\x36"
-                         "\xe1\x55\x10\x6a\xa8\xdc\xd6\x18"
-                         "\x00\x00\x00\x00",
-               .rlen   = 68,
-       },
-};
-
-static const struct aead_testvec aes_gcm_rfc4543_dec_tv_template[] = {
-       { /* From draft-mcgrew-gcm-test-01 */
-               .key    = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda"
-                         "\x90\x6a\xc7\x3c\x36\x13\xa6\x34"
-                         "\x22\x43\x3c\x64",
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x07"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01\xf2\xa9\xa8\x36"
-                         "\xe1\x55\x10\x6a\xa8\xdc\xd6\x18"
-                         "\xe4\x09\x9a\xaa",
-               .ilen   = 68,
-               .result = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-       }, { /* nearly same as previous, but should fail */
-               .key    = "\x4c\x80\xcd\xef\xbb\x5d\x10\xda"
-                         "\x90\x6a\xc7\x3c\x36\x13\xa6\x34"
-                         "\x22\x43\x3c\x64",
-               .klen   = 20,
-               .iv     = zeroed_string,
-               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x07"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01\xf2\xa9\xa8\x36"
-                         "\xe1\x55\x10\x6a\xa8\xdc\xd6\x18"
-                         "\x00\x00\x00\x00",
-               .ilen   = 68,
-               .novrfy = 1,
-               .result = "\x45\x00\x00\x30\xda\x3a\x00\x00"
-                         "\x80\x01\xdf\x3b\xc0\xa8\x00\x05"
-                         "\xc0\xa8\x00\x01\x08\x00\xc6\xcd"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6a\x6b\x6c"
-                         "\x6d\x6e\x6f\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-       },
-};
-
-static const struct aead_testvec aes_ccm_enc_tv_template[] = {
-       { /* From RFC 3610 */
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x03\x02\x01\x00"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07",
-               .alen   = 8,
-               .input  = "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x10\x11\x12\x13\x14\x15\x16\x17"
-                         "\x18\x19\x1a\x1b\x1c\x1d\x1e",
-               .ilen   = 23,
-               .result = "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"
-                         "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"
-                         "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"
-                         "\xe8\xd1\x2c\xfd\xf9\x26\xe0",
-               .rlen   = 31,
-       }, {
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x07\x06\x05\x04"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b",
-               .alen   = 12,
-               .input  = "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
-                         "\x14\x15\x16\x17\x18\x19\x1a\x1b"
-                         "\x1c\x1d\x1e\x1f",
-               .ilen   = 20,
-               .result = "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"
-                         "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"
-                         "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"
-                         "\x7d\x9c\x2d\x93",
-               .rlen   = 28,
-       }, {
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x0b\x0a\x09\x08"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07",
-               .alen   = 8,
-               .input  = "\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",
-               .ilen   = 25,
-               .result = "\x82\x53\x1a\x60\xcc\x24\x94\x5a"
-                         "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"
-                         "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"
-                         "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"
-                         "\x7e\x5f\x4e",
-               .rlen   = 35,
-       }, {
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x0c\x0b\x0a\x09"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b",
-               .alen   = 12,
-               .input  = "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
-                         "\x14\x15\x16\x17\x18\x19\x1a\x1b"
-                         "\x1c\x1d\x1e",
-               .ilen   = 19,
-               .result = "\x07\x34\x25\x94\x15\x77\x85\x15"
-                         "\x2b\x07\x40\x98\x33\x0a\xbb\x14"
-                         "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"
-                         "\x4d\x99\x99\x88\xdd",
-               .rlen   = 29,
-       }, {
-               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
-                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
-               .klen   = 16,
-               .iv     = "\x01\x00\x33\x56\x8e\xf7\xb2\x63"
-                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
-               .assoc  = "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",
-               .alen   = 8,
-               .input  = "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"
-                         "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"
-                         "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",
-               .ilen   = 24,
-               .result = "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"
-                         "\xa0\x72\x6c\x55\xd3\x78\x06\x12"
-                         "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"
-                         "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",
-               .rlen   = 32,
-       }, {
-               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
-                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
-               .klen   = 16,
-               .iv     = "\x01\x00\xd5\x60\x91\x2d\x3f\x70"
-                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
-               .assoc  = "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"
-                         "\x20\xea\x60\xc0",
-               .alen   = 12,
-               .input  = "\x64\x35\xac\xba\xfb\x11\xa8\x2e"
-                         "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"
-                         "\x3a\x80\x3b\xa8\x7f",
-               .ilen   = 21,
-               .result = "\x00\x97\x69\xec\xab\xdf\x48\x62"
-                         "\x55\x94\xc5\x92\x51\xe6\x03\x57"
-                         "\x22\x67\x5e\x04\xc8\x47\x09\x9e"
-                         "\x5a\xe0\x70\x45\x51",
-               .rlen   = 29,
-       }, {
-               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
-                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
-               .klen   = 16,
-               .iv     = "\x01\x00\x42\xff\xf8\xf1\x95\x1c"
-                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
-               .assoc  = "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",
-               .alen   = 8,
-               .input  = "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"
-                         "\x8e\x5e\x67\x01\xc9\x17\x87\x65"
-                         "\x98\x09\xd6\x7d\xbe\xdd\x18",
-               .ilen   = 23,
-               .result = "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"
-                         "\xdb\x38\x6a\x99\xac\x1a\xef\x23"
-                         "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"
-                         "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"
-                         "\xba",
-               .rlen   = 33,
-       }, {
-               /* This is taken from FIPS CAVS. */
-               .key    = "\x83\xac\x54\x66\xc2\xeb\xe5\x05"
-                         "\x2e\x01\xd1\xfc\x5d\x82\x66\x2e",
-               .klen   = 16,
-               .iv     = "\x03\x96\xac\x59\x30\x07\xa1\xe2\xa2\xc7\x55\x24\0\0\0\0",
-               .alen   = 0,
-               .input  = "\x19\xc8\x81\xf6\xe9\x86\xff\x93"
-                         "\x0b\x78\x67\xe5\xbb\xb7\xfc\x6e"
-                         "\x83\x77\xb3\xa6\x0c\x8c\x9f\x9c"
-                         "\x35\x2e\xad\xe0\x62\xf9\x91\xa1",
-               .ilen   = 32,
-               .result = "\xab\x6f\xe1\x69\x1d\x19\x99\xa8"
-                         "\x92\xa0\xc4\x6f\x7e\xe2\x8b\xb1"
-                         "\x70\xbb\x8c\xa6\x4c\x6e\x97\x8a"
-                         "\x57\x2b\xbe\x5d\x98\xa6\xb1\x32"
-                         "\xda\x24\xea\xd9\xa1\x39\x98\xfd"
-                         "\xa4\xbe\xd9\xf2\x1a\x6d\x22\xa8",
-               .rlen   = 48,
-       }, {
-               .key    = "\x1e\x2c\x7e\x01\x41\x9a\xef\xc0"
-                         "\x0d\x58\x96\x6e\x5c\xa2\x4b\xd3",
-               .klen   = 16,
-               .iv     = "\x03\x4f\xa3\x19\xd3\x01\x5a\xd8"
-                         "\x30\x60\x15\x56\x00\x00\x00\x00",
-               .assoc  = "\xda\xe6\x28\x9c\x45\x2d\xfd\x63"
-                         "\x5e\xda\x4c\xb6\xe6\xfc\xf9\xb7"
-                         "\x0c\x56\xcb\xe4\xe0\x05\x7a\xe1"
-                         "\x0a\x63\x09\x78\xbc\x2c\x55\xde",
-               .alen   = 32,
-               .input  = "\x87\xa3\x36\xfd\x96\xb3\x93\x78"
-                         "\xa9\x28\x63\xba\x12\xa3\x14\x85"
-                         "\x57\x1e\x06\xc9\x7b\x21\xef\x76"
-                         "\x7f\x38\x7e\x8e\x29\xa4\x3e\x7e",
-               .ilen   = 32,
-               .result = "\x8a\x1e\x11\xf0\x02\x6b\xe2\x19"
-                         "\xfc\x70\xc4\x6d\x8e\xb7\x99\xab"
-                         "\xc5\x4b\xa2\xac\xd3\xf3\x48\xff"
-                         "\x3b\xb5\xce\x53\xef\xde\xbb\x02"
-                         "\xa9\x86\x15\x6c\x13\xfe\xda\x0a"
-                         "\x22\xb8\x29\x3d\xd8\x39\x9a\x23",
-               .rlen   = 48,
-       }, {
-               .key    = "\xf4\x6b\xc2\x75\x62\xfe\xb4\xe1"
-                         "\xa3\xf0\xff\xdd\x4e\x4b\x12\x75"
-                         "\x53\x14\x73\x66\x8d\x88\xf6\x80",
-               .klen   = 24,
-               .iv     = "\x03\xa0\x20\x35\x26\xf2\x21\x8d"
-                         "\x50\x20\xda\xe2\x00\x00\x00\x00",
-               .assoc  = "\x5b\x9e\x13\x67\x02\x5e\xef\xc1"
-                         "\x6c\xf9\xd7\x1e\x52\x8f\x7a\x47"
-                         "\xe9\xd4\xcf\x20\x14\x6e\xf0\x2d"
-                         "\xd8\x9e\x2b\x56\x10\x23\x56\xe7",
-               .alen   = 32,
-               .result = "\x36\xea\x7a\x70\x08\xdc\x6a\xbc"
-                         "\xad\x0c\x7a\x63\xf6\x61\xfd\x9b",
-               .rlen   = 16,
-       }, {
-               .key    = "\x56\xdf\x5c\x8f\x26\x3f\x0e\x42"
-                         "\xef\x7a\xd3\xce\xfc\x84\x60\x62"
-                         "\xca\xb4\x40\xaf\x5f\xc9\xc9\x01",
-               .klen   = 24,
-               .iv     = "\x03\xd6\x3c\x8c\x86\x84\xb6\xcd"
-                         "\xef\x09\x2e\x94\x00\x00\x00\x00",
-               .assoc  = "\x02\x65\x78\x3c\xe9\x21\x30\x91"
-                         "\xb1\xb9\xda\x76\x9a\x78\x6d\x95"
-                         "\xf2\x88\x32\xa3\xf2\x50\xcb\x4c"
-                         "\xe3\x00\x73\x69\x84\x69\x87\x79",
-               .alen   = 32,
-               .input  = "\x9f\xd2\x02\x4b\x52\x49\x31\x3c"
-                         "\x43\x69\x3a\x2d\x8e\x70\xad\x7e"
-                         "\xe0\xe5\x46\x09\x80\x89\x13\xb2"
-                         "\x8c\x8b\xd9\x3f\x86\xfb\xb5\x6b",
-               .ilen   = 32,
-               .result = "\x39\xdf\x7c\x3c\x5a\x29\xb9\x62"
-                         "\x5d\x51\xc2\x16\xd8\xbd\x06\x9f"
-                         "\x9b\x6a\x09\x70\xc1\x51\x83\xc2"
-                         "\x66\x88\x1d\x4f\x9a\xda\xe0\x1e"
-                         "\xc7\x79\x11\x58\xe5\x6b\x20\x40"
-                         "\x7a\xea\x46\x42\x8b\xe4\x6f\xe1",
-               .rlen   = 48,
-       }, {
-               .key    = "\xe0\x8d\x99\x71\x60\xd7\x97\x1a"
-                         "\xbd\x01\x99\xd5\x8a\xdf\x71\x3a"
-                         "\xd3\xdf\x24\x4b\x5e\x3d\x4b\x4e"
-                         "\x30\x7a\xb9\xd8\x53\x0a\x5e\x2b",
-               .klen   = 32,
-               .iv     = "\x03\x1e\x29\x91\xad\x8e\xc1\x53"
-                         "\x0a\xcf\x2d\xbe\x00\x00\x00\x00",
-               .assoc  = "\x19\xb6\x1f\x57\xc4\xf3\xf0\x8b"
-                         "\x78\x2b\x94\x02\x29\x0f\x42\x27"
-                         "\x6b\x75\xcb\x98\x34\x08\x7e\x79"
-                         "\xe4\x3e\x49\x0d\x84\x8b\x22\x87",
-               .alen   = 32,
-               .input  = "\xe1\xd9\xd8\x13\xeb\x3a\x75\x3f"
-                         "\x9d\xbd\x5f\x66\xbe\xdc\xbb\x66"
-                         "\xbf\x17\x99\x62\x4a\x39\x27\x1f"
-                         "\x1d\xdc\x24\xae\x19\x2f\x98\x4c",
-               .ilen   = 32,
-               .result = "\x19\xb8\x61\x33\x45\x2b\x43\x96"
-                         "\x6f\x51\xd0\x20\x30\x7d\x9b\xc6"
-                         "\x26\x3d\xf8\xc9\x65\x16\xa8\x9f"
-                         "\xf0\x62\x17\x34\xf2\x1e\x8d\x75"
-                         "\x4e\x13\xcc\xc0\xc3\x2a\x54\x2d",
-               .rlen   = 40,
-       }, {
-               .key    = "\x7c\xc8\x18\x3b\x8d\x99\xe0\x7c"
-                         "\x45\x41\xb8\xbd\x5c\xa7\xc2\x32"
-                         "\x8a\xb8\x02\x59\xa4\xfe\xa9\x2c"
-                         "\x09\x75\x9a\x9b\x3c\x9b\x27\x39",
-               .klen   = 32,
-               .iv     = "\x03\xf9\xd9\x4e\x63\xb5\x3d\x9d"
-                         "\x43\xf6\x1e\x50\0\0\0\0",
-               .assoc  = "\x57\xf5\x6b\x8b\x57\x5c\x3d\x3b"
-                         "\x13\x02\x01\x0c\x83\x4c\x96\x35"
-                         "\x8e\xd6\x39\xcf\x7d\x14\x9b\x94"
-                         "\xb0\x39\x36\xe6\x8f\x57\xe0\x13",
-               .alen   = 32,
-               .input  = "\x3b\x6c\x29\x36\xb6\xef\x07\xa6"
-                         "\x83\x72\x07\x4f\xcf\xfa\x66\x89"
-                         "\x5f\xca\xb1\xba\xd5\x8f\x2c\x27"
-                         "\x30\xdb\x75\x09\x93\xd4\x65\xe4",
-               .ilen   = 32,
-               .result = "\xb0\x88\x5a\x33\xaa\xe5\xc7\x1d"
-                         "\x85\x23\xc7\xc6\x2f\xf4\x1e\x3d"
-                         "\xcc\x63\x44\x25\x07\x78\x4f\x9e"
-                         "\x96\xb8\x88\xeb\xbc\x48\x1f\x06"
-                         "\x39\xaf\x39\xac\xd8\x4a\x80\x39"
-                         "\x7b\x72\x8a\xf7",
-               .rlen   = 44,
-       }, {
-               .key    = "\xab\xd0\xe9\x33\x07\x26\xe5\x83"
-                         "\x8c\x76\x95\xd4\xb6\xdc\xf3\x46"
-                         "\xf9\x8f\xad\xe3\x02\x13\x83\x77"
-                         "\x3f\xb0\xf1\xa1\xa1\x22\x0f\x2b",
-               .klen   = 32,
-               .iv     = "\x03\x24\xa7\x8b\x07\xcb\xcc\x0e"
-                         "\xe6\x33\xbf\xf5\x00\x00\x00\x00",
-               .assoc  = "\xd4\xdb\x30\x1d\x03\xfe\xfd\x5f"
-                         "\x87\xd4\x8c\xb6\xb6\xf1\x7a\x5d"
-                         "\xab\x90\x65\x8d\x8e\xca\x4d\x4f"
-                         "\x16\x0c\x40\x90\x4b\xc7\x36\x73",
-               .alen   = 32,
-               .input  = "\xf5\xc6\x7d\x48\xc1\xb7\xe6\x92"
-                         "\x97\x5a\xca\xc4\xa9\x6d\xf9\x3d"
-                         "\x6c\xde\xbc\xf1\x90\xea\x6a\xb2"
-                         "\x35\x86\x36\xaf\x5c\xfe\x4b\x3a",
-               .ilen   = 32,
-               .result = "\x83\x6f\x40\x87\x72\xcf\xc1\x13"
-                         "\xef\xbb\x80\x21\x04\x6c\x58\x09"
-                         "\x07\x1b\xfc\xdf\xc0\x3f\x5b\xc7"
-                         "\xe0\x79\xa8\x6e\x71\x7c\x3f\xcf"
-                         "\x5c\xda\xb2\x33\xe5\x13\xe2\x0d"
-                         "\x74\xd1\xef\xb5\x0f\x3a\xb5\xf8",
-               .rlen   = 48,
-       }, {
-               /* This is taken from FIPS CAVS. */
-               .key    = "\xab\x2f\x8a\x74\xb7\x1c\xd2\xb1"
-                         "\xff\x80\x2e\x48\x7d\x82\xf8\xb9",
-               .klen   = 16,
-               .iv     = "\x03\xc6\xfb\x7d\x80\x0d\x13\xab"
-                         "\xd8\xa6\xb2\xd8\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\x00",
-               .ilen   = 0,
-               .result = "\xd5\xe8\x93\x9f\xc7\x89\x2e\x2b",
-               .rlen   = 8,
-               .novrfy = 1,
-       }, {
-               .key    = "\xab\x2f\x8a\x74\xb7\x1c\xd2\xb1"
-                         "\xff\x80\x2e\x48\x7d\x82\xf8\xb9",
-               .klen   = 16,
-               .iv     = "\x03\xaf\x94\x87\x78\x35\x82\x81"
-                         "\x7f\x88\x94\x68\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\x00",
-               .ilen   = 0,
-               .result = "\x41\x3c\xb8\x87\x73\xcb\xf3\xf3",
-               .rlen   = 8,
-       }, {
-               .key    = "\x61\x0e\x8c\xae\xe3\x23\xb6\x38"
-                         "\x76\x1c\xf6\x3a\x67\xa3\x9c\xd8",
-               .klen   = 16,
-               .iv     = "\x03\xc6\xfb\x7d\x80\x0d\x13\xab"
-                         "\xd8\xa6\xb2\xd8\x00\x00\x00\x00",
-               .assoc  = "\xf3\x94\x87\x78\x35\x82\x81\x7f"
-                         "\x88\x94\x68\xb1\x78\x6b\x2b\xd6"
-                         "\x04\x1f\x4e\xed\x78\xd5\x33\x66"
-                         "\xd8\x94\x99\x91\x81\x54\x62\x57",
-               .alen   = 32,
-               .input  = "\x50\x82\x3e\x07\xe2\x1e\xb6\xfb"
-                         "\x33\xe4\x73\xce\xd2\xfb\x95\x79"
-                         "\xe8\xb4\xb5\x77\x11\x10\x62\x6f"
-                         "\x6a\x82\xd1\x13\xec\xf5\xd0\x48",
-               .ilen   = 32,
-               .result = "\xf0\x7c\x29\x02\xae\x1c\x2f\x55"
-                         "\xd0\xd1\x3d\x1a\xa3\x6d\xe4\x0a"
-                         "\x86\xb0\x87\x6b\x62\x33\x8c\x34"
-                         "\xce\xab\x57\xcc\x79\x0b\xe0\x6f"
-                         "\x5c\x3e\x48\x1f\x6c\x46\xf7\x51"
-                         "\x8b\x84\x83\x2a\xc1\x05\xb8\xc5",
-               .rlen   = 48,
-               .novrfy = 1,
-       }, {
-               .key    = "\x61\x0e\x8c\xae\xe3\x23\xb6\x38"
-                         "\x76\x1c\xf6\x3a\x67\xa3\x9c\xd8",
-               .klen   = 16,
-               .iv     = "\x03\x05\xe0\xc9\x0f\xed\x34\xea"
-                         "\x97\xd4\x3b\xdf\x00\x00\x00\x00",
-               .assoc  = "\x49\x5c\x50\x1f\x1d\x94\xcc\x81"
-                         "\xba\xb7\xb6\x03\xaf\xa5\xc1\xa1"
-                         "\xd8\x5c\x42\x68\xe0\x6c\xda\x89"
-                         "\x05\xac\x56\xac\x1b\x2a\xd3\x86",
-               .alen   = 32,
-               .input  = "\x75\x05\xbe\xc2\xd9\x1e\xde\x60"
-                         "\x47\x3d\x8c\x7d\xbd\xb5\xd9\xb7"
-                         "\xf2\xae\x61\x05\x8f\x82\x24\x3f"
-                         "\x9c\x67\x91\xe1\x38\x4f\xe4\x0c",
-               .ilen   = 32,
-               .result = "\x39\xbe\x7d\x15\x62\x77\xf3\x3c"
-                         "\xad\x83\x52\x6d\x71\x03\x25\x1c"
-                         "\xed\x81\x3a\x9a\x16\x7d\x19\x80"
-                         "\x72\x04\x72\xd0\xf6\xff\x05\x0f"
-                         "\xb7\x14\x30\x00\x32\x9e\xa0\xa6"
-                         "\x9e\x5a\x18\xa1\xb8\xfe\xdb\xd3",
-               .rlen   = 48,
-       }, {
-               .key    = "\x39\xbb\xa7\xbe\x59\x97\x9e\x73"
-                         "\xa2\xbc\x6b\x98\xd7\x75\x7f\xe3"
-                         "\xa4\x48\x93\x39\x26\x71\x4a\xc6",
-               .klen   = 24,
-               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
-                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
-               .assoc  = "\x44\xa6\x2c\x05\xe9\xe1\x43\xb1"
-                         "\x58\x7c\xf2\x5c\x6d\x39\x0a\x64"
-                         "\xa4\xf0\x13\x05\xd1\x77\x99\x67"
-                         "\x11\xc4\xc6\xdb\x00\x56\x36\x61",
-               .alen   = 32,
-               .input  = "\x00",
-               .ilen   = 0,
-               .result = "\x71\x99\xfa\xf4\x44\x12\x68\x9b",
-               .rlen   = 8,
-       }, {
-               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
-                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
-                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba",
-               .klen   = 24,
-               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
-                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
-               .assoc  = "\x44\xa6\x2c\x05\xe9\xe1\x43\xb1"
-                         "\x58\x7c\xf2\x5c\x6d\x39\x0a\x64"
-                         "\xa4\xf0\x13\x05\xd1\x77\x99\x67"
-                         "\x11\xc4\xc6\xdb\x00\x56\x36\x61",
-               .alen   = 32,
-               .input  = "\x85\x34\x66\x42\xc8\x92\x0f\x36"
-                         "\x58\xe0\x6b\x91\x3c\x98\x5c\xbb"
-                         "\x0a\x85\xcc\x02\xad\x7a\x96\xe9"
-                         "\x65\x43\xa4\xc3\x0f\xdc\x55\x81",
-               .ilen   = 32,
-               .result = "\xfb\xe5\x5d\x34\xbe\xe5\xe8\xe7"
-                         "\x5a\xef\x2f\xbf\x1f\x7f\xd4\xb2"
-                         "\x66\xca\x61\x1e\x96\x7a\x61\xb3"
-                         "\x1c\x16\x45\x52\xba\x04\x9c\x9f"
-                         "\xb1\xd2\x40\xbc\x52\x7c\x6f\xb1",
-               .rlen   = 40,
-       }, {
-               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
-                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
-                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba",
-               .klen   = 24,
-               .iv     = "\x03\xd1\xfc\x57\x9c\xfe\xb8\x9c"
-                         "\xad\x71\xaa\x1f\x00\x00\x00\x00",
-               .assoc  = "\x86\x67\xa5\xa9\x14\x5f\x0d\xc6"
-                         "\xff\x14\xc7\x44\xbf\x6c\x3a\xc3"
-                         "\xff\xb6\x81\xbd\xe2\xd5\x06\xc7"
-                         "\x3c\xa1\x52\x13\x03\x8a\x23\x3a",
-               .alen   = 32,
-               .input  = "\x02\x87\x4d\x28\x80\x6e\xb2\xed"
-                         "\x99\x2a\xa8\xca\x04\x25\x45\x90"
-                         "\x1d\xdd\x5a\xd9\xe4\xdb\x9c\x9c"
-                         "\x49\xe9\x01\xfe\xa7\x80\x6d\x6b",
-               .ilen   = 32,
-               .result = "\x3f\x66\xb0\x9d\xe5\x4b\x38\x00"
-                         "\xc6\x0e\x6e\xe5\xd6\x98\xa6\x37"
-                         "\x8c\x26\x33\xc6\xb2\xa2\x17\xfa"
-                         "\x64\x19\xc0\x30\xd7\xfc\x14\x6b"
-                         "\xe3\x33\xc2\x04\xb0\x37\xbe\x3f"
-                         "\xa9\xb4\x2d\x68\x03\xa3\x44\xef",
-               .rlen   = 48,
-               .novrfy = 1,
-       }, {
-               .key    = "\xa4\x4b\x54\x29\x0a\xb8\x6d\x01"
-                         "\x5b\x80\x2a\xcf\x25\xc4\xb7\x5c"
-                         "\x20\x2c\xad\x30\xc2\x2b\x41\xfb"
-                         "\x0e\x85\xbc\x33\xad\x0f\x2b\xff",
-               .klen   = 32,
-               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
-                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\x00",
-               .ilen   = 0,
-               .result = "\x1f\xb8\x8f\xa3\xdd\x54\x00\xf2",
-               .rlen   = 8,
-       }, {
-               .key    = "\x39\xbb\xa7\xbe\x59\x97\x9e\x73"
-                         "\xa2\xbc\x6b\x98\xd7\x75\x7f\xe3"
-                         "\xa4\x48\x93\x39\x26\x71\x4a\xc6"
-                         "\xae\x8f\x11\x4c\xc2\x9c\x4a\xbb",
-               .klen   = 32,
-               .iv     = "\x03\x85\x34\x66\x42\xc8\x92\x0f"
-                         "\x36\x58\xe0\x6b\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\xdc\x56\xf2\x71\xb0\xb1\xa0\x6c"
-                         "\xf0\x97\x3a\xfb\x6d\xe7\x32\x99"
-                         "\x3e\xaf\x70\x5e\xb2\x4d\xea\x39"
-                         "\x89\xd4\x75\x7a\x63\xb1\xda\x93",
-               .ilen   = 32,
-               .result = "\x48\x01\x5e\x02\x24\x04\x66\x47"
-                         "\xa1\xea\x6f\xaf\xe8\xfc\xfb\xdd"
-                         "\xa5\xa9\x87\x8d\x84\xee\x2e\x77"
-                         "\xbb\x86\xb9\xf5\x5c\x6c\xff\xf6"
-                         "\x72\xc3\x8e\xf7\x70\xb1\xb2\x07"
-                         "\xbc\xa8\xa3\xbd\x83\x7c\x1d\x2a",
-               .rlen   = 48,
-               .novrfy = 1,
-       }, {
-               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
-                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
-                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba"
-                         "\x0d\x1a\x53\x3b\xb5\xe3\xf8\x8b",
-               .klen   = 32,
-               .iv     = "\x03\xcf\x76\x3f\xd9\x95\x75\x8f"
-                         "\x44\x89\x40\x7b\x00\x00\x00\x00",
-               .assoc  = "\x8f\x86\x6c\x4d\x1d\xc5\x39\x88"
-                         "\xc8\xf3\x5c\x52\x10\x63\x6f\x2b"
-                         "\x8a\x2a\xc5\x6f\x30\x23\x58\x7b"
-                         "\xfb\x36\x03\x11\xb4\xd9\xf2\xfe",
-               .alen   = 32,
-               .input  = "\xc2\x54\xc8\xde\x78\x87\x77\x40"
-                         "\x49\x71\xe4\xb7\xe7\xcb\x76\x61"
-                         "\x0a\x41\xb9\xe9\xc0\x76\x54\xab"
-                         "\x04\x49\x3b\x19\x93\x57\x25\x5d",
-               .ilen   = 32,
-               .result = "\x48\x58\xd6\xf3\xad\x63\x58\xbf"
-                         "\xae\xc7\x5e\xae\x83\x8f\x7b\xe4"
-                         "\x78\x5c\x4c\x67\x71\x89\x94\xbf"
-                         "\x47\xf1\x63\x7e\x1c\x59\xbd\xc5"
-                         "\x7f\x44\x0a\x0c\x01\x18\x07\x92"
-                         "\xe1\xd3\x51\xce\x32\x6d\x0c\x5b",
-               .rlen   = 48,
-       },
-};
-
-static const struct aead_testvec aes_ccm_dec_tv_template[] = {
-       { /* From RFC 3610 */
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x03\x02\x01\x00"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07",
-               .alen   = 8,
-               .input  = "\x58\x8c\x97\x9a\x61\xc6\x63\xd2"
-                         "\xf0\x66\xd0\xc2\xc0\xf9\x89\x80"
-                         "\x6d\x5f\x6b\x61\xda\xc3\x84\x17"
-                         "\xe8\xd1\x2c\xfd\xf9\x26\xe0",
-               .ilen   = 31,
-               .result = "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x10\x11\x12\x13\x14\x15\x16\x17"
-                         "\x18\x19\x1a\x1b\x1c\x1d\x1e",
-               .rlen   = 23,
-       }, {
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x07\x06\x05\x04"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b",
-               .alen   = 12,
-               .input  = "\xdc\xf1\xfb\x7b\x5d\x9e\x23\xfb"
-                         "\x9d\x4e\x13\x12\x53\x65\x8a\xd8"
-                         "\x6e\xbd\xca\x3e\x51\xe8\x3f\x07"
-                         "\x7d\x9c\x2d\x93",
-               .ilen   = 28,
-               .result = "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
-                         "\x14\x15\x16\x17\x18\x19\x1a\x1b"
-                         "\x1c\x1d\x1e\x1f",
-               .rlen   = 20,
-       }, {
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x0b\x0a\x09\x08"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07",
-               .alen   = 8,
-               .input  = "\x82\x53\x1a\x60\xcc\x24\x94\x5a"
-                         "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"
-                         "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"
-                         "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"
-                         "\x7e\x5f\x4e",
-               .ilen   = 35,
-               .result = "\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",
-               .rlen   = 25,
-       }, {
-               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
-                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
-               .klen   = 16,
-               .iv     = "\x01\x00\x00\x00\x0c\x0b\x0a\x09"
-                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
-               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b",
-               .alen   = 12,
-               .input  = "\x07\x34\x25\x94\x15\x77\x85\x15"
-                         "\x2b\x07\x40\x98\x33\x0a\xbb\x14"
-                         "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"
-                         "\x4d\x99\x99\x88\xdd",
-               .ilen   = 29,
-               .result = "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
-                         "\x14\x15\x16\x17\x18\x19\x1a\x1b"
-                         "\x1c\x1d\x1e",
-               .rlen   = 19,
-       }, {
-               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
-                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
-               .klen   = 16,
-               .iv     = "\x01\x00\x33\x56\x8e\xf7\xb2\x63"
-                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
-               .assoc  = "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",
-               .alen   = 8,
-               .input  = "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"
-                         "\xa0\x72\x6c\x55\xd3\x78\x06\x12"
-                         "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"
-                         "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",
-               .ilen   = 32,
-               .result = "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"
-                         "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"
-                         "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",
-               .rlen   = 24,
-       }, {
-               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
-                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
-               .klen   = 16,
-               .iv     = "\x01\x00\xd5\x60\x91\x2d\x3f\x70"
-                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
-               .assoc  = "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"
-                         "\x20\xea\x60\xc0",
-               .alen   = 12,
-               .input  = "\x00\x97\x69\xec\xab\xdf\x48\x62"
-                         "\x55\x94\xc5\x92\x51\xe6\x03\x57"
-                         "\x22\x67\x5e\x04\xc8\x47\x09\x9e"
-                         "\x5a\xe0\x70\x45\x51",
-               .ilen   = 29,
-               .result = "\x64\x35\xac\xba\xfb\x11\xa8\x2e"
-                         "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"
-                         "\x3a\x80\x3b\xa8\x7f",
-               .rlen   = 21,
-       }, {
-               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
-                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
-               .klen   = 16,
-               .iv     = "\x01\x00\x42\xff\xf8\xf1\x95\x1c"
-                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
-               .assoc  = "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",
-               .alen   = 8,
-               .input  = "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"
-                         "\xdb\x38\x6a\x99\xac\x1a\xef\x23"
-                         "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"
-                         "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"
-                         "\xba",
-               .ilen   = 33,
-               .result = "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"
-                         "\x8e\x5e\x67\x01\xc9\x17\x87\x65"
-                         "\x98\x09\xd6\x7d\xbe\xdd\x18",
-               .rlen   = 23,
-       }, {
-               /* This is taken from FIPS CAVS. */
-               .key    = "\xab\x2f\x8a\x74\xb7\x1c\xd2\xb1"
-                         "\xff\x80\x2e\x48\x7d\x82\xf8\xb9",
-               .klen   = 16,
-               .iv     = "\x03\xc6\xfb\x7d\x80\x0d\x13\xab"
-                         "\xd8\xa6\xb2\xd8\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\xd5\xe8\x93\x9f\xc7\x89\x2e\x2b",
-               .ilen   = 8,
-               .result = "\x00",
-               .rlen   = 0,
-               .novrfy = 1,
-       }, {
-               .key    = "\xab\x2f\x8a\x74\xb7\x1c\xd2\xb1"
-                         "\xff\x80\x2e\x48\x7d\x82\xf8\xb9",
-               .klen   = 16,
-               .iv     = "\x03\xaf\x94\x87\x78\x35\x82\x81"
-                         "\x7f\x88\x94\x68\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\x41\x3c\xb8\x87\x73\xcb\xf3\xf3",
-               .ilen   = 8,
-               .result = "\x00",
-               .rlen   = 0,
-       }, {
-               .key    = "\x61\x0e\x8c\xae\xe3\x23\xb6\x38"
-                         "\x76\x1c\xf6\x3a\x67\xa3\x9c\xd8",
-               .klen   = 16,
-               .iv     = "\x03\xc6\xfb\x7d\x80\x0d\x13\xab"
-                         "\xd8\xa6\xb2\xd8\x00\x00\x00\x00",
-               .assoc  = "\xf3\x94\x87\x78\x35\x82\x81\x7f"
-                         "\x88\x94\x68\xb1\x78\x6b\x2b\xd6"
-                         "\x04\x1f\x4e\xed\x78\xd5\x33\x66"
-                         "\xd8\x94\x99\x91\x81\x54\x62\x57",
-               .alen   = 32,
-               .input  = "\xf0\x7c\x29\x02\xae\x1c\x2f\x55"
-                         "\xd0\xd1\x3d\x1a\xa3\x6d\xe4\x0a"
-                         "\x86\xb0\x87\x6b\x62\x33\x8c\x34"
-                         "\xce\xab\x57\xcc\x79\x0b\xe0\x6f"
-                         "\x5c\x3e\x48\x1f\x6c\x46\xf7\x51"
-                         "\x8b\x84\x83\x2a\xc1\x05\xb8\xc5",
-               .ilen   = 48,
-               .result = "\x50\x82\x3e\x07\xe2\x1e\xb6\xfb"
-                         "\x33\xe4\x73\xce\xd2\xfb\x95\x79"
-                         "\xe8\xb4\xb5\x77\x11\x10\x62\x6f"
-                         "\x6a\x82\xd1\x13\xec\xf5\xd0\x48",
-               .rlen   = 32,
-               .novrfy = 1,
-       }, {
-               .key    = "\x61\x0e\x8c\xae\xe3\x23\xb6\x38"
-                         "\x76\x1c\xf6\x3a\x67\xa3\x9c\xd8",
-               .klen   = 16,
-               .iv     = "\x03\x05\xe0\xc9\x0f\xed\x34\xea"
-                         "\x97\xd4\x3b\xdf\x00\x00\x00\x00",
-               .assoc  = "\x49\x5c\x50\x1f\x1d\x94\xcc\x81"
-                         "\xba\xb7\xb6\x03\xaf\xa5\xc1\xa1"
-                         "\xd8\x5c\x42\x68\xe0\x6c\xda\x89"
-                         "\x05\xac\x56\xac\x1b\x2a\xd3\x86",
-               .alen   = 32,
-               .input  = "\x39\xbe\x7d\x15\x62\x77\xf3\x3c"
-                         "\xad\x83\x52\x6d\x71\x03\x25\x1c"
-                         "\xed\x81\x3a\x9a\x16\x7d\x19\x80"
-                         "\x72\x04\x72\xd0\xf6\xff\x05\x0f"
-                         "\xb7\x14\x30\x00\x32\x9e\xa0\xa6"
-                         "\x9e\x5a\x18\xa1\xb8\xfe\xdb\xd3",
-               .ilen   = 48,
-               .result = "\x75\x05\xbe\xc2\xd9\x1e\xde\x60"
-                         "\x47\x3d\x8c\x7d\xbd\xb5\xd9\xb7"
-                         "\xf2\xae\x61\x05\x8f\x82\x24\x3f"
-                         "\x9c\x67\x91\xe1\x38\x4f\xe4\x0c",
-               .rlen   = 32,
-       }, {
-               .key    = "\x39\xbb\xa7\xbe\x59\x97\x9e\x73"
-                         "\xa2\xbc\x6b\x98\xd7\x75\x7f\xe3"
-                         "\xa4\x48\x93\x39\x26\x71\x4a\xc6",
-               .klen   = 24,
-               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
-                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
-               .assoc  = "\x44\xa6\x2c\x05\xe9\xe1\x43\xb1"
-                         "\x58\x7c\xf2\x5c\x6d\x39\x0a\x64"
-                         "\xa4\xf0\x13\x05\xd1\x77\x99\x67"
-                         "\x11\xc4\xc6\xdb\x00\x56\x36\x61",
-               .alen   = 32,
-               .input  = "\x71\x99\xfa\xf4\x44\x12\x68\x9b",
-               .ilen   = 8,
-               .result = "\x00",
-               .rlen   = 0,
-       }, {
-               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
-                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
-                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba",
-               .klen   = 24,
-               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
-                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
-               .assoc  = "\x44\xa6\x2c\x05\xe9\xe1\x43\xb1"
-                         "\x58\x7c\xf2\x5c\x6d\x39\x0a\x64"
-                         "\xa4\xf0\x13\x05\xd1\x77\x99\x67"
-                         "\x11\xc4\xc6\xdb\x00\x56\x36\x61",
-               .alen   = 32,
-               .input  = "\xfb\xe5\x5d\x34\xbe\xe5\xe8\xe7"
-                         "\x5a\xef\x2f\xbf\x1f\x7f\xd4\xb2"
-                         "\x66\xca\x61\x1e\x96\x7a\x61\xb3"
-                         "\x1c\x16\x45\x52\xba\x04\x9c\x9f"
-                         "\xb1\xd2\x40\xbc\x52\x7c\x6f\xb1",
-               .ilen   = 40,
-               .result = "\x85\x34\x66\x42\xc8\x92\x0f\x36"
-                         "\x58\xe0\x6b\x91\x3c\x98\x5c\xbb"
-                         "\x0a\x85\xcc\x02\xad\x7a\x96\xe9"
-                         "\x65\x43\xa4\xc3\x0f\xdc\x55\x81",
-               .rlen   = 32,
-       }, {
-               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
-                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
-                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba",
-               .klen   = 24,
-               .iv     = "\x03\xd1\xfc\x57\x9c\xfe\xb8\x9c"
-                         "\xad\x71\xaa\x1f\x00\x00\x00\x00",
-               .assoc  = "\x86\x67\xa5\xa9\x14\x5f\x0d\xc6"
-                         "\xff\x14\xc7\x44\xbf\x6c\x3a\xc3"
-                         "\xff\xb6\x81\xbd\xe2\xd5\x06\xc7"
-                         "\x3c\xa1\x52\x13\x03\x8a\x23\x3a",
-               .alen   = 32,
-               .input  = "\x3f\x66\xb0\x9d\xe5\x4b\x38\x00"
-                         "\xc6\x0e\x6e\xe5\xd6\x98\xa6\x37"
-                         "\x8c\x26\x33\xc6\xb2\xa2\x17\xfa"
-                         "\x64\x19\xc0\x30\xd7\xfc\x14\x6b"
-                         "\xe3\x33\xc2\x04\xb0\x37\xbe\x3f"
-                         "\xa9\xb4\x2d\x68\x03\xa3\x44\xef",
-               .ilen   = 48,
-               .result = "\x02\x87\x4d\x28\x80\x6e\xb2\xed"
-                         "\x99\x2a\xa8\xca\x04\x25\x45\x90"
-                         "\x1d\xdd\x5a\xd9\xe4\xdb\x9c\x9c"
-                         "\x49\xe9\x01\xfe\xa7\x80\x6d\x6b",
-               .rlen   = 32,
-               .novrfy = 1,
-       }, {
-               .key    = "\xa4\x4b\x54\x29\x0a\xb8\x6d\x01"
-                         "\x5b\x80\x2a\xcf\x25\xc4\xb7\x5c"
-                         "\x20\x2c\xad\x30\xc2\x2b\x41\xfb"
-                         "\x0e\x85\xbc\x33\xad\x0f\x2b\xff",
-               .klen   = 32,
-               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
-                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\x1f\xb8\x8f\xa3\xdd\x54\x00\xf2",
-               .ilen   = 8,
-               .result = "\x00",
-               .rlen   = 0,
-       }, {
-               .key    = "\x39\xbb\xa7\xbe\x59\x97\x9e\x73"
-                         "\xa2\xbc\x6b\x98\xd7\x75\x7f\xe3"
-                         "\xa4\x48\x93\x39\x26\x71\x4a\xc6"
-                         "\xae\x8f\x11\x4c\xc2\x9c\x4a\xbb",
-               .klen   = 32,
-               .iv     = "\x03\x85\x34\x66\x42\xc8\x92\x0f"
-                         "\x36\x58\xe0\x6b\x00\x00\x00\x00",
-               .alen   = 0,
-               .input  = "\x48\x01\x5e\x02\x24\x04\x66\x47"
-                         "\xa1\xea\x6f\xaf\xe8\xfc\xfb\xdd"
-                         "\xa5\xa9\x87\x8d\x84\xee\x2e\x77"
-                         "\xbb\x86\xb9\xf5\x5c\x6c\xff\xf6"
-                         "\x72\xc3\x8e\xf7\x70\xb1\xb2\x07"
-                         "\xbc\xa8\xa3\xbd\x83\x7c\x1d\x2a",
-               .ilen   = 48,
-               .result = "\xdc\x56\xf2\x71\xb0\xb1\xa0\x6c"
-                         "\xf0\x97\x3a\xfb\x6d\xe7\x32\x99"
-                         "\x3e\xaf\x70\x5e\xb2\x4d\xea\x39"
-                         "\x89\xd4\x75\x7a\x63\xb1\xda\x93",
-               .rlen   = 32,
-               .novrfy = 1,
-       }, {
-               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
-                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
-                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba"
-                         "\x0d\x1a\x53\x3b\xb5\xe3\xf8\x8b",
-               .klen   = 32,
-               .iv     = "\x03\xcf\x76\x3f\xd9\x95\x75\x8f"
-                         "\x44\x89\x40\x7b\x00\x00\x00\x00",
-               .assoc  = "\x8f\x86\x6c\x4d\x1d\xc5\x39\x88"
-                         "\xc8\xf3\x5c\x52\x10\x63\x6f\x2b"
-                         "\x8a\x2a\xc5\x6f\x30\x23\x58\x7b"
-                         "\xfb\x36\x03\x11\xb4\xd9\xf2\xfe",
-               .alen   = 32,
-               .input  = "\x48\x58\xd6\xf3\xad\x63\x58\xbf"
-                         "\xae\xc7\x5e\xae\x83\x8f\x7b\xe4"
-                         "\x78\x5c\x4c\x67\x71\x89\x94\xbf"
-                         "\x47\xf1\x63\x7e\x1c\x59\xbd\xc5"
-                         "\x7f\x44\x0a\x0c\x01\x18\x07\x92"
-                         "\xe1\xd3\x51\xce\x32\x6d\x0c\x5b",
-               .ilen   = 48,
-               .result = "\xc2\x54\xc8\xde\x78\x87\x77\x40"
-                         "\x49\x71\xe4\xb7\xe7\xcb\x76\x61"
-                         "\x0a\x41\xb9\xe9\xc0\x76\x54\xab"
-                         "\x04\x49\x3b\x19\x93\x57\x25\x5d",
-               .rlen   = 32,
-       },
-};
-
-/*
- * rfc4309 refers to section 8 of rfc3610 for test vectors, but they all
- * use a 13-byte nonce, we only support an 11-byte nonce.  Worse,
- * they use AD lengths which are not valid ESP header lengths.
- *
- * These vectors are copied/generated from the ones for rfc4106 with
- * the key truncated by one byte..
- */
-static const struct aead_testvec aes_ccm_rfc4309_enc_tv_template[] = {
-       { /* Generated using Crypto++ */
-               .key    = zeroed_string,
-               .klen   = 19,
-               .iv     = zeroed_string,
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .result = "\x2E\x9A\xCA\x6B\xDA\x54\xFC\x6F"
-                         "\x12\x50\xE8\xDE\x81\x3C\x63\x08"
-                         "\x1A\x22\xBA\x75\xEE\xD4\xD5\xB5"
-                         "\x27\x50\x01\xAC\x03\x33\x39\xFB",
-               .rlen   = 32,
-       },{
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = zeroed_string,
-               .ilen   = 16,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = "\xCF\xB9\x99\x17\xC8\x86\x0E\x7F"
-                         "\x7E\x76\xF8\xE6\xF8\xCC\x1F\x17"
-                         "\x6A\xE0\x53\x9F\x4B\x73\x7E\xDA"
-                         "\x08\x09\x4E\xC4\x1E\xAD\xC6\xB0",
-               .rlen   = 32,
-
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = zeroed_string,
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 16,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .result = "\x33\xDE\x73\xBC\xA6\xCE\x4E\xA6"
-                         "\x61\xF4\xF5\x41\x03\x4A\xE3\x86"
-                         "\xA1\xE2\xC2\x42\x2B\x81\x70\x40"
-                         "\xFD\x7F\x76\xD1\x03\x07\xBB\x0C",
-               .rlen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = zeroed_string,
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 16,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .result = "\x33\xDE\x73\xBC\xA6\xCE\x4E\xA6"
-                         "\x61\xF4\xF5\x41\x03\x4A\xE3\x86"
-                         "\x5B\xC0\x73\xE0\x2B\x73\x68\xC9"
-                         "\x2D\x8C\x58\xC2\x90\x3D\xB0\x3E",
-               .rlen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 16,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = "\xCE\xB8\x98\x16\xC9\x87\x0F\x7E"
-                         "\x7F\x77\xF9\xE7\xF9\xCD\x1E\x16"
-                         "\x43\x8E\x76\x57\x3B\xB4\x05\xE8"
-                         "\xA9\x9B\xBF\x25\xE0\x4F\xC0\xED",
-               .rlen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .input  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .ilen   = 64,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .result = "\xCE\xB8\x98\x16\xC9\x87\x0F\x7E"
-                         "\x7F\x77\xF9\xE7\xF9\xCD\x1E\x16"
-                         "\x9C\xA4\x97\x83\x3F\x01\xA5\xF4"
-                         "\x43\x09\xE7\xB8\xE9\xD1\xD7\x02"
-                         "\x9B\xAB\x39\x18\xEB\x94\x34\x36"
-                         "\xE6\xC5\xC8\x9B\x00\x81\x9E\x49"
-                         "\x1D\x78\xE1\x48\xE3\xE9\xEA\x8E"
-                         "\x3A\x2B\x67\x5D\x35\x6A\x0F\xDB"
-                         "\x02\x73\xDD\xE7\x30\x4A\x30\x54"
-                         "\x1A\x9D\x09\xCA\xC8\x1C\x32\x5F",
-               .rlen   = 80,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",
-               .input  = "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff",
-               .ilen   = 192,
-               .assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"
-                         "\x89\xab\xcd\xef",
-               .alen   = 20,
-               .result = "\x64\x17\xDC\x24\x9D\x92\xBA\x5E"
-                         "\x7C\x64\x6D\x33\x46\x77\xAC\xB1"
-                         "\x5C\x9E\xE2\xC7\x27\x11\x3E\x95"
-                         "\x7D\xBE\x28\xC8\xC1\xCA\x5E\x8C"
-                         "\xB4\xE2\xDE\x9F\x53\x59\x26\xDB"
-                         "\x0C\xD4\xE4\x07\x9A\xE6\x3E\x01"
-                         "\x58\x0D\x3E\x3D\xD5\x21\xEB\x04"
-                         "\x06\x9D\x5F\xB9\x02\x49\x1A\x2B"
-                         "\xBA\xF0\x4E\x3B\x85\x50\x5B\x09"
-                         "\xFE\xEC\xFC\x54\xEC\x0C\xE2\x79"
-                         "\x8A\x2F\x5F\xD7\x05\x5D\xF1\x6D"
-                         "\x22\xEB\xD1\x09\x80\x3F\x5A\x70"
-                         "\xB2\xB9\xD3\x63\x99\xC2\x4D\x1B"
-                         "\x36\x12\x00\x89\xAA\x5D\x55\xDA"
-                         "\x1D\x5B\xD8\x3C\x5F\x09\xD2\xE6"
-                         "\x39\x41\x5C\xF0\xBE\x26\x4E\x5F"
-                         "\x2B\x50\x44\x52\xC2\x10\x7D\x38"
-                         "\x82\x64\x83\x0C\xAE\x49\xD0\xE5"
-                         "\x4F\xE5\x66\x4C\x58\x7A\xEE\x43"
-                         "\x3B\x51\xFE\xBA\x24\x8A\xFE\xDC"
-                         "\x19\x6D\x60\x66\x61\xF9\x9A\x3F"
-                         "\x75\xFC\x38\x53\x5B\xB5\xCD\x52"
-                         "\x4F\xE5\xE4\xC9\xFE\x10\xCB\x98"
-                         "\xF0\x06\x5B\x07\xAB\xBB\xF4\x0E"
-                         "\x2D\xC2\xDD\x5D\xDD\x22\x9A\xCC"
-                         "\x39\xAB\x63\xA5\x3D\x9C\x51\x8A",
-               .rlen   = 208,
-       }, { /* From draft-mcgrew-gcm-test-01 */
-               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
-                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
-                         "\x2E\x44\x3B",
-               .klen   = 19,
-               .iv     = "\x49\x56\xED\x7E\x3B\x24\x4C\xFE",
-               .input  = "\x45\x00\x00\x48\x69\x9A\x00\x00"
-                         "\x80\x11\x4D\xB7\xC0\xA8\x01\x02"
-                         "\xC0\xA8\x01\x01\x0A\x9B\xF1\x56"
-                         "\x38\xD3\x01\x00\x00\x01\x00\x00"
-                         "\x00\x00\x00\x00\x04\x5F\x73\x69"
-                         "\x70\x04\x5F\x75\x64\x70\x03\x73"
-                         "\x69\x70\x09\x63\x79\x62\x65\x72"
-                         "\x63\x69\x74\x79\x02\x64\x6B\x00"
-                         "\x00\x21\x00\x01\x01\x02\x02\x01",
-               .ilen   = 72,
-               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
-                         "\x00\x00\x00\x00\x49\x56\xED\x7E"
-                         "\x3B\x24\x4C\xFE",
-               .alen   = 20,
-               .result = "\x89\xBA\x3E\xEF\xE6\xD6\xCF\xDB"
-                         "\x83\x60\xF5\xBA\x3A\x56\x79\xE6"
-                         "\x7E\x0C\x53\xCF\x9E\x87\xE0\x4E"
-                         "\x1A\x26\x01\x24\xC7\x2E\x3D\xBF"
-                         "\x29\x2C\x91\xC1\xB8\xA8\xCF\xE0"
-                         "\x39\xF8\x53\x6D\x31\x22\x2B\xBF"
-                         "\x98\x81\xFC\x34\xEE\x85\x36\xCD"
-                         "\x26\xDB\x6C\x7A\x0C\x77\x8A\x35"
-                         "\x18\x85\x54\xB2\xBC\xDD\x3F\x43"
-                         "\x61\x06\x8A\xDF\x86\x3F\xB4\xAC"
-                         "\x97\xDC\xBD\xFD\x92\x10\xC5\xFF",
-               .rlen   = 88,
-       }, {
-               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
-                         "\xCA\xFE\xBA",
-               .klen   = 19,
-               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .input  = "\x45\x00\x00\x3E\x69\x8F\x00\x00"
-                         "\x80\x11\x4D\xCC\xC0\xA8\x01\x02"
-                         "\xC0\xA8\x01\x01\x0A\x98\x00\x35"
-                         "\x00\x2A\x23\x43\xB2\xD0\x01\x00"
-                         "\x00\x01\x00\x00\x00\x00\x00\x00"
-                         "\x03\x73\x69\x70\x09\x63\x79\x62"
-                         "\x65\x72\x63\x69\x74\x79\x02\x64"
-                         "\x6B\x00\x00\x01\x00\x01\x00\x01",
-               .ilen   = 64,
-               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
-                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .alen   = 16,
-               .result = "\x4B\xC2\x70\x60\x64\xD2\xF3\xC8"
-                         "\xE5\x26\x8A\xDE\xB8\x7E\x7D\x16"
-                         "\x56\xC7\xD2\x88\xBA\x8D\x58\xAF"
-                         "\xF5\x71\xB6\x37\x84\xA7\xB1\x99"
-                         "\x51\x5C\x0D\xA0\x27\xDE\xE7\x2D"
-                         "\xEF\x25\x88\x1F\x1D\x77\x11\xFF"
-                         "\xDB\xED\xEE\x56\x16\xC5\x5C\x9B"
-                         "\x00\x62\x1F\x68\x4E\x7C\xA0\x97"
-                         "\x10\x72\x7E\x53\x13\x3B\x68\xE4"
-                         "\x30\x99\x91\x79\x09\xEA\xFF\x6A",
-               .rlen   = 80,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x11\x22\x33",
-               .klen   = 35,
-               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .input  = "\x45\x00\x00\x30\x69\xA6\x40\x00"
-                         "\x80\x06\x26\x90\xC0\xA8\x01\x02"
-                         "\x93\x89\x15\x5E\x0A\x9E\x00\x8B"
-                         "\x2D\xC5\x7E\xE0\x00\x00\x00\x00"
-                         "\x70\x02\x40\x00\x20\xBF\x00\x00"
-                         "\x02\x04\x05\xB4\x01\x01\x04\x02"
-                         "\x01\x02\x02\x01",
-               .ilen   = 52,
-               .assoc  = "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"
-                         "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .alen   = 16,
-               .result = "\xD6\x31\x0D\x2B\x3D\x6F\xBD\x2F"
-                         "\x58\x41\x7E\xFF\x9A\x9E\x09\xB4"
-                         "\x1A\xF7\xF6\x42\x31\xCD\xBF\xAD"
-                         "\x27\x0E\x2C\xF2\xDB\x10\xDF\x55"
-                         "\x8F\x0D\xD7\xAC\x23\xBD\x42\x10"
-                         "\xD0\xB2\xAF\xD8\x37\xAC\x6B\x0B"
-                         "\x11\xD4\x0B\x12\xEC\xB4\xB1\x92"
-                         "\x23\xA6\x10\xB0\x26\xD6\xD9\x26"
-                         "\x5A\x48\x6A\x3E",
-               .rlen   = 68,
-       }, {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .input  = "\x45\x00\x00\x3C\x99\xC5\x00\x00"
-                         "\x80\x01\xCB\x7A\x40\x67\x93\x18"
-                         "\x01\x01\x01\x01\x08\x00\x07\x5C"
-                         "\x02\x00\x44\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x75\x76\x77\x61\x62\x63\x64\x65"
-                         "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .ilen   = 64,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .result = "\x6B\x9A\xCA\x57\x43\x91\xFC\x6F"
-                         "\x92\x51\x23\xA4\xC1\x5B\xF0\x10"
-                         "\xF3\x13\xF4\xF8\xA1\x9A\xB4\xDC"
-                         "\x89\xC8\xF8\x42\x62\x95\xB7\xCB"
-                         "\xB8\xF5\x0F\x1B\x2E\x94\xA2\xA7"
-                         "\xBF\xFB\x8A\x92\x13\x63\xD1\x3C"
-                         "\x08\xF5\xE8\xA6\xAA\xF6\x34\xF9"
-                         "\x42\x05\xAF\xB3\xE7\x9A\xFC\xEE"
-                         "\x36\x25\xC1\x10\x12\x1C\xCA\x82"
-                         "\xEA\xE6\x63\x5A\x57\x28\xA9\x9A",
-               .rlen   = 80,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x3C\x99\xC3\x00\x00"
-                         "\x80\x01\xCB\x7C\x40\x67\x93\x18"
-                         "\x01\x01\x01\x01\x08\x00\x08\x5C"
-                         "\x02\x00\x43\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x75\x76\x77\x61\x62\x63\x64\x65"
-                         "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .ilen   = 64,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .result = "\x6A\x6B\x45\x2B\x7C\x67\x52\xF6"
-                         "\x10\x60\x40\x62\x6B\x4F\x97\x8E"
-                         "\x0B\xB2\x22\x97\xCB\x21\xE0\x90"
-                         "\xA2\xE7\xD1\x41\x30\xE4\x4B\x1B"
-                         "\x79\x01\x58\x50\x01\x06\xE1\xE0"
-                         "\x2C\x83\x79\xD3\xDE\x46\x97\x1A"
-                         "\x30\xB8\xE5\xDF\xD7\x12\x56\x75"
-                         "\xD0\x95\xB7\xB8\x91\x42\xF7\xFD"
-                         "\x97\x57\xCA\xC1\x20\xD0\x86\xB9"
-                         "\x66\x9D\xB4\x2B\x96\x22\xAC\x67",
-               .rlen   = 80,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x1C\x42\xA2\x00\x00"
-                         "\x80\x01\x44\x1F\x40\x67\x93\xB6"
-                         "\xE0\x00\x00\x02\x0A\x00\xF5\xFF"
-                         "\x01\x02\x02\x01",
-               .ilen   = 28,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .result = "\x6A\x6B\x45\x0B\xA7\x06\x52\xF6"
-                         "\x10\x60\xCF\x01\x6B\x4F\x97\x20"
-                         "\xEA\xB3\x23\x94\xC9\x21\x1D\x33"
-                         "\xA1\xE5\x90\x40\x05\x37\x45\x70"
-                         "\xB5\xD6\x09\x0A\x23\x73\x33\xF9"
-                         "\x08\xB4\x22\xE4",
-               .rlen   = 44,
-       }, {
-               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
-                         "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\xCA\xFE\xBA",
-               .klen   = 27,
-               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .input  = "\x45\x00\x00\x28\xA4\xAD\x40\x00"
-                         "\x40\x06\x78\x80\x0A\x01\x03\x8F"
-                         "\x0A\x01\x06\x12\x80\x23\x06\xB8"
-                         "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"
-                         "\x50\x10\x16\xD0\x75\x68\x00\x01",
-               .ilen   = 40,
-               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
-                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .alen   = 16,
-               .result = "\x05\x22\x15\xD1\x52\x56\x85\x04"
-                         "\xA8\x5C\x5D\x6D\x7E\x6E\xF5\xFA"
-                         "\xEA\x16\x37\x50\xF3\xDF\x84\x3B"
-                         "\x2F\x32\x18\x57\x34\x2A\x8C\x23"
-                         "\x67\xDF\x6D\x35\x7B\x54\x0D\xFB"
-                         "\x34\xA5\x9F\x6C\x48\x30\x1E\x22"
-                         "\xFE\xB1\x22\x17\x17\x8A\xB9\x5B",
-               .rlen   = 56,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xDE\xCA\xF8",
-               .klen   = 19,
-               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .input  = "\x45\x00\x00\x49\x33\xBA\x00\x00"
-                         "\x7F\x11\x91\x06\xC3\xFB\x1D\x10"
-                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
-                         "\x00\x35\xDD\x7B\x80\x03\x02\xD5"
-                         "\x00\x00\x4E\x20\x00\x1E\x8C\x18"
-                         "\xD7\x5B\x81\xDC\x91\xBA\xA0\x47"
-                         "\x6B\x91\xB9\x24\xB2\x80\x38\x9D"
-                         "\x92\xC9\x63\xBA\xC0\x46\xEC\x95"
-                         "\x9B\x62\x66\xC0\x47\x22\xB1\x49"
-                         "\x23\x01\x01\x01",
-               .ilen   = 76,
-               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
-                         "\xCE\xFA\xCE\x74",
-               .alen   = 20,
-               .result = "\x92\xD0\x53\x79\x33\x38\xD5\xF3"
-                         "\x7D\xE4\x7A\x8E\x86\x03\xC9\x90"
-                         "\x96\x35\xAB\x9C\xFB\xE8\xA3\x76"
-                         "\xE9\xE9\xE2\xD1\x2E\x11\x0E\x00"
-                         "\xFA\xCE\xB5\x9E\x02\xA7\x7B\xEA"
-                         "\x71\x9A\x58\xFB\xA5\x8A\xE1\xB7"
-                         "\x9C\x39\x9D\xE3\xB5\x6E\x69\xE6"
-                         "\x63\xC9\xDB\x05\x69\x51\x12\xAD"
-                         "\x3E\x00\x32\x73\x86\xF2\xEE\xF5"
-                         "\x0F\xE8\x81\x7E\x84\xD3\xC0\x0D"
-                         "\x76\xD6\x55\xC6\xB4\xC2\x34\xC7"
-                         "\x12\x25\x0B\xF9",
-               .rlen   = 92,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x73\x61\x6C",
-               .klen   = 35,
-               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .input  = "\x45\x08\x00\x28\x73\x2C\x00\x00"
-                         "\x40\x06\xE9\xF9\x0A\x01\x06\x12"
-                         "\x0A\x01\x03\x8F\x06\xB8\x80\x23"
-                         "\xDD\x6B\xAF\xBE\xCB\x71\x26\x02"
-                         "\x50\x10\x1F\x64\x6D\x54\x00\x01",
-               .ilen   = 40,
-               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
-                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
-                         "\x69\x76\x65\x63",
-               .alen   = 20,
-               .result = "\xCC\x74\xB7\xD3\xB0\x38\x50\x42"
-                         "\x2C\x64\x87\x46\x1E\x34\x10\x05"
-                         "\x29\x6B\xBB\x36\xE9\x69\xAD\x92"
-                         "\x82\xA1\x10\x6A\xEB\x0F\xDC\x7D"
-                         "\x08\xBA\xF3\x91\xCA\xAA\x61\xDA"
-                         "\x62\xF4\x14\x61\x5C\x9D\xB5\xA7"
-                         "\xEE\xD7\xB9\x7E\x87\x99\x9B\x7D",
-               .rlen   = 56,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x49\x33\x3E\x00\x00"
-                         "\x7F\x11\x91\x82\xC3\xFB\x1D\x10"
-                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
-                         "\x00\x35\xCB\x45\x80\x03\x02\x5B"
-                         "\x00\x00\x01\xE0\x00\x1E\x8C\x18"
-                         "\xD6\x57\x59\xD5\x22\x84\xA0\x35"
-                         "\x2C\x71\x47\x5C\x88\x80\x39\x1C"
-                         "\x76\x4D\x6E\x5E\xE0\x49\x6B\x32"
-                         "\x5A\xE2\x70\xC0\x38\x99\x49\x39"
-                         "\x15\x01\x01\x01",
-               .ilen   = 76,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .result = "\x6A\x6B\x45\x5E\xD6\x9A\x52\xF6"
-                         "\xEF\x70\x1A\x9C\xE8\xD3\x19\x86"
-                         "\xC8\x02\xF0\xB0\x03\x09\xD9\x02"
-                         "\xA0\xD2\x59\x04\xD1\x85\x2A\x24"
-                         "\x1C\x67\x3E\xD8\x68\x72\x06\x94"
-                         "\x97\xBA\x4F\x76\x8D\xB0\x44\x5B"
-                         "\x69\xBF\xD5\xE2\x3D\xF1\x0B\x0C"
-                         "\xC0\xBF\xB1\x8F\x70\x09\x9E\xCE"
-                         "\xA5\xF2\x55\x58\x84\xFA\xF9\xB5"
-                         "\x23\xF4\x84\x40\x74\x14\x8A\x6B"
-                         "\xDB\xD7\x67\xED\xA4\x93\xF3\x47"
-                         "\xCC\xF7\x46\x6F",
-               .rlen   = 92,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x73\x61\x6C",
-               .klen   = 35,
-               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .input  = "\x63\x69\x73\x63\x6F\x01\x72\x75"
-                         "\x6C\x65\x73\x01\x74\x68\x65\x01"
-                         "\x6E\x65\x74\x77\x65\x01\x64\x65"
-                         "\x66\x69\x6E\x65\x01\x74\x68\x65"
-                         "\x74\x65\x63\x68\x6E\x6F\x6C\x6F"
-                         "\x67\x69\x65\x73\x01\x74\x68\x61"
-                         "\x74\x77\x69\x6C\x6C\x01\x64\x65"
-                         "\x66\x69\x6E\x65\x74\x6F\x6D\x6F"
-                         "\x72\x72\x6F\x77\x01\x02\x02\x01",
-               .ilen   = 72,
-               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
-                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
-                         "\x69\x76\x65\x63",
-               .alen   = 20,
-               .result = "\xEA\x15\xC4\x98\xAC\x15\x22\x37"
-                         "\x00\x07\x1D\xBE\x60\x5D\x73\x16"
-                         "\x4D\x0F\xCC\xCE\x8A\xD0\x49\xD4"
-                         "\x39\xA3\xD1\xB1\x21\x0A\x92\x1A"
-                         "\x2C\xCF\x8F\x9D\xC9\x91\x0D\xB4"
-                         "\x15\xFC\xBC\xA5\xC5\xBF\x54\xE5"
-                         "\x1C\xC7\x32\x41\x07\x7B\x2C\xB6"
-                         "\x5C\x23\x7C\x93\xEA\xEF\x23\x1C"
-                         "\x73\xF4\xE7\x12\x84\x4C\x37\x0A"
-                         "\x4A\x8F\x06\x37\x48\xF9\xF9\x05"
-                         "\x55\x13\x40\xC3\xD5\x55\x3A\x3D",
-               .rlen   = 88,
-       }, {
-               .key    = "\x7D\x77\x3D\x00\xC1\x44\xC5\x25"
-                         "\xAC\x61\x9D\x18\xC8\x4A\x3F\x47"
-                         "\xD9\x66\x42",
-               .klen   = 19,
-               .iv     = "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .input  = "\x01\x02\x02\x01",
-               .ilen   = 4,
-               .assoc  = "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"
-                         "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .alen   = 16,
-               .result = "\x4C\x72\x63\x30\x2F\xE6\x56\xDD"
-                         "\xD0\xD8\x60\x9D\x8B\xEF\x85\x90"
-                         "\xF7\x61\x24\x62",
-               .rlen   = 20,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xDE\xCA\xF8",
-               .klen   = 19,
-               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .input  = "\x74\x6F\x01\x62\x65\x01\x6F\x72"
-                         "\x01\x6E\x6F\x74\x01\x74\x6F\x01"
-                         "\x62\x65\x00\x01",
-               .ilen   = 20,
-               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
-                         "\xCE\xFA\xCE\x74",
-               .alen   = 20,
-               .result = "\xA3\xBF\x52\x52\x65\x83\xBA\x81"
-                         "\x03\x9B\x84\xFC\x44\x8C\xBB\x81"
-                         "\x36\xE1\x78\xBB\xA5\x49\x3A\xD0"
-                         "\xF0\x6B\x21\xAF\x98\xC0\x34\xDC"
-                         "\x17\x17\x65\xAD",
-               .rlen   = 36,
-       }, {
-               .key    = "\x6C\x65\x67\x61\x6C\x69\x7A\x65"
-                         "\x6D\x61\x72\x69\x6A\x75\x61\x6E"
-                         "\x61\x61\x6E\x64\x64\x6F\x69\x74"
-                         "\x62\x65\x66\x6F\x72\x65\x69\x61"
-                         "\x74\x75\x72",
-               .klen   = 35,
-               .iv     = "\x33\x30\x21\x69\x67\x65\x74\x6D",
-               .input  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
-                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
-                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .ilen   = 52,
-               .assoc  = "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"
-                         "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"
-                         "\x67\x65\x74\x6D",
-               .alen   = 20,
-               .result = "\x96\xFD\x86\xF8\xD1\x98\xFF\x10"
-                         "\xAB\x8C\xDA\x8A\x5A\x08\x38\x1A"
-                         "\x48\x59\x80\x18\x1A\x18\x1A\x04"
-                         "\xC9\x0D\xE3\xE7\x0E\xA4\x0B\x75"
-                         "\x92\x9C\x52\x5C\x0B\xFB\xF8\xAF"
-                         "\x16\xC3\x35\xA8\xE7\xCE\x84\x04"
-                         "\xEB\x40\x6B\x7A\x8E\x75\xBB\x42"
-                         "\xE0\x63\x4B\x21\x44\xA2\x2B\x2B"
-                         "\x39\xDB\xC8\xDC",
-               .rlen   = 68,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .input  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
-                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
-                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .ilen   = 52,
-               .assoc  = "\x3F\x7E\xF6\x42\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .result = "\x6A\x6B\x45\x27\x3F\x9E\x52\xF6"
-                         "\x10\x60\x54\x25\xEB\x80\x04\x93"
-                         "\xCA\x1B\x23\x97\xCB\x21\x2E\x01"
-                         "\xA2\xE7\x95\x41\x30\xE4\x4B\x1B"
-                         "\x79\x01\x58\x50\x01\x06\xE1\xE0"
-                         "\x2C\x83\x79\xD3\xDE\x46\x97\x1A"
-                         "\x44\xCC\x90\xBF\x00\x94\x94\x92"
-                         "\x20\x17\x0C\x1B\x55\xDE\x7E\x68"
-                         "\xF4\x95\x5D\x4F",
-               .rlen   = 68,
-       }, {
-               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
-                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
-                         "\x22\x43\x3C",
-               .klen   = 19,
-               .iv     = "\x48\x55\xEC\x7D\x3A\x23\x4B\xFD",
-               .input  = "\x08\x00\xC6\xCD\x02\x00\x07\x00"
-                         "\x61\x62\x63\x64\x65\x66\x67\x68"
-                         "\x69\x6A\x6B\x6C\x6D\x6E\x6F\x70"
-                         "\x71\x72\x73\x74\x01\x02\x02\x01",
-               .ilen   = 32,
-               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
-                         "\x00\x00\x00\x07\x48\x55\xEC\x7D"
-                         "\x3A\x23\x4B\xFD",
-               .alen   = 20,
-               .result = "\x67\xE9\x28\xB3\x1C\xA4\x6D\x02"
-                         "\xF0\xB5\x37\xB6\x6B\x2F\xF5\x4F"
-                         "\xF8\xA3\x4C\x53\xB8\x12\x09\xBF"
-                         "\x58\x7D\xCF\x29\xA3\x41\x68\x6B"
-                         "\xCE\xE8\x79\x85\x3C\xB0\x3A\x8F"
-                         "\x16\xB0\xA1\x26\xC9\xBC\xBC\xA6",
-               .rlen   = 48,
-       }
-};
-
-static const struct aead_testvec aes_ccm_rfc4309_dec_tv_template[]     = {
-       { /* Generated using Crypto++ */
-               .key    = zeroed_string,
-               .klen   = 19,
-               .iv     = zeroed_string,
-               .result = zeroed_string,
-               .rlen   = 16,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .input  = "\x2E\x9A\xCA\x6B\xDA\x54\xFC\x6F"
-                         "\x12\x50\xE8\xDE\x81\x3C\x63\x08"
-                         "\x1A\x22\xBA\x75\xEE\xD4\xD5\xB5"
-                         "\x27\x50\x01\xAC\x03\x33\x39\xFB",
-               .ilen   = 32,
-       },{
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .result = zeroed_string,
-               .rlen   = 16,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .input  = "\xCF\xB9\x99\x17\xC8\x86\x0E\x7F"
-                         "\x7E\x76\xF8\xE6\xF8\xCC\x1F\x17"
-                         "\x6A\xE0\x53\x9F\x4B\x73\x7E\xDA"
-                         "\x08\x09\x4E\xC4\x1E\xAD\xC6\xB0",
-               .ilen   = 32,
-
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = zeroed_string,
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 16,
-               .assoc  = zeroed_string,
-               .alen   = 16,
-               .input  = "\x33\xDE\x73\xBC\xA6\xCE\x4E\xA6"
-                         "\x61\xF4\xF5\x41\x03\x4A\xE3\x86"
-                         "\xA1\xE2\xC2\x42\x2B\x81\x70\x40"
-                         "\xFD\x7F\x76\xD1\x03\x07\xBB\x0C",
-               .ilen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = zeroed_string,
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 16,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x33\xDE\x73\xBC\xA6\xCE\x4E\xA6"
-                         "\x61\xF4\xF5\x41\x03\x4A\xE3\x86"
-                         "\x5B\xC0\x73\xE0\x2B\x73\x68\xC9"
-                         "\x2D\x8C\x58\xC2\x90\x3D\xB0\x3E",
-               .ilen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 16,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .input  = "\xCE\xB8\x98\x16\xC9\x87\x0F\x7E"
-                         "\x7F\x77\xF9\xE7\xF9\xCD\x1E\x16"
-                         "\x43\x8E\x76\x57\x3B\xB4\x05\xE8"
-                         "\xA9\x9B\xBF\x25\xE0\x4F\xC0\xED",
-               .ilen   = 32,
-       }, {
-               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
-                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .result = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x01\x01\x01\x01\x01\x01\x01\x01",
-               .rlen   = 64,
-               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x01",
-               .alen   = 16,
-               .input  = "\xCE\xB8\x98\x16\xC9\x87\x0F\x7E"
-                         "\x7F\x77\xF9\xE7\xF9\xCD\x1E\x16"
-                         "\x9C\xA4\x97\x83\x3F\x01\xA5\xF4"
-                         "\x43\x09\xE7\xB8\xE9\xD1\xD7\x02"
-                         "\x9B\xAB\x39\x18\xEB\x94\x34\x36"
-                         "\xE6\xC5\xC8\x9B\x00\x81\x9E\x49"
-                         "\x1D\x78\xE1\x48\xE3\xE9\xEA\x8E"
-                         "\x3A\x2B\x67\x5D\x35\x6A\x0F\xDB"
-                         "\x02\x73\xDD\xE7\x30\x4A\x30\x54"
-                         "\x1A\x9D\x09\xCA\xC8\x1C\x32\x5F",
-               .ilen   = 80,
-       }, {
-               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
-                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",
-               .result = "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff"
-                         "\xff\xff\xff\xff\xff\xff\xff\xff",
-               .rlen   = 192,
-               .assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-                         "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"
-                         "\x89\xab\xcd\xef",
-               .alen   = 20,
-               .input  = "\x64\x17\xDC\x24\x9D\x92\xBA\x5E"
-                         "\x7C\x64\x6D\x33\x46\x77\xAC\xB1"
-                         "\x5C\x9E\xE2\xC7\x27\x11\x3E\x95"
-                         "\x7D\xBE\x28\xC8\xC1\xCA\x5E\x8C"
-                         "\xB4\xE2\xDE\x9F\x53\x59\x26\xDB"
-                         "\x0C\xD4\xE4\x07\x9A\xE6\x3E\x01"
-                         "\x58\x0D\x3E\x3D\xD5\x21\xEB\x04"
-                         "\x06\x9D\x5F\xB9\x02\x49\x1A\x2B"
-                         "\xBA\xF0\x4E\x3B\x85\x50\x5B\x09"
-                         "\xFE\xEC\xFC\x54\xEC\x0C\xE2\x79"
-                         "\x8A\x2F\x5F\xD7\x05\x5D\xF1\x6D"
-                         "\x22\xEB\xD1\x09\x80\x3F\x5A\x70"
-                         "\xB2\xB9\xD3\x63\x99\xC2\x4D\x1B"
-                         "\x36\x12\x00\x89\xAA\x5D\x55\xDA"
-                         "\x1D\x5B\xD8\x3C\x5F\x09\xD2\xE6"
-                         "\x39\x41\x5C\xF0\xBE\x26\x4E\x5F"
-                         "\x2B\x50\x44\x52\xC2\x10\x7D\x38"
-                         "\x82\x64\x83\x0C\xAE\x49\xD0\xE5"
-                         "\x4F\xE5\x66\x4C\x58\x7A\xEE\x43"
-                         "\x3B\x51\xFE\xBA\x24\x8A\xFE\xDC"
-                         "\x19\x6D\x60\x66\x61\xF9\x9A\x3F"
-                         "\x75\xFC\x38\x53\x5B\xB5\xCD\x52"
-                         "\x4F\xE5\xE4\xC9\xFE\x10\xCB\x98"
-                         "\xF0\x06\x5B\x07\xAB\xBB\xF4\x0E"
-                         "\x2D\xC2\xDD\x5D\xDD\x22\x9A\xCC"
-                         "\x39\xAB\x63\xA5\x3D\x9C\x51\x8A",
-               .ilen   = 208,
-       }, { /* From draft-mcgrew-gcm-test-01 */
-               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
-                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
-                         "\x2E\x44\x3B",
-               .klen   = 19,
-               .iv     = "\x49\x56\xED\x7E\x3B\x24\x4C\xFE",
-               .result = "\x45\x00\x00\x48\x69\x9A\x00\x00"
-                         "\x80\x11\x4D\xB7\xC0\xA8\x01\x02"
-                         "\xC0\xA8\x01\x01\x0A\x9B\xF1\x56"
-                         "\x38\xD3\x01\x00\x00\x01\x00\x00"
-                         "\x00\x00\x00\x00\x04\x5F\x73\x69"
-                         "\x70\x04\x5F\x75\x64\x70\x03\x73"
-                         "\x69\x70\x09\x63\x79\x62\x65\x72"
-                         "\x63\x69\x74\x79\x02\x64\x6B\x00"
-                         "\x00\x21\x00\x01\x01\x02\x02\x01",
-               .rlen   = 72,
-               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
-                         "\x00\x00\x00\x00\x49\x56\xED\x7E"
-                         "\x3B\x24\x4C\xFE",
-               .alen   = 20,
-               .input  = "\x89\xBA\x3E\xEF\xE6\xD6\xCF\xDB"
-                         "\x83\x60\xF5\xBA\x3A\x56\x79\xE6"
-                         "\x7E\x0C\x53\xCF\x9E\x87\xE0\x4E"
-                         "\x1A\x26\x01\x24\xC7\x2E\x3D\xBF"
-                         "\x29\x2C\x91\xC1\xB8\xA8\xCF\xE0"
-                         "\x39\xF8\x53\x6D\x31\x22\x2B\xBF"
-                         "\x98\x81\xFC\x34\xEE\x85\x36\xCD"
-                         "\x26\xDB\x6C\x7A\x0C\x77\x8A\x35"
-                         "\x18\x85\x54\xB2\xBC\xDD\x3F\x43"
-                         "\x61\x06\x8A\xDF\x86\x3F\xB4\xAC"
-                         "\x97\xDC\xBD\xFD\x92\x10\xC5\xFF",
-               .ilen   = 88,
-       }, {
-               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
-                         "\xCA\xFE\xBA",
-               .klen   = 19,
-               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .result = "\x45\x00\x00\x3E\x69\x8F\x00\x00"
-                         "\x80\x11\x4D\xCC\xC0\xA8\x01\x02"
-                         "\xC0\xA8\x01\x01\x0A\x98\x00\x35"
-                         "\x00\x2A\x23\x43\xB2\xD0\x01\x00"
-                         "\x00\x01\x00\x00\x00\x00\x00\x00"
-                         "\x03\x73\x69\x70\x09\x63\x79\x62"
-                         "\x65\x72\x63\x69\x74\x79\x02\x64"
-                         "\x6B\x00\x00\x01\x00\x01\x00\x01",
-               .rlen   = 64,
-               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
-                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .alen   = 16,
-               .input  = "\x4B\xC2\x70\x60\x64\xD2\xF3\xC8"
-                         "\xE5\x26\x8A\xDE\xB8\x7E\x7D\x16"
-                         "\x56\xC7\xD2\x88\xBA\x8D\x58\xAF"
-                         "\xF5\x71\xB6\x37\x84\xA7\xB1\x99"
-                         "\x51\x5C\x0D\xA0\x27\xDE\xE7\x2D"
-                         "\xEF\x25\x88\x1F\x1D\x77\x11\xFF"
-                         "\xDB\xED\xEE\x56\x16\xC5\x5C\x9B"
-                         "\x00\x62\x1F\x68\x4E\x7C\xA0\x97"
-                         "\x10\x72\x7E\x53\x13\x3B\x68\xE4"
-                         "\x30\x99\x91\x79\x09\xEA\xFF\x6A",
-               .ilen   = 80,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x11\x22\x33",
-               .klen   = 35,
-               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .result = "\x45\x00\x00\x30\x69\xA6\x40\x00"
-                         "\x80\x06\x26\x90\xC0\xA8\x01\x02"
-                         "\x93\x89\x15\x5E\x0A\x9E\x00\x8B"
-                         "\x2D\xC5\x7E\xE0\x00\x00\x00\x00"
-                         "\x70\x02\x40\x00\x20\xBF\x00\x00"
-                         "\x02\x04\x05\xB4\x01\x01\x04\x02"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-               .assoc  = "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"
-                         "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .alen   = 16,
-               .input  = "\xD6\x31\x0D\x2B\x3D\x6F\xBD\x2F"
-                         "\x58\x41\x7E\xFF\x9A\x9E\x09\xB4"
-                         "\x1A\xF7\xF6\x42\x31\xCD\xBF\xAD"
-                         "\x27\x0E\x2C\xF2\xDB\x10\xDF\x55"
-                         "\x8F\x0D\xD7\xAC\x23\xBD\x42\x10"
-                         "\xD0\xB2\xAF\xD8\x37\xAC\x6B\x0B"
-                         "\x11\xD4\x0B\x12\xEC\xB4\xB1\x92"
-                         "\x23\xA6\x10\xB0\x26\xD6\xD9\x26"
-                         "\x5A\x48\x6A\x3E",
-               .ilen   = 68,
-       }, {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00",
-               .klen   = 19,
-               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .result = "\x45\x00\x00\x3C\x99\xC5\x00\x00"
-                         "\x80\x01\xCB\x7A\x40\x67\x93\x18"
-                         "\x01\x01\x01\x01\x08\x00\x07\x5C"
-                         "\x02\x00\x44\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x75\x76\x77\x61\x62\x63\x64\x65"
-                         "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .rlen   = 64,
-               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x01"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .alen   = 16,
-               .input  = "\x6B\x9A\xCA\x57\x43\x91\xFC\x6F"
-                         "\x92\x51\x23\xA4\xC1\x5B\xF0\x10"
-                         "\xF3\x13\xF4\xF8\xA1\x9A\xB4\xDC"
-                         "\x89\xC8\xF8\x42\x62\x95\xB7\xCB"
-                         "\xB8\xF5\x0F\x1B\x2E\x94\xA2\xA7"
-                         "\xBF\xFB\x8A\x92\x13\x63\xD1\x3C"
-                         "\x08\xF5\xE8\xA6\xAA\xF6\x34\xF9"
-                         "\x42\x05\xAF\xB3\xE7\x9A\xFC\xEE"
-                         "\x36\x25\xC1\x10\x12\x1C\xCA\x82"
-                         "\xEA\xE6\x63\x5A\x57\x28\xA9\x9A",
-               .ilen   = 80,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x3C\x99\xC3\x00\x00"
-                         "\x80\x01\xCB\x7C\x40\x67\x93\x18"
-                         "\x01\x01\x01\x01\x08\x00\x08\x5C"
-                         "\x02\x00\x43\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x75\x76\x77\x61\x62\x63\x64\x65"
-                         "\x66\x67\x68\x69\x01\x02\x02\x01",
-               .rlen   = 64,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\x6A\x6B\x45\x2B\x7C\x67\x52\xF6"
-                         "\x10\x60\x40\x62\x6B\x4F\x97\x8E"
-                         "\x0B\xB2\x22\x97\xCB\x21\xE0\x90"
-                         "\xA2\xE7\xD1\x41\x30\xE4\x4B\x1B"
-                         "\x79\x01\x58\x50\x01\x06\xE1\xE0"
-                         "\x2C\x83\x79\xD3\xDE\x46\x97\x1A"
-                         "\x30\xB8\xE5\xDF\xD7\x12\x56\x75"
-                         "\xD0\x95\xB7\xB8\x91\x42\xF7\xFD"
-                         "\x97\x57\xCA\xC1\x20\xD0\x86\xB9"
-                         "\x66\x9D\xB4\x2B\x96\x22\xAC\x67",
-               .ilen   = 80,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x1C\x42\xA2\x00\x00"
-                         "\x80\x01\x44\x1F\x40\x67\x93\xB6"
-                         "\xE0\x00\x00\x02\x0A\x00\xF5\xFF"
-                         "\x01\x02\x02\x01",
-               .rlen   = 28,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\x6A\x6B\x45\x0B\xA7\x06\x52\xF6"
-                         "\x10\x60\xCF\x01\x6B\x4F\x97\x20"
-                         "\xEA\xB3\x23\x94\xC9\x21\x1D\x33"
-                         "\xA1\xE5\x90\x40\x05\x37\x45\x70"
-                         "\xB5\xD6\x09\x0A\x23\x73\x33\xF9"
-                         "\x08\xB4\x22\xE4",
-               .ilen   = 44,
-       }, {
-               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
-                         "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
-                         "\xCA\xFE\xBA",
-               .klen   = 27,
-               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .result = "\x45\x00\x00\x28\xA4\xAD\x40\x00"
-                         "\x40\x06\x78\x80\x0A\x01\x03\x8F"
-                         "\x0A\x01\x06\x12\x80\x23\x06\xB8"
-                         "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"
-                         "\x50\x10\x16\xD0\x75\x68\x00\x01",
-               .rlen   = 40,
-               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
-                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
-               .alen   = 16,
-               .input  = "\x05\x22\x15\xD1\x52\x56\x85\x04"
-                         "\xA8\x5C\x5D\x6D\x7E\x6E\xF5\xFA"
-                         "\xEA\x16\x37\x50\xF3\xDF\x84\x3B"
-                         "\x2F\x32\x18\x57\x34\x2A\x8C\x23"
-                         "\x67\xDF\x6D\x35\x7B\x54\x0D\xFB"
-                         "\x34\xA5\x9F\x6C\x48\x30\x1E\x22"
-                         "\xFE\xB1\x22\x17\x17\x8A\xB9\x5B",
-               .ilen   = 56,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xDE\xCA\xF8",
-               .klen   = 19,
-               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .result = "\x45\x00\x00\x49\x33\xBA\x00\x00"
-                         "\x7F\x11\x91\x06\xC3\xFB\x1D\x10"
-                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
-                         "\x00\x35\xDD\x7B\x80\x03\x02\xD5"
-                         "\x00\x00\x4E\x20\x00\x1E\x8C\x18"
-                         "\xD7\x5B\x81\xDC\x91\xBA\xA0\x47"
-                         "\x6B\x91\xB9\x24\xB2\x80\x38\x9D"
-                         "\x92\xC9\x63\xBA\xC0\x46\xEC\x95"
-                         "\x9B\x62\x66\xC0\x47\x22\xB1\x49"
-                         "\x23\x01\x01\x01",
-               .rlen   = 76,
-               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
-                         "\xCE\xFA\xCE\x74",
-               .alen   = 20,
-               .input  = "\x92\xD0\x53\x79\x33\x38\xD5\xF3"
-                         "\x7D\xE4\x7A\x8E\x86\x03\xC9\x90"
-                         "\x96\x35\xAB\x9C\xFB\xE8\xA3\x76"
-                         "\xE9\xE9\xE2\xD1\x2E\x11\x0E\x00"
-                         "\xFA\xCE\xB5\x9E\x02\xA7\x7B\xEA"
-                         "\x71\x9A\x58\xFB\xA5\x8A\xE1\xB7"
-                         "\x9C\x39\x9D\xE3\xB5\x6E\x69\xE6"
-                         "\x63\xC9\xDB\x05\x69\x51\x12\xAD"
-                         "\x3E\x00\x32\x73\x86\xF2\xEE\xF5"
-                         "\x0F\xE8\x81\x7E\x84\xD3\xC0\x0D"
-                         "\x76\xD6\x55\xC6\xB4\xC2\x34\xC7"
-                         "\x12\x25\x0B\xF9",
-               .ilen   = 92,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x73\x61\x6C",
-               .klen   = 35,
-               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .result = "\x45\x08\x00\x28\x73\x2C\x00\x00"
-                         "\x40\x06\xE9\xF9\x0A\x01\x06\x12"
-                         "\x0A\x01\x03\x8F\x06\xB8\x80\x23"
-                         "\xDD\x6B\xAF\xBE\xCB\x71\x26\x02"
-                         "\x50\x10\x1F\x64\x6D\x54\x00\x01",
-               .rlen   = 40,
-               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
-                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
-                         "\x69\x76\x65\x63",
-               .alen   = 20,
-               .input  = "\xCC\x74\xB7\xD3\xB0\x38\x50\x42"
-                         "\x2C\x64\x87\x46\x1E\x34\x10\x05"
-                         "\x29\x6B\xBB\x36\xE9\x69\xAD\x92"
-                         "\x82\xA1\x10\x6A\xEB\x0F\xDC\x7D"
-                         "\x08\xBA\xF3\x91\xCA\xAA\x61\xDA"
-                         "\x62\xF4\x14\x61\x5C\x9D\xB5\xA7"
-                         "\xEE\xD7\xB9\x7E\x87\x99\x9B\x7D",
-               .ilen   = 56,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x49\x33\x3E\x00\x00"
-                         "\x7F\x11\x91\x82\xC3\xFB\x1D\x10"
-                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
-                         "\x00\x35\xCB\x45\x80\x03\x02\x5B"
-                         "\x00\x00\x01\xE0\x00\x1E\x8C\x18"
-                         "\xD6\x57\x59\xD5\x22\x84\xA0\x35"
-                         "\x2C\x71\x47\x5C\x88\x80\x39\x1C"
-                         "\x76\x4D\x6E\x5E\xE0\x49\x6B\x32"
-                         "\x5A\xE2\x70\xC0\x38\x99\x49\x39"
-                         "\x15\x01\x01\x01",
-               .rlen   = 76,
-               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\x6A\x6B\x45\x5E\xD6\x9A\x52\xF6"
-                         "\xEF\x70\x1A\x9C\xE8\xD3\x19\x86"
-                         "\xC8\x02\xF0\xB0\x03\x09\xD9\x02"
-                         "\xA0\xD2\x59\x04\xD1\x85\x2A\x24"
-                         "\x1C\x67\x3E\xD8\x68\x72\x06\x94"
-                         "\x97\xBA\x4F\x76\x8D\xB0\x44\x5B"
-                         "\x69\xBF\xD5\xE2\x3D\xF1\x0B\x0C"
-                         "\xC0\xBF\xB1\x8F\x70\x09\x9E\xCE"
-                         "\xA5\xF2\x55\x58\x84\xFA\xF9\xB5"
-                         "\x23\xF4\x84\x40\x74\x14\x8A\x6B"
-                         "\xDB\xD7\x67\xED\xA4\x93\xF3\x47"
-                         "\xCC\xF7\x46\x6F",
-               .ilen   = 92,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\x73\x61\x6C",
-               .klen   = 35,
-               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
-               .result = "\x63\x69\x73\x63\x6F\x01\x72\x75"
-                         "\x6C\x65\x73\x01\x74\x68\x65\x01"
-                         "\x6E\x65\x74\x77\x65\x01\x64\x65"
-                         "\x66\x69\x6E\x65\x01\x74\x68\x65"
-                         "\x74\x65\x63\x68\x6E\x6F\x6C\x6F"
-                         "\x67\x69\x65\x73\x01\x74\x68\x61"
-                         "\x74\x77\x69\x6C\x6C\x01\x64\x65"
-                         "\x66\x69\x6E\x65\x74\x6F\x6D\x6F"
-                         "\x72\x72\x6F\x77\x01\x02\x02\x01",
-               .rlen   = 72,
-               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
-                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
-                         "\x69\x76\x65\x63",
-               .alen   = 20,
-               .input  = "\xEA\x15\xC4\x98\xAC\x15\x22\x37"
-                         "\x00\x07\x1D\xBE\x60\x5D\x73\x16"
-                         "\x4D\x0F\xCC\xCE\x8A\xD0\x49\xD4"
-                         "\x39\xA3\xD1\xB1\x21\x0A\x92\x1A"
-                         "\x2C\xCF\x8F\x9D\xC9\x91\x0D\xB4"
-                         "\x15\xFC\xBC\xA5\xC5\xBF\x54\xE5"
-                         "\x1C\xC7\x32\x41\x07\x7B\x2C\xB6"
-                         "\x5C\x23\x7C\x93\xEA\xEF\x23\x1C"
-                         "\x73\xF4\xE7\x12\x84\x4C\x37\x0A"
-                         "\x4A\x8F\x06\x37\x48\xF9\xF9\x05"
-                         "\x55\x13\x40\xC3\xD5\x55\x3A\x3D",
-               .ilen   = 88,
-       }, {
-               .key    = "\x7D\x77\x3D\x00\xC1\x44\xC5\x25"
-                         "\xAC\x61\x9D\x18\xC8\x4A\x3F\x47"
-                         "\xD9\x66\x42",
-               .klen   = 19,
-               .iv     = "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .result = "\x01\x02\x02\x01",
-               .rlen   = 4,
-               .assoc  = "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"
-                         "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
-               .alen   = 16,
-               .input  = "\x4C\x72\x63\x30\x2F\xE6\x56\xDD"
-                         "\xD0\xD8\x60\x9D\x8B\xEF\x85\x90"
-                         "\xF7\x61\x24\x62",
-               .ilen   = 20,
-       }, {
-               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
-                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
-                         "\xDE\xCA\xF8",
-               .klen   = 19,
-               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
-               .result = "\x74\x6F\x01\x62\x65\x01\x6F\x72"
-                         "\x01\x6E\x6F\x74\x01\x74\x6F\x01"
-                         "\x62\x65\x00\x01",
-               .rlen   = 20,
-               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
-                         "\xCE\xFA\xCE\x74",
-               .alen   = 20,
-               .input  = "\xA3\xBF\x52\x52\x65\x83\xBA\x81"
-                         "\x03\x9B\x84\xFC\x44\x8C\xBB\x81"
-                         "\x36\xE1\x78\xBB\xA5\x49\x3A\xD0"
-                         "\xF0\x6B\x21\xAF\x98\xC0\x34\xDC"
-                         "\x17\x17\x65\xAD",
-               .ilen   = 36,
-       }, {
-               .key    = "\x6C\x65\x67\x61\x6C\x69\x7A\x65"
-                         "\x6D\x61\x72\x69\x6A\x75\x61\x6E"
-                         "\x61\x61\x6E\x64\x64\x6F\x69\x74"
-                         "\x62\x65\x66\x6F\x72\x65\x69\x61"
-                         "\x74\x75\x72",
-               .klen   = 35,
-               .iv     = "\x33\x30\x21\x69\x67\x65\x74\x6D",
-               .result = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
-                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
-                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-               .assoc  = "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"
-                         "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"
-                         "\x67\x65\x74\x6D",
-               .alen   = 20,
-               .input  = "\x96\xFD\x86\xF8\xD1\x98\xFF\x10"
-                         "\xAB\x8C\xDA\x8A\x5A\x08\x38\x1A"
-                         "\x48\x59\x80\x18\x1A\x18\x1A\x04"
-                         "\xC9\x0D\xE3\xE7\x0E\xA4\x0B\x75"
-                         "\x92\x9C\x52\x5C\x0B\xFB\xF8\xAF"
-                         "\x16\xC3\x35\xA8\xE7\xCE\x84\x04"
-                         "\xEB\x40\x6B\x7A\x8E\x75\xBB\x42"
-                         "\xE0\x63\x4B\x21\x44\xA2\x2B\x2B"
-                         "\x39\xDB\xC8\xDC",
-               .ilen   = 68,
-       }, {
-               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
-                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
-                         "\x57\x69\x0E",
-               .klen   = 19,
-               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
-               .result = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
-                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
-                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
-                         "\x02\x00\x07\x00\x61\x62\x63\x64"
-                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
-                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
-                         "\x01\x02\x02\x01",
-               .rlen   = 52,
-               .assoc  = "\x3F\x7E\xF6\x42\x10\x10\x10\x10"
-                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
-                         "\xA2\xFC\xA1\xA3",
-               .alen   = 20,
-               .input  = "\x6A\x6B\x45\x27\x3F\x9E\x52\xF6"
-                         "\x10\x60\x54\x25\xEB\x80\x04\x93"
-                         "\xCA\x1B\x23\x97\xCB\x21\x2E\x01"
-                         "\xA2\xE7\x95\x41\x30\xE4\x4B\x1B"
-                         "\x79\x01\x58\x50\x01\x06\xE1\xE0"
-                         "\x2C\x83\x79\xD3\xDE\x46\x97\x1A"
-                         "\x44\xCC\x90\xBF\x00\x94\x94\x92"
-                         "\x20\x17\x0C\x1B\x55\xDE\x7E\x68"
-                         "\xF4\x95\x5D\x4F",
-               .ilen   = 68,
-       }, {
-               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
-                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
-                         "\x22\x43\x3C",
-               .klen   = 19,
-               .iv     = "\x48\x55\xEC\x7D\x3A\x23\x4B\xFD",
-               .result = "\x08\x00\xC6\xCD\x02\x00\x07\x00"
-                         "\x61\x62\x63\x64\x65\x66\x67\x68"
-                         "\x69\x6A\x6B\x6C\x6D\x6E\x6F\x70"
-                         "\x71\x72\x73\x74\x01\x02\x02\x01",
-               .rlen   = 32,
-               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
-                         "\x00\x00\x00\x07\x48\x55\xEC\x7D"
-                         "\x3A\x23\x4B\xFD",
-               .alen   = 20,
-               .input  = "\x67\xE9\x28\xB3\x1C\xA4\x6D\x02"
-                         "\xF0\xB5\x37\xB6\x6B\x2F\xF5\x4F"
-                         "\xF8\xA3\x4C\x53\xB8\x12\x09\xBF"
-                         "\x58\x7D\xCF\x29\xA3\x41\x68\x6B"
-                         "\xCE\xE8\x79\x85\x3C\xB0\x3A\x8F"
-                         "\x16\xB0\xA1\x26\xC9\xBC\xBC\xA6",
-               .ilen   = 48,
-       }
-};
-
-/*
- * ChaCha20-Poly1305 AEAD test vectors from RFC7539 2.8.2./A.5.
- */
-static const struct aead_testvec rfc7539_enc_tv_template[] = {
-       {
-               .key    = "\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",
-               .klen   = 32,
-               .iv     = "\x07\x00\x00\x00\x40\x41\x42\x43"
-                         "\x44\x45\x46\x47",
-               .assoc  = "\x50\x51\x52\x53\xc0\xc1\xc2\xc3"
-                         "\xc4\xc5\xc6\xc7",
-               .alen   = 12,
-               .input  = "\x4c\x61\x64\x69\x65\x73\x20\x61"
-                         "\x6e\x64\x20\x47\x65\x6e\x74\x6c"
-                         "\x65\x6d\x65\x6e\x20\x6f\x66\x20"
-                         "\x74\x68\x65\x20\x63\x6c\x61\x73"
-                         "\x73\x20\x6f\x66\x20\x27\x39\x39"
-                         "\x3a\x20\x49\x66\x20\x49\x20\x63"
-                         "\x6f\x75\x6c\x64\x20\x6f\x66\x66"
-                         "\x65\x72\x20\x79\x6f\x75\x20\x6f"
-                         "\x6e\x6c\x79\x20\x6f\x6e\x65\x20"
-                         "\x74\x69\x70\x20\x66\x6f\x72\x20"
-                         "\x74\x68\x65\x20\x66\x75\x74\x75"
-                         "\x72\x65\x2c\x20\x73\x75\x6e\x73"
-                         "\x63\x72\x65\x65\x6e\x20\x77\x6f"
-                         "\x75\x6c\x64\x20\x62\x65\x20\x69"
-                         "\x74\x2e",
-               .ilen   = 114,
-               .result = "\xd3\x1a\x8d\x34\x64\x8e\x60\xdb"
-                         "\x7b\x86\xaf\xbc\x53\xef\x7e\xc2"
-                         "\xa4\xad\xed\x51\x29\x6e\x08\xfe"
-                         "\xa9\xe2\xb5\xa7\x36\xee\x62\xd6"
-                         "\x3d\xbe\xa4\x5e\x8c\xa9\x67\x12"
-                         "\x82\xfa\xfb\x69\xda\x92\x72\x8b"
-                         "\x1a\x71\xde\x0a\x9e\x06\x0b\x29"
-                         "\x05\xd6\xa5\xb6\x7e\xcd\x3b\x36"
-                         "\x92\xdd\xbd\x7f\x2d\x77\x8b\x8c"
-                         "\x98\x03\xae\xe3\x28\x09\x1b\x58"
-                         "\xfa\xb3\x24\xe4\xfa\xd6\x75\x94"
-                         "\x55\x85\x80\x8b\x48\x31\xd7\xbc"
-                         "\x3f\xf4\xde\xf0\x8e\x4b\x7a\x9d"
-                         "\xe5\x76\xd2\x65\x86\xce\xc6\x4b"
-                         "\x61\x16\x1a\xe1\x0b\x59\x4f\x09"
-                         "\xe2\x6a\x7e\x90\x2e\xcb\xd0\x60"
-                         "\x06\x91",
-               .rlen   = 130,
-       }, {
-               .key    = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"
-                         "\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
-                         "\x47\x39\x17\xc1\x40\x2b\x80\x09"
-                         "\x9d\xca\x5c\xbc\x20\x70\x75\xc0",
-               .klen   = 32,
-               .iv     = "\x00\x00\x00\x00\x01\x02\x03\x04"
-                         "\x05\x06\x07\x08",
-               .assoc  = "\xf3\x33\x88\x86\x00\x00\x00\x00"
-                         "\x00\x00\x4e\x91",
-               .alen   = 12,
-               .input  = "\x49\x6e\x74\x65\x72\x6e\x65\x74"
-                         "\x2d\x44\x72\x61\x66\x74\x73\x20"
-                         "\x61\x72\x65\x20\x64\x72\x61\x66"
-                         "\x74\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x76\x61\x6c\x69"
-                         "\x64\x20\x66\x6f\x72\x20\x61\x20"
-                         "\x6d\x61\x78\x69\x6d\x75\x6d\x20"
-                         "\x6f\x66\x20\x73\x69\x78\x20\x6d"
-                         "\x6f\x6e\x74\x68\x73\x20\x61\x6e"
-                         "\x64\x20\x6d\x61\x79\x20\x62\x65"
-                         "\x20\x75\x70\x64\x61\x74\x65\x64"
-                         "\x2c\x20\x72\x65\x70\x6c\x61\x63"
-                         "\x65\x64\x2c\x20\x6f\x72\x20\x6f"
-                         "\x62\x73\x6f\x6c\x65\x74\x65\x64"
-                         "\x20\x62\x79\x20\x6f\x74\x68\x65"
-                         "\x72\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x61\x74\x20\x61"
-                         "\x6e\x79\x20\x74\x69\x6d\x65\x2e"
-                         "\x20\x49\x74\x20\x69\x73\x20\x69"
-                         "\x6e\x61\x70\x70\x72\x6f\x70\x72"
-                         "\x69\x61\x74\x65\x20\x74\x6f\x20"
-                         "\x75\x73\x65\x20\x49\x6e\x74\x65"
-                         "\x72\x6e\x65\x74\x2d\x44\x72\x61"
-                         "\x66\x74\x73\x20\x61\x73\x20\x72"
-                         "\x65\x66\x65\x72\x65\x6e\x63\x65"
-                         "\x20\x6d\x61\x74\x65\x72\x69\x61"
-                         "\x6c\x20\x6f\x72\x20\x74\x6f\x20"
-                         "\x63\x69\x74\x65\x20\x74\x68\x65"
-                         "\x6d\x20\x6f\x74\x68\x65\x72\x20"
-                         "\x74\x68\x61\x6e\x20\x61\x73\x20"
-                         "\x2f\xe2\x80\x9c\x77\x6f\x72\x6b"
-                         "\x20\x69\x6e\x20\x70\x72\x6f\x67"
-                         "\x72\x65\x73\x73\x2e\x2f\xe2\x80"
-                         "\x9d",
-               .ilen   = 265,
-               .result = "\x64\xa0\x86\x15\x75\x86\x1a\xf4"
-                         "\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
-                         "\x5e\x80\x5c\xfd\x34\x5c\xf3\x89"
-                         "\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
-                         "\x4c\x6c\xfc\x18\x75\x5d\x43\xee"
-                         "\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
-                         "\xbd\xb7\xb7\x3c\x32\x1b\x01\x00"
-                         "\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
-                         "\x33\x2f\x83\x0e\x71\x0b\x97\xce"
-                         "\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
-                         "\x14\xad\x17\x6e\x00\x8d\x33\xbd"
-                         "\x60\xf9\x82\xb1\xff\x37\xc8\x55"
-                         "\x97\x97\xa0\x6e\xf4\xf0\xef\x61"
-                         "\xc1\x86\x32\x4e\x2b\x35\x06\x38"
-                         "\x36\x06\x90\x7b\x6a\x7c\x02\xb0"
-                         "\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
-                         "\xb9\x16\x6c\x76\x7b\x80\x4d\x46"
-                         "\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
-                         "\x90\x40\xc5\xa4\x04\x33\x22\x5e"
-                         "\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
-                         "\xaf\x45\x34\xd7\xf8\x3f\xa1\x15"
-                         "\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
-                         "\x0d\x07\x2b\x04\xb3\x56\x4e\xea"
-                         "\x1b\x42\x22\x73\xf5\x48\x27\x1a"
-                         "\x0b\xb2\x31\x60\x53\xfa\x76\x99"
-                         "\x19\x55\xeb\xd6\x31\x59\x43\x4e"
-                         "\xce\xbb\x4e\x46\x6d\xae\x5a\x10"
-                         "\x73\xa6\x72\x76\x27\x09\x7a\x10"
-                         "\x49\xe6\x17\xd9\x1d\x36\x10\x94"
-                         "\xfa\x68\xf0\xff\x77\x98\x71\x30"
-                         "\x30\x5b\xea\xba\x2e\xda\x04\xdf"
-                         "\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
-                         "\xa6\xad\x5c\xb4\x02\x2b\x02\x70"
-                         "\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
-                         "\x22\x39\x23\x36\xfe\xa1\x85\x1f"
-                         "\x38",
-               .rlen   = 281,
-       },
-};
-
-static const struct aead_testvec rfc7539_dec_tv_template[] = {
-       {
-               .key    = "\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",
-               .klen   = 32,
-               .iv     = "\x07\x00\x00\x00\x40\x41\x42\x43"
-                         "\x44\x45\x46\x47",
-               .assoc  = "\x50\x51\x52\x53\xc0\xc1\xc2\xc3"
-                         "\xc4\xc5\xc6\xc7",
-               .alen   = 12,
-               .input  = "\xd3\x1a\x8d\x34\x64\x8e\x60\xdb"
-                         "\x7b\x86\xaf\xbc\x53\xef\x7e\xc2"
-                         "\xa4\xad\xed\x51\x29\x6e\x08\xfe"
-                         "\xa9\xe2\xb5\xa7\x36\xee\x62\xd6"
-                         "\x3d\xbe\xa4\x5e\x8c\xa9\x67\x12"
-                         "\x82\xfa\xfb\x69\xda\x92\x72\x8b"
-                         "\x1a\x71\xde\x0a\x9e\x06\x0b\x29"
-                         "\x05\xd6\xa5\xb6\x7e\xcd\x3b\x36"
-                         "\x92\xdd\xbd\x7f\x2d\x77\x8b\x8c"
-                         "\x98\x03\xae\xe3\x28\x09\x1b\x58"
-                         "\xfa\xb3\x24\xe4\xfa\xd6\x75\x94"
-                         "\x55\x85\x80\x8b\x48\x31\xd7\xbc"
-                         "\x3f\xf4\xde\xf0\x8e\x4b\x7a\x9d"
-                         "\xe5\x76\xd2\x65\x86\xce\xc6\x4b"
-                         "\x61\x16\x1a\xe1\x0b\x59\x4f\x09"
-                         "\xe2\x6a\x7e\x90\x2e\xcb\xd0\x60"
-                         "\x06\x91",
-               .ilen   = 130,
-               .result = "\x4c\x61\x64\x69\x65\x73\x20\x61"
-                         "\x6e\x64\x20\x47\x65\x6e\x74\x6c"
-                         "\x65\x6d\x65\x6e\x20\x6f\x66\x20"
-                         "\x74\x68\x65\x20\x63\x6c\x61\x73"
-                         "\x73\x20\x6f\x66\x20\x27\x39\x39"
-                         "\x3a\x20\x49\x66\x20\x49\x20\x63"
-                         "\x6f\x75\x6c\x64\x20\x6f\x66\x66"
-                         "\x65\x72\x20\x79\x6f\x75\x20\x6f"
-                         "\x6e\x6c\x79\x20\x6f\x6e\x65\x20"
-                         "\x74\x69\x70\x20\x66\x6f\x72\x20"
-                         "\x74\x68\x65\x20\x66\x75\x74\x75"
-                         "\x72\x65\x2c\x20\x73\x75\x6e\x73"
-                         "\x63\x72\x65\x65\x6e\x20\x77\x6f"
-                         "\x75\x6c\x64\x20\x62\x65\x20\x69"
-                         "\x74\x2e",
-               .rlen   = 114,
-       }, {
-               .key    = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"
-                         "\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
-                         "\x47\x39\x17\xc1\x40\x2b\x80\x09"
-                         "\x9d\xca\x5c\xbc\x20\x70\x75\xc0",
-               .klen   = 32,
-               .iv     = "\x00\x00\x00\x00\x01\x02\x03\x04"
-                         "\x05\x06\x07\x08",
-               .assoc  = "\xf3\x33\x88\x86\x00\x00\x00\x00"
-                         "\x00\x00\x4e\x91",
-               .alen   = 12,
-               .input  = "\x64\xa0\x86\x15\x75\x86\x1a\xf4"
-                         "\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
-                         "\x5e\x80\x5c\xfd\x34\x5c\xf3\x89"
-                         "\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
-                         "\x4c\x6c\xfc\x18\x75\x5d\x43\xee"
-                         "\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
-                         "\xbd\xb7\xb7\x3c\x32\x1b\x01\x00"
-                         "\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
-                         "\x33\x2f\x83\x0e\x71\x0b\x97\xce"
-                         "\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
-                         "\x14\xad\x17\x6e\x00\x8d\x33\xbd"
-                         "\x60\xf9\x82\xb1\xff\x37\xc8\x55"
-                         "\x97\x97\xa0\x6e\xf4\xf0\xef\x61"
-                         "\xc1\x86\x32\x4e\x2b\x35\x06\x38"
-                         "\x36\x06\x90\x7b\x6a\x7c\x02\xb0"
-                         "\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
-                         "\xb9\x16\x6c\x76\x7b\x80\x4d\x46"
-                         "\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
-                         "\x90\x40\xc5\xa4\x04\x33\x22\x5e"
-                         "\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
-                         "\xaf\x45\x34\xd7\xf8\x3f\xa1\x15"
-                         "\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
-                         "\x0d\x07\x2b\x04\xb3\x56\x4e\xea"
-                         "\x1b\x42\x22\x73\xf5\x48\x27\x1a"
-                         "\x0b\xb2\x31\x60\x53\xfa\x76\x99"
-                         "\x19\x55\xeb\xd6\x31\x59\x43\x4e"
-                         "\xce\xbb\x4e\x46\x6d\xae\x5a\x10"
-                         "\x73\xa6\x72\x76\x27\x09\x7a\x10"
-                         "\x49\xe6\x17\xd9\x1d\x36\x10\x94"
-                         "\xfa\x68\xf0\xff\x77\x98\x71\x30"
-                         "\x30\x5b\xea\xba\x2e\xda\x04\xdf"
-                         "\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
-                         "\xa6\xad\x5c\xb4\x02\x2b\x02\x70"
-                         "\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
-                         "\x22\x39\x23\x36\xfe\xa1\x85\x1f"
-                         "\x38",
-               .ilen   = 281,
-               .result = "\x49\x6e\x74\x65\x72\x6e\x65\x74"
-                         "\x2d\x44\x72\x61\x66\x74\x73\x20"
-                         "\x61\x72\x65\x20\x64\x72\x61\x66"
-                         "\x74\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x76\x61\x6c\x69"
-                         "\x64\x20\x66\x6f\x72\x20\x61\x20"
-                         "\x6d\x61\x78\x69\x6d\x75\x6d\x20"
-                         "\x6f\x66\x20\x73\x69\x78\x20\x6d"
-                         "\x6f\x6e\x74\x68\x73\x20\x61\x6e"
-                         "\x64\x20\x6d\x61\x79\x20\x62\x65"
-                         "\x20\x75\x70\x64\x61\x74\x65\x64"
-                         "\x2c\x20\x72\x65\x70\x6c\x61\x63"
-                         "\x65\x64\x2c\x20\x6f\x72\x20\x6f"
-                         "\x62\x73\x6f\x6c\x65\x74\x65\x64"
-                         "\x20\x62\x79\x20\x6f\x74\x68\x65"
-                         "\x72\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x61\x74\x20\x61"
-                         "\x6e\x79\x20\x74\x69\x6d\x65\x2e"
-                         "\x20\x49\x74\x20\x69\x73\x20\x69"
-                         "\x6e\x61\x70\x70\x72\x6f\x70\x72"
-                         "\x69\x61\x74\x65\x20\x74\x6f\x20"
-                         "\x75\x73\x65\x20\x49\x6e\x74\x65"
-                         "\x72\x6e\x65\x74\x2d\x44\x72\x61"
-                         "\x66\x74\x73\x20\x61\x73\x20\x72"
-                         "\x65\x66\x65\x72\x65\x6e\x63\x65"
-                         "\x20\x6d\x61\x74\x65\x72\x69\x61"
-                         "\x6c\x20\x6f\x72\x20\x74\x6f\x20"
-                         "\x63\x69\x74\x65\x20\x74\x68\x65"
-                         "\x6d\x20\x6f\x74\x68\x65\x72\x20"
-                         "\x74\x68\x61\x6e\x20\x61\x73\x20"
-                         "\x2f\xe2\x80\x9c\x77\x6f\x72\x6b"
-                         "\x20\x69\x6e\x20\x70\x72\x6f\x67"
-                         "\x72\x65\x73\x73\x2e\x2f\xe2\x80"
-                         "\x9d",
-               .rlen   = 265,
-       },
-};
-
-/*
- * draft-irtf-cfrg-chacha20-poly1305
- */
-static const struct aead_testvec rfc7539esp_enc_tv_template[] = {
-       {
-               .key    = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"
-                         "\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
-                         "\x47\x39\x17\xc1\x40\x2b\x80\x09"
-                         "\x9d\xca\x5c\xbc\x20\x70\x75\xc0"
-                         "\x00\x00\x00\x00",
-               .klen   = 36,
-               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .assoc  = "\xf3\x33\x88\x86\x00\x00\x00\x00"
-                         "\x00\x00\x4e\x91\x01\x02\x03\x04"
-                         "\x05\x06\x07\x08",
-               .alen   = 20,
-               .input  = "\x49\x6e\x74\x65\x72\x6e\x65\x74"
-                         "\x2d\x44\x72\x61\x66\x74\x73\x20"
-                         "\x61\x72\x65\x20\x64\x72\x61\x66"
-                         "\x74\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x76\x61\x6c\x69"
-                         "\x64\x20\x66\x6f\x72\x20\x61\x20"
-                         "\x6d\x61\x78\x69\x6d\x75\x6d\x20"
-                         "\x6f\x66\x20\x73\x69\x78\x20\x6d"
-                         "\x6f\x6e\x74\x68\x73\x20\x61\x6e"
-                         "\x64\x20\x6d\x61\x79\x20\x62\x65"
-                         "\x20\x75\x70\x64\x61\x74\x65\x64"
-                         "\x2c\x20\x72\x65\x70\x6c\x61\x63"
-                         "\x65\x64\x2c\x20\x6f\x72\x20\x6f"
-                         "\x62\x73\x6f\x6c\x65\x74\x65\x64"
-                         "\x20\x62\x79\x20\x6f\x74\x68\x65"
-                         "\x72\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x61\x74\x20\x61"
-                         "\x6e\x79\x20\x74\x69\x6d\x65\x2e"
-                         "\x20\x49\x74\x20\x69\x73\x20\x69"
-                         "\x6e\x61\x70\x70\x72\x6f\x70\x72"
-                         "\x69\x61\x74\x65\x20\x74\x6f\x20"
-                         "\x75\x73\x65\x20\x49\x6e\x74\x65"
-                         "\x72\x6e\x65\x74\x2d\x44\x72\x61"
-                         "\x66\x74\x73\x20\x61\x73\x20\x72"
-                         "\x65\x66\x65\x72\x65\x6e\x63\x65"
-                         "\x20\x6d\x61\x74\x65\x72\x69\x61"
-                         "\x6c\x20\x6f\x72\x20\x74\x6f\x20"
-                         "\x63\x69\x74\x65\x20\x74\x68\x65"
-                         "\x6d\x20\x6f\x74\x68\x65\x72\x20"
-                         "\x74\x68\x61\x6e\x20\x61\x73\x20"
-                         "\x2f\xe2\x80\x9c\x77\x6f\x72\x6b"
-                         "\x20\x69\x6e\x20\x70\x72\x6f\x67"
-                         "\x72\x65\x73\x73\x2e\x2f\xe2\x80"
-                         "\x9d",
-               .ilen   = 265,
-               .result = "\x64\xa0\x86\x15\x75\x86\x1a\xf4"
-                         "\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
-                         "\x5e\x80\x5c\xfd\x34\x5c\xf3\x89"
-                         "\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
-                         "\x4c\x6c\xfc\x18\x75\x5d\x43\xee"
-                         "\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
-                         "\xbd\xb7\xb7\x3c\x32\x1b\x01\x00"
-                         "\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
-                         "\x33\x2f\x83\x0e\x71\x0b\x97\xce"
-                         "\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
-                         "\x14\xad\x17\x6e\x00\x8d\x33\xbd"
-                         "\x60\xf9\x82\xb1\xff\x37\xc8\x55"
-                         "\x97\x97\xa0\x6e\xf4\xf0\xef\x61"
-                         "\xc1\x86\x32\x4e\x2b\x35\x06\x38"
-                         "\x36\x06\x90\x7b\x6a\x7c\x02\xb0"
-                         "\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
-                         "\xb9\x16\x6c\x76\x7b\x80\x4d\x46"
-                         "\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
-                         "\x90\x40\xc5\xa4\x04\x33\x22\x5e"
-                         "\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
-                         "\xaf\x45\x34\xd7\xf8\x3f\xa1\x15"
-                         "\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
-                         "\x0d\x07\x2b\x04\xb3\x56\x4e\xea"
-                         "\x1b\x42\x22\x73\xf5\x48\x27\x1a"
-                         "\x0b\xb2\x31\x60\x53\xfa\x76\x99"
-                         "\x19\x55\xeb\xd6\x31\x59\x43\x4e"
-                         "\xce\xbb\x4e\x46\x6d\xae\x5a\x10"
-                         "\x73\xa6\x72\x76\x27\x09\x7a\x10"
-                         "\x49\xe6\x17\xd9\x1d\x36\x10\x94"
-                         "\xfa\x68\xf0\xff\x77\x98\x71\x30"
-                         "\x30\x5b\xea\xba\x2e\xda\x04\xdf"
-                         "\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
-                         "\xa6\xad\x5c\xb4\x02\x2b\x02\x70"
-                         "\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
-                         "\x22\x39\x23\x36\xfe\xa1\x85\x1f"
-                         "\x38",
-               .rlen   = 281,
-       },
-};
-
-static const struct aead_testvec rfc7539esp_dec_tv_template[] = {
-       {
-               .key    = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"
-                         "\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
-                         "\x47\x39\x17\xc1\x40\x2b\x80\x09"
-                         "\x9d\xca\x5c\xbc\x20\x70\x75\xc0"
-                         "\x00\x00\x00\x00",
-               .klen   = 36,
-               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
-               .assoc  = "\xf3\x33\x88\x86\x00\x00\x00\x00"
-                         "\x00\x00\x4e\x91\x01\x02\x03\x04"
-                         "\x05\x06\x07\x08",
-               .alen   = 20,
-               .input  = "\x64\xa0\x86\x15\x75\x86\x1a\xf4"
-                         "\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
-                         "\x5e\x80\x5c\xfd\x34\x5c\xf3\x89"
-                         "\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
-                         "\x4c\x6c\xfc\x18\x75\x5d\x43\xee"
-                         "\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
-                         "\xbd\xb7\xb7\x3c\x32\x1b\x01\x00"
-                         "\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
-                         "\x33\x2f\x83\x0e\x71\x0b\x97\xce"
-                         "\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
-                         "\x14\xad\x17\x6e\x00\x8d\x33\xbd"
-                         "\x60\xf9\x82\xb1\xff\x37\xc8\x55"
-                         "\x97\x97\xa0\x6e\xf4\xf0\xef\x61"
-                         "\xc1\x86\x32\x4e\x2b\x35\x06\x38"
-                         "\x36\x06\x90\x7b\x6a\x7c\x02\xb0"
-                         "\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
-                         "\xb9\x16\x6c\x76\x7b\x80\x4d\x46"
-                         "\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
-                         "\x90\x40\xc5\xa4\x04\x33\x22\x5e"
-                         "\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
-                         "\xaf\x45\x34\xd7\xf8\x3f\xa1\x15"
-                         "\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
-                         "\x0d\x07\x2b\x04\xb3\x56\x4e\xea"
-                         "\x1b\x42\x22\x73\xf5\x48\x27\x1a"
-                         "\x0b\xb2\x31\x60\x53\xfa\x76\x99"
-                         "\x19\x55\xeb\xd6\x31\x59\x43\x4e"
-                         "\xce\xbb\x4e\x46\x6d\xae\x5a\x10"
-                         "\x73\xa6\x72\x76\x27\x09\x7a\x10"
-                         "\x49\xe6\x17\xd9\x1d\x36\x10\x94"
-                         "\xfa\x68\xf0\xff\x77\x98\x71\x30"
-                         "\x30\x5b\xea\xba\x2e\xda\x04\xdf"
-                         "\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
-                         "\xa6\xad\x5c\xb4\x02\x2b\x02\x70"
-                         "\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
-                         "\x22\x39\x23\x36\xfe\xa1\x85\x1f"
-                         "\x38",
-               .ilen   = 281,
-               .result = "\x49\x6e\x74\x65\x72\x6e\x65\x74"
-                         "\x2d\x44\x72\x61\x66\x74\x73\x20"
-                         "\x61\x72\x65\x20\x64\x72\x61\x66"
-                         "\x74\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x76\x61\x6c\x69"
-                         "\x64\x20\x66\x6f\x72\x20\x61\x20"
-                         "\x6d\x61\x78\x69\x6d\x75\x6d\x20"
-                         "\x6f\x66\x20\x73\x69\x78\x20\x6d"
-                         "\x6f\x6e\x74\x68\x73\x20\x61\x6e"
-                         "\x64\x20\x6d\x61\x79\x20\x62\x65"
-                         "\x20\x75\x70\x64\x61\x74\x65\x64"
-                         "\x2c\x20\x72\x65\x70\x6c\x61\x63"
-                         "\x65\x64\x2c\x20\x6f\x72\x20\x6f"
-                         "\x62\x73\x6f\x6c\x65\x74\x65\x64"
-                         "\x20\x62\x79\x20\x6f\x74\x68\x65"
-                         "\x72\x20\x64\x6f\x63\x75\x6d\x65"
-                         "\x6e\x74\x73\x20\x61\x74\x20\x61"
-                         "\x6e\x79\x20\x74\x69\x6d\x65\x2e"
-                         "\x20\x49\x74\x20\x69\x73\x20\x69"
-                         "\x6e\x61\x70\x70\x72\x6f\x70\x72"
-                         "\x69\x61\x74\x65\x20\x74\x6f\x20"
-                         "\x75\x73\x65\x20\x49\x6e\x74\x65"
-                         "\x72\x6e\x65\x74\x2d\x44\x72\x61"
-                         "\x66\x74\x73\x20\x61\x73\x20\x72"
-                         "\x65\x66\x65\x72\x65\x6e\x63\x65"
-                         "\x20\x6d\x61\x74\x65\x72\x69\x61"
-                         "\x6c\x20\x6f\x72\x20\x74\x6f\x20"
-                         "\x63\x69\x74\x65\x20\x74\x68\x65"
-                         "\x6d\x20\x6f\x74\x68\x65\x72\x20"
-                         "\x74\x68\x61\x6e\x20\x61\x73\x20"
-                         "\x2f\xe2\x80\x9c\x77\x6f\x72\x6b"
-                         "\x20\x69\x6e\x20\x70\x72\x6f\x67"
-                         "\x72\x65\x73\x73\x2e\x2f\xe2\x80"
-                         "\x9d",
-               .rlen   = 265,
-       },
-};
-
-static const struct aead_testvec aegis128_enc_tv_template[] = {
-       {
-               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
-               .klen   = 16,
-               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
-                         "\x40\x6d\x59\x48\xfc\x92\x61\x03",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x07\xa5\x11\xf2\x9d\x40\xb8\x6d"
-                         "\xda\xb8\x12\x34\x4c\x53\xd9\x72",
-               .rlen   = 16,
-       }, {
-               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
-               .klen   = 16,
-               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
-                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x79",
-               .ilen   = 1,
-               .result = "\x9e\x78\x52\xae\xcb\x9e\xe4\xd3"
-                         "\x9a\xd7\x5d\xd7\xaa\x9a\xe9\x5a"
-                         "\xcc",
-               .rlen   = 17,
-       }, {
-               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
-               .klen   = 16,
-               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
-                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47",
-               .ilen   = 15,
-               .result = "\xc3\x80\x83\x04\x5f\xaa\x61\xc7"
-                         "\xca\xdd\x6f\xac\x85\x08\xb5\x35"
-                         "\x2b\xc2\x3e\x0b\x1b\x39\x37\x2b"
-                         "\x7a\x21\x16\xb3\xe6\x67\x66",
-               .rlen   = 31,
-       }, {
-               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
-               .klen   = 16,
-               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
-                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
-                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .ilen   = 16,
-               .result = "\x23\x25\x30\xe5\x6a\xb6\x36\x7d"
-                         "\x38\xfd\x3a\xd2\xc2\x58\xa9\x11"
-                         "\x1e\xa8\x30\x9c\x16\xa4\xdb\x65"
-                         "\x51\x10\x16\x27\x70\x9b\x64\x29",
-               .rlen   = 32,
-       }, {
-               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
-               .klen   = 16,
-               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
-                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
-                         "\xd3",
-               .ilen   = 17,
-               .result = "\x2a\x8d\x56\x91\xc6\xf3\x56\xa5"
-                         "\x1f\xf0\x89\x2e\x13\xad\xe6\xf6"
-                         "\x46\x80\xb1\x0e\x18\x30\x40\x97"
-                         "\x03\xdf\x64\x3c\xbe\x93\x9e\xc9"
-                         "\x3b",
-               .rlen   = 33,
-       }, {
-               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
-               .klen   = 16,
-               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
-                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
-                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
-                         "\x88\x11\x39\x12\x1c\x3a\xbb",
-               .ilen   = 31,
-               .result = "\x4e\xf6\xfa\x13\xde\x43\x63\x4c"
-                         "\xe2\x04\x3e\xe4\x85\x14\xb6\x3f"
-                         "\xb1\x8f\x4c\xdb\x41\xa2\x14\x99"
-                         "\xf5\x53\x0f\x73\x86\x7e\x97\xa1"
-                         "\x4b\x56\x5b\x94\xce\xcd\x74\xcd"
-                         "\x75\xc4\x53\x01\x89\x45\x59",
-               .rlen   = 47,
-       }, {
-               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
-               .klen   = 16,
-               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
-                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
-                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
-                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
-               .ilen   = 32,
-               .result = "\xa4\x9a\xb7\xfd\xa0\xd4\xd6\x47"
-                         "\x95\xf4\x58\x38\x14\x83\x27\x01"
-                         "\x4c\xed\x32\x2c\xf7\xd6\x31\xf7"
-                         "\x38\x1b\x2c\xc9\xb6\x31\xce\xaa"
-                         "\xa5\x3c\x1a\x18\x5c\xce\xb9\xdf"
-                         "\x51\x52\x77\xf2\x5e\x85\x80\x41",
-               .rlen   = 48,
-       }, {
-               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .klen   = 16,
-               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
-                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e",
-               .assoc  = "\xd5",
-               .alen   = 1,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xfb\xd4\x83\x71\x9e\x63\xad\x60"
-                         "\xb9\xf9\xeb\x34\x52\x49\xcf\xb7",
-               .rlen   = 16,
-       }, {
-               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .klen   = 16,
-               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34",
-               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
-                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
-               .alen   = 15,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x0c\xaf\x2e\x96\xf6\x97\x08\x71"
-                         "\x7d\x3a\x84\xc4\x44\x57\x77\x7e",
-               .rlen   = 16,
-       }, {
-               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .klen   = 16,
-               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
-                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
-               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
-                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
-               .alen   = 16,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xc7\x87\x09\x3b\xc7\x19\x74\x22"
-                         "\x22\xa5\x67\x10\xb2\x36\xb3\x45",
-               .rlen   = 16,
-       }, {
-               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .klen   = 16,
-               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41",
-               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
-                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
-                         "\x07",
-               .alen   = 17,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x02\xc6\x3b\x46\x65\xb2\xef\x91"
-                         "\x31\xf0\x45\x48\x8a\x2a\xed\xe4",
-               .rlen   = 16,
-       }, {
-               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .klen   = 16,
-               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47",
-               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
-                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
-                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
-                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
-               .alen   = 31,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x20\x85\xa8\xd0\x91\x48\x85\xf3"
-                         "\x5a\x16\xc0\x57\x68\x47\xdd\xcb",
-               .rlen   = 16,
-       }, {
-               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .klen   = 16,
-               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d",
-               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
-                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
-                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
-                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
-               .alen   = 32,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x6a\xf8\x8d\x9c\x42\x75\x35\x79"
-                         "\xc1\x96\xbd\x31\x6e\x69\x1b\x50",
-               .rlen   = 16,
-       }, {
-               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .klen   = 16,
-               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
-                         "\xcc\x81\x63\xab\xae\x6b\x43\x54",
-               .assoc  = "\x40",
-               .alen   = 1,
-               .input  = "\x4f",
-               .ilen   = 1,
-               .result = "\x01\x24\xb1\xba\xf6\xd3\xdf\x83"
-                         "\x70\x45\xe3\x2a\x9d\x5c\x63\x98"
-                         "\x39",
-               .rlen   = 17,
-       }, {
-               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .klen   = 16,
-               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a",
-               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37",
-               .alen   = 15,
-               .input  = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
-               .ilen   = 15,
-               .result = "\x18\x78\xc2\x6e\xe1\xf7\xe6\x8a"
-                         "\xca\x0e\x62\x00\xa8\x21\xb5\x21"
-                         "\x3d\x36\xdb\xf7\xcc\x31\x94\x9c"
-                         "\x98\xbd\x71\x7a\xef\xa4\xfa",
-               .rlen   = 31,
-       }, {
-               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .klen   = 16,
-               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
-                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
-               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .alen   = 16,
-               .input  = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
-                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .ilen   = 16,
-               .result = "\xea\xd1\x81\x75\xb4\x13\x1d\x86"
-                         "\xd4\x17\x26\xe5\xd6\x89\x39\x04"
-                         "\xa9\x6c\xca\xac\x40\x73\xb2\x4c"
-                         "\x9c\xb9\x0e\x79\x4c\x40\x65\xc6",
-               .rlen   = 32,
-       }, {
-               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .klen   = 16,
-               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66",
-               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05",
-               .alen   = 17,
-               .input  = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
-                         "\xd0",
-               .ilen   = 17,
-               .result = "\xf4\xb2\x84\xd1\x81\xfa\x98\x1c"
-                         "\x38\x2d\x69\x90\x1c\x71\x38\x98"
-                         "\x9f\xe1\x19\x3b\x63\x91\xaf\x6e"
-                         "\x4b\x07\x2c\xac\x53\xc5\xd5\xfe"
-                         "\x93",
-               .rlen   = 33,
-       }, {
-               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .klen   = 16,
-               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d",
-               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
-                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
-                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a",
-               .alen   = 31,
-               .input  = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
-                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
-                         "\x98\x34\xab\x37\x56\xae\x32",
-               .ilen   = 31,
-               .result = "\xa0\xe7\x0a\x60\xe7\xb8\x8a\xdb"
-                         "\x94\xd3\x93\xf2\x41\x86\x16\xdd"
-                         "\x4c\xe8\xe7\xe0\x62\x48\x89\x40"
-                         "\xc0\x49\x9b\x63\x32\xec\x8b\xdb"
-                         "\xdc\xa6\xea\x2c\xc2\x7f\xf5\x04"
-                         "\xcb\xe5\x47\xbb\xa7\xd1\x9d",
-               .rlen   = 47,
-       }, {
-               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .klen   = 16,
-               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73",
-               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .alen   = 32,
-               .input  = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
-                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
-                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
-               .ilen   = 32,
-               .result = "\x62\xdc\x2d\x68\x2d\x71\xbb\x33"
-                         "\x13\xdf\xc0\x46\xf6\x61\x94\xa7"
-                         "\x60\xd3\xd4\xca\xd9\xbe\x82\xf3"
-                         "\xf1\x5b\xa0\xfa\x15\xba\xda\xea"
-                         "\x87\x68\x47\x08\x5d\xdd\x83\xb0"
-                         "\x60\xf4\x93\x20\xdf\x34\x8f\xea",
-               .rlen   = 48,
-       }, {
-               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .klen   = 16,
-               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79",
-               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d",
-               .alen   = 33,
-               .input  = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
-                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
-                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
-                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
-                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
-                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
-                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
-                         "\xbd",
-               .ilen   = 65,
-               .result = "\x84\xc5\x21\xab\xe1\xeb\xbb\x6d"
-                         "\xaa\x2a\xaf\xeb\x3b\x3b\x69\xe7"
-                         "\x2c\x47\xef\x9d\xb7\x53\x36\xb7"
-                         "\xb6\xf5\xe5\xa8\xc9\x9e\x02\xd7"
-                         "\x83\x88\xc2\xbd\x2f\xf9\x10\xc0"
-                         "\xf5\xa1\x6e\xd3\x97\x64\x82\xa3"
-                         "\xfb\xda\x2c\xb1\x94\xa1\x58\x32"
-                         "\xe8\xd4\x39\xfc\x9e\x26\xf9\xf1"
-                         "\x61\xe6\xae\x07\xf2\xe0\xa7\x44"
-                         "\x96\x28\x3b\xee\x6b\xc6\x16\x31"
-                         "\x3f",
-               .rlen   = 81,
-       }, {
-               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .klen   = 16,
-               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f",
-               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .alen   = 65,
-               .input  = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
-                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
-                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
-                         "\x2f",
-               .ilen   = 33,
-               .result = "\x8f\x23\x47\xfb\xf2\xac\x23\x83"
-                         "\x77\x09\xac\x74\xef\xd2\x56\xae"
-                         "\x20\x7b\x7b\xca\x45\x8e\xc8\xc2"
-                         "\x50\xbd\xc7\x44\x1c\x54\x98\xd8"
-                         "\x1f\xd0\x9a\x79\xaa\xf9\xe1\xb3"
-                         "\xb4\x98\x5a\x9b\xe4\x4d\xbf\x4e"
-                         "\x39",
-               .rlen   = 49,
-       }, {
-               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .klen   = 16,
-               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
-                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
-               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .alen   = 16,
-               .input  = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
-                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .ilen   = 16,
-               .result = "\x42\xc3\x58\xfb\x29\xe2\x4a\x56"
-                         "\xf1\xf5\xe1\x51\x55\x4b\x0a\x45"
-                         "\x46\xb5\x8d\xac\xb6\x34\xd8\x8b"
-                         "\xde\x20\x59\x77\xc1\x74\x90",
-               .rlen   = 31,
-       }, {
-               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .klen   = 16,
-               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
-                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
-               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .alen   = 16,
-               .input  = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
-                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .ilen   = 16,
-               .result = "\xb2\xfb\xf6\x97\x69\x7a\xe9\xec"
-                         "\xe2\x94\xa1\x8b\xa0\x2b\x60\x72"
-                         "\x1d\x04\xdd\x6a\xef\x46\x8f\x68"
-                         "\xe9\xe0\x17\x45\x70\x12",
-               .rlen   = 30,
-       }, {
-               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
-               .klen   = 16,
-               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
-                         "\xd5\x07\x58\x59\x72\xd7\xde\x92",
-               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .alen   = 16,
-               .input  = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .ilen   = 16,
-               .result = "\x47\xda\x54\x42\x51\x72\xc4\x8b"
-                         "\xf5\x57\x0f\x2f\x49\x0e\x11\x3b"
-                         "\x78\x93\xec\xfc\xf4\xff\xe1\x2d",
-               .rlen   = 24,
-       },
-};
-
-/*
- * AEGIS-128 test vectors - generated via reference implementation from
- * SUPERCOP (https://bench.cr.yp.to/supercop.html):
- *
- *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
- *   (see crypto_aead/aegis128/)
- */
-static const struct aead_testvec aegis128_dec_tv_template[] = {
-       {
-               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
-               .klen   = 16,
-               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
-                         "\x40\x6d\x59\x48\xfc\x92\x61\x03",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x07\xa5\x11\xf2\x9d\x40\xb8\x6d"
-                         "\xda\xb8\x12\x34\x4c\x53\xd9\x72",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
-               .klen   = 16,
-               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
-                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x9e\x78\x52\xae\xcb\x9e\xe4\xd3"
-                         "\x9a\xd7\x5d\xd7\xaa\x9a\xe9\x5a"
-                         "\xcc",
-               .ilen   = 17,
-               .result = "\x79",
-               .rlen   = 1,
-       }, {
-               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
-               .klen   = 16,
-               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
-                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xc3\x80\x83\x04\x5f\xaa\x61\xc7"
-                         "\xca\xdd\x6f\xac\x85\x08\xb5\x35"
-                         "\x2b\xc2\x3e\x0b\x1b\x39\x37\x2b"
-                         "\x7a\x21\x16\xb3\xe6\x67\x66",
-               .ilen   = 31,
-               .result = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47",
-               .rlen   = 15,
-       }, {
-               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
-               .klen   = 16,
-               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
-                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x23\x25\x30\xe5\x6a\xb6\x36\x7d"
-                         "\x38\xfd\x3a\xd2\xc2\x58\xa9\x11"
-                         "\x1e\xa8\x30\x9c\x16\xa4\xdb\x65"
-                         "\x51\x10\x16\x27\x70\x9b\x64\x29",
-               .ilen   = 32,
-               .result = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
-                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .rlen   = 16,
-       }, {
-               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
-               .klen   = 16,
-               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
-                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x2a\x8d\x56\x91\xc6\xf3\x56\xa5"
-                         "\x1f\xf0\x89\x2e\x13\xad\xe6\xf6"
-                         "\x46\x80\xb1\x0e\x18\x30\x40\x97"
-                         "\x03\xdf\x64\x3c\xbe\x93\x9e\xc9"
-                         "\x3b",
-               .ilen   = 33,
-               .result = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
-                         "\xd3",
-               .rlen   = 17,
-       }, {
-               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
-               .klen   = 16,
-               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
-                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x4e\xf6\xfa\x13\xde\x43\x63\x4c"
-                         "\xe2\x04\x3e\xe4\x85\x14\xb6\x3f"
-                         "\xb1\x8f\x4c\xdb\x41\xa2\x14\x99"
-                         "\xf5\x53\x0f\x73\x86\x7e\x97\xa1"
-                         "\x4b\x56\x5b\x94\xce\xcd\x74\xcd"
-                         "\x75\xc4\x53\x01\x89\x45\x59",
-               .ilen   = 47,
-               .result = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
-                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
-                         "\x88\x11\x39\x12\x1c\x3a\xbb",
-               .rlen   = 31,
-       }, {
-               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
-               .klen   = 16,
-               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
-                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xa4\x9a\xb7\xfd\xa0\xd4\xd6\x47"
-                         "\x95\xf4\x58\x38\x14\x83\x27\x01"
-                         "\x4c\xed\x32\x2c\xf7\xd6\x31\xf7"
-                         "\x38\x1b\x2c\xc9\xb6\x31\xce\xaa"
-                         "\xa5\x3c\x1a\x18\x5c\xce\xb9\xdf"
-                         "\x51\x52\x77\xf2\x5e\x85\x80\x41",
-               .ilen   = 48,
-               .result = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
-                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
-                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
-               .rlen   = 32,
-       }, {
-               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .klen   = 16,
-               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
-                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e",
-               .assoc  = "\xd5",
-               .alen   = 1,
-               .input  = "\xfb\xd4\x83\x71\x9e\x63\xad\x60"
-                         "\xb9\xf9\xeb\x34\x52\x49\xcf\xb7",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .klen   = 16,
-               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34",
-               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
-                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
-               .alen   = 15,
-               .input  = "\x0c\xaf\x2e\x96\xf6\x97\x08\x71"
-                         "\x7d\x3a\x84\xc4\x44\x57\x77\x7e",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .klen   = 16,
-               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
-                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
-               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
-                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
-               .alen   = 16,
-               .input  = "\xc7\x87\x09\x3b\xc7\x19\x74\x22"
-                         "\x22\xa5\x67\x10\xb2\x36\xb3\x45",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .klen   = 16,
-               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41",
-               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
-                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
-                         "\x07",
-               .alen   = 17,
-               .input  = "\x02\xc6\x3b\x46\x65\xb2\xef\x91"
-                         "\x31\xf0\x45\x48\x8a\x2a\xed\xe4",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .klen   = 16,
-               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47",
-               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
-                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
-                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
-                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
-               .alen   = 31,
-               .input  = "\x20\x85\xa8\xd0\x91\x48\x85\xf3"
-                         "\x5a\x16\xc0\x57\x68\x47\xdd\xcb",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .klen   = 16,
-               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d",
-               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
-                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
-                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
-                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
-               .alen   = 32,
-               .input  = "\x6a\xf8\x8d\x9c\x42\x75\x35\x79"
-                         "\xc1\x96\xbd\x31\x6e\x69\x1b\x50",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .klen   = 16,
-               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
-                         "\xcc\x81\x63\xab\xae\x6b\x43\x54",
-               .assoc  = "\x40",
-               .alen   = 1,
-               .input  = "\x01\x24\xb1\xba\xf6\xd3\xdf\x83"
-                         "\x70\x45\xe3\x2a\x9d\x5c\x63\x98"
-                         "\x39",
-               .ilen   = 17,
-               .result = "\x4f",
-               .rlen   = 1,
-       }, {
-               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .klen   = 16,
-               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a",
-               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37",
-               .alen   = 15,
-               .input  = "\x18\x78\xc2\x6e\xe1\xf7\xe6\x8a"
-                         "\xca\x0e\x62\x00\xa8\x21\xb5\x21"
-                         "\x3d\x36\xdb\xf7\xcc\x31\x94\x9c"
-                         "\x98\xbd\x71\x7a\xef\xa4\xfa",
-               .ilen   = 31,
-               .result = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
-               .rlen   = 15,
-       }, {
-               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .klen   = 16,
-               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
-                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
-               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .alen   = 16,
-               .input  = "\xea\xd1\x81\x75\xb4\x13\x1d\x86"
-                         "\xd4\x17\x26\xe5\xd6\x89\x39\x04"
-                         "\xa9\x6c\xca\xac\x40\x73\xb2\x4c"
-                         "\x9c\xb9\x0e\x79\x4c\x40\x65\xc6",
-               .ilen   = 32,
-               .result = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
-                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .rlen   = 16,
-       }, {
-               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .klen   = 16,
-               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66",
-               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05",
-               .alen   = 17,
-               .input  = "\xf4\xb2\x84\xd1\x81\xfa\x98\x1c"
-                         "\x38\x2d\x69\x90\x1c\x71\x38\x98"
-                         "\x9f\xe1\x19\x3b\x63\x91\xaf\x6e"
-                         "\x4b\x07\x2c\xac\x53\xc5\xd5\xfe"
-                         "\x93",
-               .ilen   = 33,
-               .result = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
-                         "\xd0",
-               .rlen   = 17,
-       }, {
-               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .klen   = 16,
-               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d",
-               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
-                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
-                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a",
-               .alen   = 31,
-               .input  = "\xa0\xe7\x0a\x60\xe7\xb8\x8a\xdb"
-                         "\x94\xd3\x93\xf2\x41\x86\x16\xdd"
-                         "\x4c\xe8\xe7\xe0\x62\x48\x89\x40"
-                         "\xc0\x49\x9b\x63\x32\xec\x8b\xdb"
-                         "\xdc\xa6\xea\x2c\xc2\x7f\xf5\x04"
-                         "\xcb\xe5\x47\xbb\xa7\xd1\x9d",
-               .ilen   = 47,
-               .result = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
-                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
-                         "\x98\x34\xab\x37\x56\xae\x32",
-               .rlen   = 31,
-       }, {
-               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .klen   = 16,
-               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73",
-               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .alen   = 32,
-               .input  = "\x62\xdc\x2d\x68\x2d\x71\xbb\x33"
-                         "\x13\xdf\xc0\x46\xf6\x61\x94\xa7"
-                         "\x60\xd3\xd4\xca\xd9\xbe\x82\xf3"
-                         "\xf1\x5b\xa0\xfa\x15\xba\xda\xea"
-                         "\x87\x68\x47\x08\x5d\xdd\x83\xb0"
-                         "\x60\xf4\x93\x20\xdf\x34\x8f\xea",
-               .ilen   = 48,
-               .result = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
-                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
-                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
-               .rlen   = 32,
-       }, {
-               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .klen   = 16,
-               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79",
-               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d",
-               .alen   = 33,
-               .input  = "\x84\xc5\x21\xab\xe1\xeb\xbb\x6d"
-                         "\xaa\x2a\xaf\xeb\x3b\x3b\x69\xe7"
-                         "\x2c\x47\xef\x9d\xb7\x53\x36\xb7"
-                         "\xb6\xf5\xe5\xa8\xc9\x9e\x02\xd7"
-                         "\x83\x88\xc2\xbd\x2f\xf9\x10\xc0"
-                         "\xf5\xa1\x6e\xd3\x97\x64\x82\xa3"
-                         "\xfb\xda\x2c\xb1\x94\xa1\x58\x32"
-                         "\xe8\xd4\x39\xfc\x9e\x26\xf9\xf1"
-                         "\x61\xe6\xae\x07\xf2\xe0\xa7\x44"
-                         "\x96\x28\x3b\xee\x6b\xc6\x16\x31"
-                         "\x3f",
-               .ilen   = 81,
-               .result = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
-                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
-                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
-                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
-                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
-                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
-                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
-                         "\xbd",
-               .rlen   = 65,
-       }, {
-               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .klen   = 16,
-               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f",
-               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .alen   = 65,
-               .input  = "\x8f\x23\x47\xfb\xf2\xac\x23\x83"
-                         "\x77\x09\xac\x74\xef\xd2\x56\xae"
-                         "\x20\x7b\x7b\xca\x45\x8e\xc8\xc2"
-                         "\x50\xbd\xc7\x44\x1c\x54\x98\xd8"
-                         "\x1f\xd0\x9a\x79\xaa\xf9\xe1\xb3"
-                         "\xb4\x98\x5a\x9b\xe4\x4d\xbf\x4e"
-                         "\x39",
-               .ilen   = 49,
-               .result = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
-                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
-                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
-                         "\x2f",
-               .rlen   = 33,
-       }, {
-               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .klen   = 16,
-               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
-                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
-               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .alen   = 16,
-               .input  = "\x42\xc3\x58\xfb\x29\xe2\x4a\x56"
-                         "\xf1\xf5\xe1\x51\x55\x4b\x0a\x45"
-                         "\x46\xb5\x8d\xac\xb6\x34\xd8\x8b"
-                         "\xde\x20\x59\x77\xc1\x74\x90",
-               .ilen   = 31,
-               .result = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
-                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .rlen   = 16,
-       }, {
-               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .klen   = 16,
-               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
-                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
-               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .alen   = 16,
-               .input  = "\xb2\xfb\xf6\x97\x69\x7a\xe9\xec"
-                         "\xe2\x94\xa1\x8b\xa0\x2b\x60\x72"
-                         "\x1d\x04\xdd\x6a\xef\x46\x8f\x68"
-                         "\xe9\xe0\x17\x45\x70\x12",
-               .ilen   = 30,
-               .result = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
-                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .rlen   = 16,
-       }, {
-               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
-               .klen   = 16,
-               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
-                         "\xd5\x07\x58\x59\x72\xd7\xde\x92",
-               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .alen   = 16,
-               .input  = "\x47\xda\x54\x42\x51\x72\xc4\x8b"
-                         "\xf5\x57\x0f\x2f\x49\x0e\x11\x3b"
-                         "\x78\x93\xec\xfc\xf4\xff\xe1\x2d",
-               .ilen   = 24,
-               .result = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .rlen   = 16,
-       },
-};
-
-/*
- * AEGIS-128L test vectors - generated via reference implementation from
- * SUPERCOP (https://bench.cr.yp.to/supercop.html):
- *
- *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
- *   (see crypto_aead/aegis128l/)
- */
-static const struct aead_testvec aegis128l_enc_tv_template[] = {
-       {
-               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
-               .klen   = 16,
-               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
-                         "\x40\x6d\x59\x48\xfc\x92\x61\x03",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x30\x4f\xf3\xe9\xb1\xfa\x81\xa6"
-                         "\x20\x72\x78\xdd\x93\xc8\x57\xef",
-               .rlen   = 16,
-       }, {
-               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
-               .klen   = 16,
-               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
-                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x79",
-               .ilen   = 1,
-               .result = "\xa9\x24\xa0\xb6\x2d\xdd\x29\xdb"
-                         "\x40\xb3\x71\xc5\x22\x58\x31\x77"
-                         "\x6d",
-               .rlen   = 17,
-       }, {
-               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
-               .klen   = 16,
-               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
-                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47",
-               .ilen   = 15,
-               .result = "\xbb\x0a\x53\xc4\xaa\x7e\xa4\x03"
-                         "\x2b\xee\x62\x99\x7b\x98\x13\x1f"
-                         "\xe0\x76\x4c\x2e\x53\x99\x4f\xbe"
-                         "\xe1\xa8\x04\x7f\xe1\x71\xbe",
-               .rlen   = 31,
-       }, {
-               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
-               .klen   = 16,
-               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
-                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
-                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .ilen   = 16,
-               .result = "\x66\xdf\x6e\x71\xc0\x6e\xa4\x4c"
-                         "\x9d\xb7\x8c\x9a\xdb\x1f\xd2\x2e"
-                         "\x23\xb6\xa4\xfb\xd3\x86\xdd\xbb"
-                         "\xde\x54\x9b\xf5\x92\x8b\x93\xc5",
-               .rlen   = 32,
-       }, {
-               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
-               .klen   = 16,
-               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
-                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
-                         "\xd3",
-               .ilen   = 17,
-               .result = "\x4f\xc3\x69\xb6\xd3\xa4\x64\x8b"
-                         "\x71\xc3\x8a\x91\x22\x4f\x1b\xd2"
-                         "\x33\x6d\x86\xbc\xf8\x2f\x06\xf9"
-                         "\x82\x64\xc7\x72\x00\x30\xfc\xf0"
-                         "\xf8",
-               .rlen   = 33,
-       }, {
-               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
-               .klen   = 16,
-               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
-                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
-                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
-                         "\x88\x11\x39\x12\x1c\x3a\xbb",
-               .ilen   = 31,
-               .result = "\xe3\x93\x15\xae\x5f\x9d\x3c\xb5"
-                         "\xd6\x9d\xee\xee\xcf\xaa\xaf\xe1"
-                         "\x45\x10\x96\xe0\xbf\x55\x0f\x4c"
-                         "\x1a\xfd\xf4\xda\x4e\x10\xde\xc9"
-                         "\x0e\x6f\xc7\x3c\x49\x94\x41\xfc"
-                         "\x59\x28\x88\x3c\x79\x10\x6b",
-               .rlen   = 47,
-       }, {
-               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
-               .klen   = 16,
-               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
-                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
-                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
-                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
-               .ilen   = 32,
-               .result = "\x1c\x8e\x22\x34\xfd\xab\xe6\x0d"
-                         "\x1c\x9f\x06\x54\x8b\x0b\xb4\x40"
-                         "\xde\x11\x59\x3e\xfd\x74\xf6\x42"
-                         "\x97\x17\xf7\x24\xb6\x7e\xc4\xc6"
-                         "\x06\xa3\x94\xda\x3d\x7f\x55\x0a"
-                         "\x92\x07\x2f\xa6\xf3\x6b\x2c\xfc",
-               .rlen   = 48,
-       }, {
-               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .klen   = 16,
-               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
-                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e",
-               .assoc  = "\xd5",
-               .alen   = 1,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xa0\x2a\xb4\x9a\x91\x00\x15\xb8"
-                         "\x0f\x9a\x15\x60\x0e\x9b\x13\x8f",
-               .rlen   = 16,
-       }, {
-               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .klen   = 16,
-               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34",
-               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
-                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
-               .alen   = 15,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x4c\x26\xad\x9c\x14\xfd\x9c\x8c"
-                         "\x84\xfb\x26\xfb\xd5\xca\x62\x39",
-               .rlen   = 16,
-       }, {
-               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .klen   = 16,
-               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
-                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
-               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
-                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
-               .alen   = 16,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x45\x85\x0e\x0f\xf4\xae\x96\xa1"
-                         "\x99\x4d\x6d\xb4\x67\x32\xb0\x3a",
-               .rlen   = 16,
-       }, {
-               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .klen   = 16,
-               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41",
-               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
-                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
-                         "\x07",
-               .alen   = 17,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x33\xb1\x42\x97\x8e\x16\x7b\x63"
-                         "\x06\xba\x5b\xcb\xae\x6d\x8b\x56",
-               .rlen   = 16,
-       }, {
-               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .klen   = 16,
-               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47",
-               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
-                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
-                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
-                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
-               .alen   = 31,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xda\x44\x08\x8c\x2a\xa5\x07\x35"
-                         "\x0b\x54\x4e\x6d\xe3\xfd\xc4\x5f",
-               .rlen   = 16,
-       }, {
-               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .klen   = 16,
-               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d",
-               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
-                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
-                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
-                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
-               .alen   = 32,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x1b\xb1\xf1\xa8\x9e\xc2\xb2\x88"
-                         "\x40\x7f\x7b\x19\x7a\x52\x8c\xf0",
-               .rlen   = 16,
-       }, {
-               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .klen   = 16,
-               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
-                         "\xcc\x81\x63\xab\xae\x6b\x43\x54",
-               .assoc  = "\x40",
-               .alen   = 1,
-               .input  = "\x4f",
-               .ilen   = 1,
-               .result = "\x6e\xc8\xfb\x15\x9d\x98\x49\xc9"
-                         "\xa0\x98\x09\x85\xbe\x56\x8e\x79"
-                         "\xf4",
-               .rlen   = 17,
-       }, {
-               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .klen   = 16,
-               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a",
-               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37",
-               .alen   = 15,
-               .input  = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
-               .ilen   = 15,
-               .result = "\x99\x2e\x84\x50\x64\x5c\xab\x29"
-                         "\x20\xba\xb9\x2f\x62\x3a\xce\x2a"
-                         "\x75\x25\x3b\xe3\x40\xe0\x1d\xfc"
-                         "\x20\x63\x0b\x49\x7e\x97\x08",
-               .rlen   = 31,
-       }, {
-               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .klen   = 16,
-               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
-                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
-               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .alen   = 16,
-               .input  = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
-                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .ilen   = 16,
-               .result = "\xd9\x8e\xfd\x50\x8f\x02\x9f\xee"
-                         "\x78\x08\x12\xec\x09\xaf\x53\x14"
-                         "\x90\x3e\x3d\x76\xad\x71\x21\x08"
-                         "\x77\xe5\x4b\x15\xc2\xe6\xbc\xdb",
-               .rlen   = 32,
-       }, {
-               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .klen   = 16,
-               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66",
-               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05",
-               .alen   = 17,
-               .input  = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
-                         "\xd0",
-               .ilen   = 17,
-               .result = "\xf3\xe7\x95\x86\xcf\x34\x95\x96"
-                         "\x17\xfe\x1b\xae\x1b\x31\xf2\x1a"
-                         "\xbd\xbc\xc9\x4e\x11\x29\x09\x5c"
-                         "\x05\xd3\xb4\x2e\x4a\x74\x59\x49"
-                         "\x7d",
-               .rlen   = 33,
-       }, {
-               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .klen   = 16,
-               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d",
-               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
-                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
-                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a",
-               .alen   = 31,
-               .input  = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
-                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
-                         "\x98\x34\xab\x37\x56\xae\x32",
-               .ilen   = 31,
-               .result = "\x06\x96\xb2\xbf\x63\xf4\x1e\x24"
-                         "\x0d\x19\x15\x61\x65\x3b\x06\x26"
-                         "\x71\xe8\x7e\x16\xdb\x96\x01\x01"
-                         "\x52\xcd\x49\x5b\x07\x33\x4e\xe7"
-                         "\xaa\x91\xf5\xd5\xc6\xfe\x41\xb5"
-                         "\xed\x90\xce\xb9\xcd\xcc\xa1",
-               .rlen   = 47,
-       }, {
-               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .klen   = 16,
-               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73",
-               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .alen   = 32,
-               .input  = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
-                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
-                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
-               .ilen   = 32,
-               .result = "\xf9\xd7\xee\x17\xfd\x24\xcd\xf1"
-                         "\xbc\x0f\x35\x97\x97\x0c\x4b\x18"
-                         "\xce\x58\xc8\x3b\xd4\x85\x93\x79"
-                         "\xcc\x9c\xea\xc1\x73\x13\x0b\x4c"
-                         "\xcc\x6f\x28\xf8\xa4\x4e\xb8\x56"
-                         "\x64\x4e\x47\xce\xb2\xb4\x92\xb4",
-               .rlen   = 48,
-       }, {
-               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .klen   = 16,
-               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79",
-               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d",
-               .alen   = 33,
-               .input  = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
-                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
-                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
-                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
-                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
-                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
-                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
-                         "\xbd",
-               .ilen   = 65,
-               .result = "\x58\xfa\x3a\x3d\xd9\x88\x63\xe8"
-                         "\xc5\x78\x50\x8b\x4a\xc9\xdf\x7f"
-                         "\x4b\xfa\xc8\x2e\x67\x43\xf3\x63"
-                         "\x42\x8e\x99\x5a\x9c\x0b\x84\x77"
-                         "\xbc\x46\x76\x48\x82\xc7\x57\x96"
-                         "\xe1\x65\xd1\xed\x1d\xdd\x80\x24"
-                         "\xa6\x4d\xa9\xf1\x53\x8b\x5e\x0e"
-                         "\x26\xb9\xcc\x37\xe5\x43\xe1\x5a"
-                         "\x8a\xd6\x8c\x5a\xe4\x95\xd1\x8d"
-                         "\xf7\x33\x64\xc1\xd3\xf2\xfc\x35"
-                         "\x01",
-               .rlen   = 81,
-       }, {
-               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .klen   = 16,
-               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f",
-               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .alen   = 65,
-               .input  = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
-                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
-                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
-                         "\x2f",
-               .ilen   = 33,
-               .result = "\x4c\xa9\xac\x71\xed\x10\xa6\x24"
-                         "\xb7\xa7\xdf\x8b\xf5\xc2\x41\xcb"
-                         "\x05\xc9\xd6\x97\xb6\x10\x7f\x17"
-                         "\xc2\xc0\x93\xcf\xe0\x94\xfd\x99"
-                         "\xf2\x62\x25\x28\x01\x23\x6f\x8b"
-                         "\x04\x52\xbc\xb0\x3e\x66\x52\x90"
-                         "\x9f",
-               .rlen   = 49,
-       }, {
-               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .klen   = 16,
-               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
-                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
-               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .alen   = 16,
-               .input  = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
-                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .ilen   = 16,
-               .result = "\x6d\xed\x04\x7a\x2f\x0c\x30\xa5"
-                         "\x96\xe6\x97\xe4\x10\xeb\x40\x95"
-                         "\xc5\x9a\xdf\x31\xd5\xa5\xa6\xec"
-                         "\x05\xa8\x31\x50\x11\x19\x44",
-               .rlen   = 31,
-       }, {
-               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .klen   = 16,
-               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
-                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
-               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .alen   = 16,
-               .input  = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
-                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .ilen   = 16,
-               .result = "\x30\x95\x7d\xea\xdc\x62\xc0\x88"
-                         "\xa1\xe3\x8d\x8c\xac\x04\x10\xa7"
-                         "\xfa\xfa\x07\xbd\xa0\xf0\x36\xeb"
-                         "\x21\x93\x2e\x31\x84\x83",
-               .rlen   = 30,
-       }, {
-               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
-               .klen   = 16,
-               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
-                         "\xd5\x07\x58\x59\x72\xd7\xde\x92",
-               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .alen   = 16,
-               .input  = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .ilen   = 16,
-               .result = "\x93\xcd\xee\xd4\xcb\x9d\x8d\x16"
-                         "\x63\x0d\x43\xd5\x49\xca\xa8\x85"
-                         "\x49\xc0\xae\x13\xbc\x26\x1d\x4b",
-               .rlen   = 24,
-       },
-};
-
-static const struct aead_testvec aegis128l_dec_tv_template[] = {
-       {
-               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
-               .klen   = 16,
-               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
-                         "\x40\x6d\x59\x48\xfc\x92\x61\x03",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x30\x4f\xf3\xe9\xb1\xfa\x81\xa6"
-                         "\x20\x72\x78\xdd\x93\xc8\x57\xef",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
-               .klen   = 16,
-               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
-                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xa9\x24\xa0\xb6\x2d\xdd\x29\xdb"
-                         "\x40\xb3\x71\xc5\x22\x58\x31\x77"
-                         "\x6d",
-               .ilen   = 17,
-               .result = "\x79",
-               .rlen   = 1,
-       }, {
-               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
-               .klen   = 16,
-               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
-                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xbb\x0a\x53\xc4\xaa\x7e\xa4\x03"
-                         "\x2b\xee\x62\x99\x7b\x98\x13\x1f"
-                         "\xe0\x76\x4c\x2e\x53\x99\x4f\xbe"
-                         "\xe1\xa8\x04\x7f\xe1\x71\xbe",
-               .ilen   = 31,
-               .result = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47",
-               .rlen   = 15,
-       }, {
-               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
-               .klen   = 16,
-               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
-                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x66\xdf\x6e\x71\xc0\x6e\xa4\x4c"
-                         "\x9d\xb7\x8c\x9a\xdb\x1f\xd2\x2e"
-                         "\x23\xb6\xa4\xfb\xd3\x86\xdd\xbb"
-                         "\xde\x54\x9b\xf5\x92\x8b\x93\xc5",
-               .ilen   = 32,
-               .result = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
-                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .rlen   = 16,
-       }, {
-               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
-               .klen   = 16,
-               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
-                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x4f\xc3\x69\xb6\xd3\xa4\x64\x8b"
-                         "\x71\xc3\x8a\x91\x22\x4f\x1b\xd2"
-                         "\x33\x6d\x86\xbc\xf8\x2f\x06\xf9"
-                         "\x82\x64\xc7\x72\x00\x30\xfc\xf0"
-                         "\xf8",
-               .ilen   = 33,
-               .result = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
-                         "\xd3",
-               .rlen   = 17,
-       }, {
-               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
-               .klen   = 16,
-               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
-                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xe3\x93\x15\xae\x5f\x9d\x3c\xb5"
-                         "\xd6\x9d\xee\xee\xcf\xaa\xaf\xe1"
-                         "\x45\x10\x96\xe0\xbf\x55\x0f\x4c"
-                         "\x1a\xfd\xf4\xda\x4e\x10\xde\xc9"
-                         "\x0e\x6f\xc7\x3c\x49\x94\x41\xfc"
-                         "\x59\x28\x88\x3c\x79\x10\x6b",
-               .ilen   = 47,
-               .result = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
-                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
-                         "\x88\x11\x39\x12\x1c\x3a\xbb",
-               .rlen   = 31,
-       }, {
-               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
-               .klen   = 16,
-               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
-                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x1c\x8e\x22\x34\xfd\xab\xe6\x0d"
-                         "\x1c\x9f\x06\x54\x8b\x0b\xb4\x40"
-                         "\xde\x11\x59\x3e\xfd\x74\xf6\x42"
-                         "\x97\x17\xf7\x24\xb6\x7e\xc4\xc6"
-                         "\x06\xa3\x94\xda\x3d\x7f\x55\x0a"
-                         "\x92\x07\x2f\xa6\xf3\x6b\x2c\xfc",
-               .ilen   = 48,
-               .result = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
-                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
-                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
-               .rlen   = 32,
-       }, {
-               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .klen   = 16,
-               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
-                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e",
-               .assoc  = "\xd5",
-               .alen   = 1,
-               .input  = "\xa0\x2a\xb4\x9a\x91\x00\x15\xb8"
-                         "\x0f\x9a\x15\x60\x0e\x9b\x13\x8f",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .klen   = 16,
-               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34",
-               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
-                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
-               .alen   = 15,
-               .input  = "\x4c\x26\xad\x9c\x14\xfd\x9c\x8c"
-                         "\x84\xfb\x26\xfb\xd5\xca\x62\x39",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .klen   = 16,
-               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
-                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
-               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
-                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
-               .alen   = 16,
-               .input  = "\x45\x85\x0e\x0f\xf4\xae\x96\xa1"
-                         "\x99\x4d\x6d\xb4\x67\x32\xb0\x3a",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .klen   = 16,
-               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41",
-               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
-                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
-                         "\x07",
-               .alen   = 17,
-               .input  = "\x33\xb1\x42\x97\x8e\x16\x7b\x63"
-                         "\x06\xba\x5b\xcb\xae\x6d\x8b\x56",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .klen   = 16,
-               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47",
-               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
-                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
-                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
-                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
-               .alen   = 31,
-               .input  = "\xda\x44\x08\x8c\x2a\xa5\x07\x35"
-                         "\x0b\x54\x4e\x6d\xe3\xfd\xc4\x5f",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .klen   = 16,
-               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d",
-               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
-                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
-                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
-                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
-               .alen   = 32,
-               .input  = "\x1b\xb1\xf1\xa8\x9e\xc2\xb2\x88"
-                         "\x40\x7f\x7b\x19\x7a\x52\x8c\xf0",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
-       }, {
-               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .klen   = 16,
-               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
-                         "\xcc\x81\x63\xab\xae\x6b\x43\x54",
-               .assoc  = "\x40",
-               .alen   = 1,
-               .input  = "\x6e\xc8\xfb\x15\x9d\x98\x49\xc9"
-                         "\xa0\x98\x09\x85\xbe\x56\x8e\x79"
-                         "\xf4",
-               .ilen   = 17,
-               .result = "\x4f",
-               .rlen   = 1,
-       }, {
-               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .klen   = 16,
-               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a",
-               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37",
-               .alen   = 15,
-               .input  = "\x99\x2e\x84\x50\x64\x5c\xab\x29"
-                         "\x20\xba\xb9\x2f\x62\x3a\xce\x2a"
-                         "\x75\x25\x3b\xe3\x40\xe0\x1d\xfc"
-                         "\x20\x63\x0b\x49\x7e\x97\x08",
-               .ilen   = 31,
-               .result = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
-               .rlen   = 15,
-       }, {
-               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .klen   = 16,
-               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
-                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
-               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .alen   = 16,
-               .input  = "\xd9\x8e\xfd\x50\x8f\x02\x9f\xee"
-                         "\x78\x08\x12\xec\x09\xaf\x53\x14"
-                         "\x90\x3e\x3d\x76\xad\x71\x21\x08"
-                         "\x77\xe5\x4b\x15\xc2\xe6\xbc\xdb",
-               .ilen   = 32,
-               .result = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
-                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .rlen   = 16,
-       }, {
-               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .klen   = 16,
-               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66",
-               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05",
-               .alen   = 17,
-               .input  = "\xf3\xe7\x95\x86\xcf\x34\x95\x96"
-                         "\x17\xfe\x1b\xae\x1b\x31\xf2\x1a"
-                         "\xbd\xbc\xc9\x4e\x11\x29\x09\x5c"
-                         "\x05\xd3\xb4\x2e\x4a\x74\x59\x49"
-                         "\x7d",
-               .ilen   = 33,
-               .result = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
-                         "\xd0",
-               .rlen   = 17,
-       }, {
-               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .klen   = 16,
-               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d",
-               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
-                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
-                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a",
-               .alen   = 31,
-               .input  = "\x06\x96\xb2\xbf\x63\xf4\x1e\x24"
-                         "\x0d\x19\x15\x61\x65\x3b\x06\x26"
-                         "\x71\xe8\x7e\x16\xdb\x96\x01\x01"
-                         "\x52\xcd\x49\x5b\x07\x33\x4e\xe7"
-                         "\xaa\x91\xf5\xd5\xc6\xfe\x41\xb5"
-                         "\xed\x90\xce\xb9\xcd\xcc\xa1",
-               .ilen   = 47,
-               .result = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
-                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
-                         "\x98\x34\xab\x37\x56\xae\x32",
-               .rlen   = 31,
-       }, {
-               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .klen   = 16,
-               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73",
-               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .alen   = 32,
-               .input  = "\xf9\xd7\xee\x17\xfd\x24\xcd\xf1"
-                         "\xbc\x0f\x35\x97\x97\x0c\x4b\x18"
-                         "\xce\x58\xc8\x3b\xd4\x85\x93\x79"
-                         "\xcc\x9c\xea\xc1\x73\x13\x0b\x4c"
-                         "\xcc\x6f\x28\xf8\xa4\x4e\xb8\x56"
-                         "\x64\x4e\x47\xce\xb2\xb4\x92\xb4",
-               .ilen   = 48,
-               .result = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
-                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
-                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
-               .rlen   = 32,
-       }, {
-               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .klen   = 16,
-               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79",
-               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d",
-               .alen   = 33,
-               .input  = "\x58\xfa\x3a\x3d\xd9\x88\x63\xe8"
-                         "\xc5\x78\x50\x8b\x4a\xc9\xdf\x7f"
-                         "\x4b\xfa\xc8\x2e\x67\x43\xf3\x63"
-                         "\x42\x8e\x99\x5a\x9c\x0b\x84\x77"
-                         "\xbc\x46\x76\x48\x82\xc7\x57\x96"
-                         "\xe1\x65\xd1\xed\x1d\xdd\x80\x24"
-                         "\xa6\x4d\xa9\xf1\x53\x8b\x5e\x0e"
-                         "\x26\xb9\xcc\x37\xe5\x43\xe1\x5a"
-                         "\x8a\xd6\x8c\x5a\xe4\x95\xd1\x8d"
-                         "\xf7\x33\x64\xc1\xd3\xf2\xfc\x35"
-                         "\x01",
-               .ilen   = 81,
-               .result = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
-                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
-                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
-                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
-                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
-                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
-                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
-                         "\xbd",
-               .rlen   = 65,
-       }, {
-               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .klen   = 16,
-               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f",
-               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .alen   = 65,
-               .input  = "\x4c\xa9\xac\x71\xed\x10\xa6\x24"
-                         "\xb7\xa7\xdf\x8b\xf5\xc2\x41\xcb"
-                         "\x05\xc9\xd6\x97\xb6\x10\x7f\x17"
-                         "\xc2\xc0\x93\xcf\xe0\x94\xfd\x99"
-                         "\xf2\x62\x25\x28\x01\x23\x6f\x8b"
-                         "\x04\x52\xbc\xb0\x3e\x66\x52\x90"
-                         "\x9f",
-               .ilen   = 49,
-               .result = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
-                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
-                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
-                         "\x2f",
-               .rlen   = 33,
-       }, {
-               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .klen   = 16,
-               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
-                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
-               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .alen   = 16,
-               .input  = "\x6d\xed\x04\x7a\x2f\x0c\x30\xa5"
-                         "\x96\xe6\x97\xe4\x10\xeb\x40\x95"
-                         "\xc5\x9a\xdf\x31\xd5\xa5\xa6\xec"
-                         "\x05\xa8\x31\x50\x11\x19\x44",
-               .ilen   = 31,
-               .result = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
-                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .rlen   = 16,
-       }, {
-               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .klen   = 16,
-               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
-                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
-               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .alen   = 16,
-               .input  = "\x30\x95\x7d\xea\xdc\x62\xc0\x88"
-                         "\xa1\xe3\x8d\x8c\xac\x04\x10\xa7"
-                         "\xfa\xfa\x07\xbd\xa0\xf0\x36\xeb"
-                         "\x21\x93\x2e\x31\x84\x83",
-               .ilen   = 30,
-               .result = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
-                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .rlen   = 16,
-       }, {
-               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
+               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
                .klen   = 16,
-               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
-                         "\xd5\x07\x58\x59\x72\xd7\xde\x92",
-               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .alen   = 16,
-               .input  = "\x93\xcd\xee\xd4\xcb\x9d\x8d\x16"
-                         "\x63\x0d\x43\xd5\x49\xca\xa8\x85"
-                         "\x49\xc0\xae\x13\xbc\x26\x1d\x4b",
-               .ilen   = 24,
-               .result = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .rlen   = 16,
-       },
-};
-
-/*
- * AEGIS-256 test vectors - generated via reference implementation from
- * SUPERCOP (https://bench.cr.yp.to/supercop.html):
- *
- *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
- *   (see crypto_aead/aegis256/)
- */
-static const struct aead_testvec aegis256_enc_tv_template[] = {
-       {
-               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81"
-                         "\xca\xb0\x82\x21\x41\xa8\xe0\x06"
-                         "\x30\x0b\x37\xf6\xb6\x17\xe7\xb5",
-               .klen   = 32,
-               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
-                         "\x40\x6d\x59\x48\xfc\x92\x61\x03"
-                         "\x95\x61\x05\x42\x82\x50\xc0\x0c"
-                         "\x60\x16\x6f\xec\x6d\x2f\xcf\x6b",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xd5\x65\x3a\xa9\x03\x51\xd7\xaa"
-                         "\xfa\x4b\xd8\xa2\x41\x9b\xc1\xb2",
-               .rlen   = 16,
-       }, {
-               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87"
-                         "\xf4\x72\x8e\xa5\x46\x48\x62\x20"
-                         "\xf1\x38\x16\xce\x90\x76\x87\x8c",
-               .klen   = 32,
-               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
-                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09"
-                         "\xbf\x23\x11\xc6\x87\xf0\x42\x26"
-                         "\x22\x44\x4e\xc4\x47\x8e\x6e\x41",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x79",
-               .ilen   = 1,
-               .result = "\x84\xa2\x8f\xad\xdb\x8d\x2c\x16"
-                         "\x9e\x89\xd9\x06\xa6\xa8\x14\x29"
-                         "\x8b",
-               .rlen   = 17,
-       }, {
-               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e"
-                         "\x1f\x35\x9a\x29\x4b\xe8\xe4\x39"
-                         "\xb3\x66\xf5\xa6\x6a\xd5\x26\x62",
-               .klen   = 32,
-               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
-                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f"
-                         "\xe9\xe5\x1d\x4a\x8c\x90\xc4\x40"
-                         "\xe3\x71\x2d\x9c\x21\xed\x0e\x18",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47",
-               .ilen   = 15,
-               .result = "\x09\x94\x1f\xa6\x13\xc3\x74\x75"
-                         "\x17\xad\x8a\x0e\xd8\x66\x9a\x28"
-                         "\xd7\x30\x66\x09\x2a\xdc\xfa\x2a"
-                         "\x9f\x3b\xd7\xdd\x66\xd1\x2b",
-               .rlen   = 31,
-       }, {
-               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94"
-                         "\x49\xf7\xa5\xad\x50\x88\x66\x53"
-                         "\x74\x94\xd4\x7f\x44\x34\xc5\x39",
-               .klen   = 32,
-               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
-                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15"
-                         "\x14\xa8\x28\xce\x92\x30\x46\x59"
-                         "\xa4\x9f\x0b\x75\xfb\x4c\xad\xee",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
-                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .ilen   = 16,
-               .result = "\x8a\x46\xa2\x22\x8c\x03\xab\x6f"
-                         "\x54\x63\x4e\x7f\xc9\x8e\xfa\x70"
-                         "\x7b\xe5\x8d\x78\xbc\xe9\xb6\xa1"
-                         "\x29\x17\xc8\x3b\x52\xa4\x98\x72",
-               .rlen   = 32,
-       }, {
-               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a"
-                         "\x74\xb9\xb1\x32\x55\x28\xe8\x6d"
-                         "\x35\xc1\xb3\x57\x1f\x93\x64\x0f",
-               .klen   = 32,
-               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
-                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c"
-                         "\x3e\x6a\x34\x53\x97\xd0\xc8\x73"
-                         "\x66\xcd\xea\x4d\xd5\xab\x4c\xc5",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
-                         "\xd3",
-               .ilen   = 17,
-               .result = "\x71\x6b\x37\x0b\x02\x61\x28\x12"
-                         "\x83\xab\x66\x90\x84\xc7\xd1\xc5"
-                         "\xb2\x7a\xb4\x7b\xb4\xfe\x02\xb2"
-                         "\xc0\x00\x39\x13\xb5\x51\x68\x44"
-                         "\xad",
-               .rlen   = 33,
-       }, {
-               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0"
-                         "\x9e\x7c\xbc\xb6\x5b\xc8\x6a\x86"
-                         "\xf7\xef\x91\x30\xf9\xf2\x04\xe6",
-               .klen   = 32,
-               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
-                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22"
-                         "\x69\x2c\x3f\xd7\x9c\x70\x4a\x8d"
-                         "\x27\xfa\xc9\x26\xaf\x0a\xeb\x9c",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
-                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
-                         "\x88\x11\x39\x12\x1c\x3a\xbb",
-               .ilen   = 31,
-               .result = "\xaf\xa4\x34\x0d\x59\xe6\x1c\x2f"
-                         "\x06\x3b\x52\x18\x49\x75\x1b\xf0"
-                         "\x53\x09\x72\x7b\x45\x79\xe0\xbe"
-                         "\x89\x85\x23\x15\xb8\x79\x07\x4c"
-                         "\x53\x7a\x15\x37\x0a\xee\xb7\xfb"
-                         "\xc4\x1f\x12\x27\xcf\x77\x90",
-               .rlen   = 47,
-       }, {
-               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6"
-                         "\xc8\x3e\xc8\x3a\x60\x68\xec\xa0"
-                         "\xb8\x1c\x70\x08\xd3\x51\xa3\xbd",
-               .klen   = 32,
-               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
-                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28"
-                         "\x93\xef\x4b\x5b\xa1\x10\xcc\xa6"
-                         "\xe8\x28\xa8\xfe\x89\x69\x8b\x72",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
-                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
-                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
-               .ilen   = 32,
-               .result = "\xe2\xc9\x0b\x33\x31\x02\xb3\xb4"
-                         "\x33\xfe\xeb\xa8\xb7\x9b\xb2\xd7"
-                         "\xeb\x0f\x05\x2b\xba\xb3\xca\xef"
-                         "\xf6\xd1\xb6\xc0\xb9\x9b\x85\xc5"
-                         "\xbf\x7a\x3e\xcc\x31\x76\x09\x80"
-                         "\x32\x5d\xbb\xe8\x38\x0e\x77\xd3",
-               .rlen   = 48,
-       }, {
-               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad"
-                         "\xf3\x00\xd4\xbf\x65\x08\x6e\xb9"
-                         "\x7a\x4a\x4f\xe0\xad\xb0\x42\x93",
-               .klen   = 32,
-               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
-                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e"
-                         "\xbd\xb1\x57\xe0\xa6\xb0\x4e\xc0"
-                         "\xaa\x55\x87\xd6\x63\xc8\x2a\x49",
-               .assoc  = "\xd5",
-               .alen   = 1,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x96\x43\x30\xca\x6c\x4f\xd7\x12"
-                         "\xba\xd9\xb3\x18\x86\xdf\xc3\x52",
-               .rlen   = 16,
-       }, {
-               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3"
-                         "\x1d\xc3\xdf\x43\x6a\xa8\xf0\xd3"
-                         "\x3b\x77\x2e\xb9\x87\x0f\xe1\x6a",
-               .klen   = 32,
-               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34"
-                         "\xe8\x73\x62\x64\xab\x50\xd0\xda"
-                         "\x6b\x83\x66\xaf\x3e\x27\xc9\x1f",
-               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
-                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
-               .alen   = 15,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x2f\xab\x45\xe2\xa7\x46\xc5\x83"
-                         "\x11\x9f\xb0\x74\xee\xc7\x03\xdd",
-               .rlen   = 16,
-       }, {
-               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9"
-                         "\x47\x85\xeb\xc7\x6f\x48\x72\xed"
-                         "\xfc\xa5\x0d\x91\x61\x6e\x81\x40",
-               .klen   = 32,
-               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
-                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b"
-                         "\x12\x35\x6e\xe8\xb0\xf0\x52\xf3"
-                         "\x2d\xb0\x45\x87\x18\x86\x68\xf6",
-               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
-                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
-               .alen   = 16,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x16\x44\x73\x33\x5d\xf2\xb9\x04"
-                         "\x6b\x79\x98\xef\xdb\xd5\xc5\xf1",
-               .rlen   = 16,
-       }, {
-               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf"
-                         "\x72\x47\xf6\x4b\x74\xe8\xf4\x06"
-                         "\xbe\xd3\xec\x6a\x3b\xcd\x20\x17",
-               .klen   = 32,
-               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41"
-                         "\x3c\xf8\x79\x6c\xb6\x90\xd4\x0d"
-                         "\xee\xde\x23\x60\xf2\xe5\x08\xcc",
-               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
-                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
-                         "\x07",
-               .alen   = 17,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xa4\x9b\xb8\x47\xc0\xed\x7a\x45"
-                         "\x98\x54\x8c\xed\x3d\x17\xf0\xdd",
-               .rlen   = 16,
-       }, {
-               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6"
-                         "\x9c\x0a\x02\xd0\x79\x88\x76\x20"
-                         "\x7f\x00\xca\x42\x15\x2c\xbf\xed",
-               .klen   = 32,
-               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47"
-                         "\x67\xba\x85\xf1\xbb\x30\x56\x26"
-                         "\xaf\x0b\x02\x38\xcc\x44\xa7\xa3",
-               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
-                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
-                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
-                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
-               .alen   = 31,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x20\x24\xe2\x33\x5c\x60\xc9\xf0"
-                         "\xa4\x96\x2f\x0d\x53\xc2\xf8\xfc",
-               .rlen   = 16,
-       }, {
-               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc"
-                         "\xc6\xcc\x0e\x54\x7f\x28\xf8\x3a"
-                         "\x40\x2e\xa9\x1a\xf0\x8b\x5e\xc4",
-               .klen   = 32,
-               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d"
-                         "\x91\x7c\x91\x75\xc0\xd0\xd8\x40"
-                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a",
-               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
-                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
-                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
-                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
-               .alen   = 32,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x6f\x4a\xb9\xe0\xff\x51\xa3\xf1"
-                         "\xd2\x64\x3e\x66\x6a\xb2\x03\xc0",
-               .rlen   = 16,
+               .iv     = "\x01\x00\x00\x00\x0b\x0a\x09\x08"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
+               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07",
+               .alen   = 8,
+               .ptext  = "\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",
+               .plen   = 25,
+               .ctext  = "\x82\x53\x1a\x60\xcc\x24\x94\x5a"
+                         "\x4b\x82\x79\x18\x1a\xb5\xc8\x4d"
+                         "\xf2\x1c\xe7\xf9\xb7\x3f\x42\xe1"
+                         "\x97\xea\x9c\x07\xe5\x6b\x5e\xb1"
+                         "\x7e\x5f\x4e",
+               .clen   = 35,
        }, {
-               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2"
-                         "\xf1\x8e\x19\xd8\x84\xc8\x7a\x53"
-                         "\x02\x5b\x88\xf3\xca\xea\xfe\x9b",
-               .klen   = 32,
-               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
-                         "\xcc\x81\x63\xab\xae\x6b\x43\x54"
-                         "\xbb\x3f\x9c\xf9\xc5\x70\x5a\x5a"
-                         "\x32\x67\xc0\xe9\x80\x02\xe5\x50",
-               .assoc  = "\x40",
-               .alen   = 1,
-               .input  = "\x4f",
-               .ilen   = 1,
-               .result = "\x2c\xfb\xad\x7e\xbe\xa0\x9a\x5b"
-                         "\x7a\x3f\x81\xf7\xfc\x1b\x79\x83"
-                         "\xc7",
-               .rlen   = 17,
+               .key    = "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf",
+               .klen   = 16,
+               .iv     = "\x01\x00\x00\x00\x0c\x0b\x0a\x09"
+                         "\xa0\xa1\xa2\xa3\xa4\xa5\x00\x00",
+               .assoc  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b",
+               .alen   = 12,
+               .ptext  = "\x0c\x0d\x0e\x0f\x10\x11\x12\x13"
+                         "\x14\x15\x16\x17\x18\x19\x1a\x1b"
+                         "\x1c\x1d\x1e",
+               .plen   = 19,
+               .ctext  = "\x07\x34\x25\x94\x15\x77\x85\x15"
+                         "\x2b\x07\x40\x98\x33\x0a\xbb\x14"
+                         "\x1b\x94\x7b\x56\x6a\xa9\x40\x6b"
+                         "\x4d\x99\x99\x88\xdd",
+               .clen   = 29,
        }, {
-               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8"
-                         "\x1b\x50\x25\x5d\x89\x68\xfc\x6d"
-                         "\xc3\x89\x67\xcb\xa4\x49\x9d\x71",
-               .klen   = 32,
-               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a"
-                         "\xe6\x01\xa8\x7e\xca\x10\xdc\x73"
-                         "\xf4\x94\x9f\xc1\x5a\x61\x85\x27",
-               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37",
-               .alen   = 15,
-               .input  = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
-               .ilen   = 15,
-               .result = "\x1f\x7f\xca\x3c\x2b\xe7\x27\xba"
-                         "\x7e\x98\x83\x02\x34\x23\xf7\x94"
-                         "\xde\x35\xe6\x1d\x14\x18\xe5\x38"
-                         "\x14\x80\x6a\xa7\x1b\xae\x1d",
-               .rlen   = 31,
+               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
+                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
+               .klen   = 16,
+               .iv     = "\x01\x00\x33\x56\x8e\xf7\xb2\x63"
+                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
+               .assoc  = "\x63\x01\x8f\x76\xdc\x8a\x1b\xcb",
+               .alen   = 8,
+               .ptext  = "\x90\x20\xea\x6f\x91\xbd\xd8\x5a"
+                         "\xfa\x00\x39\xba\x4b\xaf\xf9\xbf"
+                         "\xb7\x9c\x70\x28\x94\x9c\xd0\xec",
+               .plen   = 24,
+               .ctext  = "\x4c\xcb\x1e\x7c\xa9\x81\xbe\xfa"
+                         "\xa0\x72\x6c\x55\xd3\x78\x06\x12"
+                         "\x98\xc8\x5c\x92\x81\x4a\xbc\x33"
+                         "\xc5\x2e\xe8\x1d\x7d\x77\xc0\x8a",
+               .clen   = 32,
        }, {
-               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf"
-                         "\x46\x13\x31\xe1\x8e\x08\x7e\x87"
-                         "\x85\xb6\x46\xa3\x7e\xa8\x3c\x48",
-               .klen   = 32,
-               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
-                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60"
-                         "\x10\xc3\xb3\x02\xcf\xb0\x5e\x8d"
-                         "\xb5\xc2\x7e\x9a\x35\xc0\x24\xfd",
-               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .alen   = 16,
-               .input  = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
-                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .ilen   = 16,
-               .result = "\x05\x86\x9e\xd7\x2b\xa3\x97\x01"
-                         "\xbe\x28\x98\x10\x6f\xe9\x61\x32"
-                         "\x96\xbb\xb1\x2e\x8f\x0c\x44\xb9"
-                         "\x46\x2d\x55\xe3\x42\x67\xf2\xaf",
-               .rlen   = 32,
+               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
+                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
+               .klen   = 16,
+               .iv     = "\x01\x00\xd5\x60\x91\x2d\x3f\x70"
+                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
+               .assoc  = "\xcd\x90\x44\xd2\xb7\x1f\xdb\x81"
+                         "\x20\xea\x60\xc0",
+               .alen   = 12,
+               .ptext  = "\x64\x35\xac\xba\xfb\x11\xa8\x2e"
+                         "\x2f\x07\x1d\x7c\xa4\xa5\xeb\xd9"
+                         "\x3a\x80\x3b\xa8\x7f",
+               .plen   = 21,
+               .ctext  = "\x00\x97\x69\xec\xab\xdf\x48\x62"
+                         "\x55\x94\xc5\x92\x51\xe6\x03\x57"
+                         "\x22\x67\x5e\x04\xc8\x47\x09\x9e"
+                         "\x5a\xe0\x70\x45\x51",
+               .clen   = 29,
        }, {
-               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5"
-                         "\x70\xd5\x3c\x65\x93\xa8\x00\xa0"
-                         "\x46\xe4\x25\x7c\x58\x08\xdb\x1e",
-               .klen   = 32,
-               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66"
-                         "\x3b\x86\xbf\x86\xd4\x50\xe0\xa7"
-                         "\x76\xef\x5c\x72\x0f\x1f\xc3\xd4",
-               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05",
-               .alen   = 17,
-               .input  = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
-                         "\xd0",
-               .ilen   = 17,
-               .result = "\x9c\xe0\x06\x7b\x86\xcf\x2e\xd8"
-                         "\x45\x65\x1b\x72\x9b\xaa\xa3\x1e"
-                         "\x87\x9d\x26\xdf\xff\x81\x11\xd2"
-                         "\x47\x41\xb9\x24\xc1\x8a\xa3\x8b"
-                         "\x55",
-               .rlen   = 33,
+               .key    = "\xd7\x82\x8d\x13\xb2\xb0\xbd\xc3"
+                         "\x25\xa7\x62\x36\xdf\x93\xcc\x6b",
+               .klen   = 16,
+               .iv     = "\x01\x00\x42\xff\xf8\xf1\x95\x1c"
+                         "\x3c\x96\x96\x76\x6c\xfa\x00\x00",
+               .assoc  = "\xd8\x5b\xc7\xe6\x9f\x94\x4f\xb8",
+               .alen   = 8,
+               .ptext  = "\x8a\x19\xb9\x50\xbc\xf7\x1a\x01"
+                         "\x8e\x5e\x67\x01\xc9\x17\x87\x65"
+                         "\x98\x09\xd6\x7d\xbe\xdd\x18",
+               .plen   = 23,
+               .ctext  = "\xbc\x21\x8d\xaa\x94\x74\x27\xb6"
+                         "\xdb\x38\x6a\x99\xac\x1a\xef\x23"
+                         "\xad\xe0\xb5\x29\x39\xcb\x6a\x63"
+                         "\x7c\xf9\xbe\xc2\x40\x88\x97\xc6"
+                         "\xba",
+               .clen   = 33,
        }, {
-               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb"
-                         "\x9a\x97\x48\xe9\x98\x48\x82\xba"
-                         "\x07\x11\x04\x54\x32\x67\x7b\xf5",
-               .klen   = 32,
-               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d"
-                         "\x65\x48\xcb\x0a\xda\xf0\x62\xc0"
-                         "\x38\x1d\x3b\x4a\xe9\x7e\x62\xaa",
-               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
-                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
-                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a",
-               .alen   = 31,
-               .input  = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
-                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
-                         "\x98\x34\xab\x37\x56\xae\x32",
-               .ilen   = 31,
-               .result = "\xa0\xc8\xde\x83\x0d\xc3\x4e\xd5"
-                         "\x69\x7f\x7a\xdd\x8c\x46\xda\xba"
-                         "\x0a\x5c\x0e\x7f\xac\xee\x02\xd2"
-                         "\xe5\x4b\x0a\xba\xb8\xa4\x7b\x66"
-                         "\xde\xae\xdb\xc2\xc0\x0b\xf7\x2b"
-                         "\xdf\xb8\xea\xd8\xa9\x38\xed",
-               .rlen   = 47,
+               /* This is taken from FIPS CAVS. */
+               .key    = "\x83\xac\x54\x66\xc2\xeb\xe5\x05"
+                         "\x2e\x01\xd1\xfc\x5d\x82\x66\x2e",
+               .klen   = 16,
+               .iv     = "\x03\x96\xac\x59\x30\x07\xa1\xe2\xa2\xc7\x55\x24\0\0\0\0",
+               .alen   = 0,
+               .ptext  = "\x19\xc8\x81\xf6\xe9\x86\xff\x93"
+                         "\x0b\x78\x67\xe5\xbb\xb7\xfc\x6e"
+                         "\x83\x77\xb3\xa6\x0c\x8c\x9f\x9c"
+                         "\x35\x2e\xad\xe0\x62\xf9\x91\xa1",
+               .plen   = 32,
+               .ctext  = "\xab\x6f\xe1\x69\x1d\x19\x99\xa8"
+                         "\x92\xa0\xc4\x6f\x7e\xe2\x8b\xb1"
+                         "\x70\xbb\x8c\xa6\x4c\x6e\x97\x8a"
+                         "\x57\x2b\xbe\x5d\x98\xa6\xb1\x32"
+                         "\xda\x24\xea\xd9\xa1\x39\x98\xfd"
+                         "\xa4\xbe\xd9\xf2\x1a\x6d\x22\xa8",
+               .clen   = 48,
        }, {
-               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1"
-                         "\xc5\x5a\x53\x6e\x9d\xe8\x04\xd4"
-                         "\xc9\x3f\xe2\x2d\x0c\xc6\x1a\xcb",
-               .klen   = 32,
-               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73"
-                         "\x8f\x0a\xd6\x8f\xdf\x90\xe4\xda"
-                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81",
-               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
+               .key    = "\x1e\x2c\x7e\x01\x41\x9a\xef\xc0"
+                         "\x0d\x58\x96\x6e\x5c\xa2\x4b\xd3",
+               .klen   = 16,
+               .iv     = "\x03\x4f\xa3\x19\xd3\x01\x5a\xd8"
+                         "\x30\x60\x15\x56\x00\x00\x00\x00",
+               .assoc  = "\xda\xe6\x28\x9c\x45\x2d\xfd\x63"
+                         "\x5e\xda\x4c\xb6\xe6\xfc\xf9\xb7"
+                         "\x0c\x56\xcb\xe4\xe0\x05\x7a\xe1"
+                         "\x0a\x63\x09\x78\xbc\x2c\x55\xde",
                .alen   = 32,
-               .input  = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
-                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
-                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
-               .ilen   = 32,
-               .result = "\xd3\x68\x14\x70\x3c\x01\x43\x86"
-                         "\x02\xab\xbe\x75\xaa\xe7\xf5\x53"
-                         "\x5c\x05\xbd\x9b\x19\xbb\x2a\x61"
-                         "\x8f\x69\x05\x75\x8e\xca\x60\x0c"
-                         "\x5b\xa2\x48\x61\x32\x74\x11\x2b"
-                         "\xf6\xcf\x06\x78\x6f\x78\x1a\x4a",
-               .rlen   = 48,
+               .ptext  = "\x87\xa3\x36\xfd\x96\xb3\x93\x78"
+                         "\xa9\x28\x63\xba\x12\xa3\x14\x85"
+                         "\x57\x1e\x06\xc9\x7b\x21\xef\x76"
+                         "\x7f\x38\x7e\x8e\x29\xa4\x3e\x7e",
+               .plen   = 32,
+               .ctext  = "\x8a\x1e\x11\xf0\x02\x6b\xe2\x19"
+                         "\xfc\x70\xc4\x6d\x8e\xb7\x99\xab"
+                         "\xc5\x4b\xa2\xac\xd3\xf3\x48\xff"
+                         "\x3b\xb5\xce\x53\xef\xde\xbb\x02"
+                         "\xa9\x86\x15\x6c\x13\xfe\xda\x0a"
+                         "\x22\xb8\x29\x3d\xd8\x39\x9a\x23",
+               .clen   = 48,
        }, {
-               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7"
-                         "\xef\x1c\x5f\xf2\xa3\x88\x86\xed"
-                         "\x8a\x6d\xc1\x05\xe7\x25\xb9\xa2",
-               .klen   = 32,
-               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79"
-                         "\xba\xcd\xe2\x13\xe4\x30\x66\xf4"
-                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58",
-               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d",
-               .alen   = 33,
-               .input  = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
-                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
-                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
-                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
-                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
-                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
-                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
-                         "\xbd",
-               .ilen   = 65,
-               .result = "\x07\x0a\x35\xb0\x82\x03\x5a\xd2"
-                         "\x15\x3a\x6c\x72\x83\x9b\xb1\x75"
-                         "\xea\xf2\xfc\xff\xc6\xf1\x13\xa4"
-                         "\x1a\x93\x33\x79\x97\x82\x81\xc0"
-                         "\x96\xc2\x00\xab\x39\xae\xa1\x62"
-                         "\x53\xa3\x86\xc9\x07\x8c\xaf\x22"
-                         "\x47\x31\x29\xca\x4a\x95\xf5\xd5"
-                         "\x20\x63\x5a\x54\x80\x2c\x4a\x63"
-                         "\xfb\x18\x73\x31\x4f\x08\x21\x5d"
-                         "\x20\xe9\xc3\x7e\xea\x25\x77\x3a"
-                         "\x65",
-               .rlen   = 81,
+               .key    = "\xf4\x6b\xc2\x75\x62\xfe\xb4\xe1"
+                         "\xa3\xf0\xff\xdd\x4e\x4b\x12\x75"
+                         "\x53\x14\x73\x66\x8d\x88\xf6\x80",
+               .klen   = 24,
+               .iv     = "\x03\xa0\x20\x35\x26\xf2\x21\x8d"
+                         "\x50\x20\xda\xe2\x00\x00\x00\x00",
+               .assoc  = "\x5b\x9e\x13\x67\x02\x5e\xef\xc1"
+                         "\x6c\xf9\xd7\x1e\x52\x8f\x7a\x47"
+                         "\xe9\xd4\xcf\x20\x14\x6e\xf0\x2d"
+                         "\xd8\x9e\x2b\x56\x10\x23\x56\xe7",
+               .alen   = 32,
+               .ctext  = "\x36\xea\x7a\x70\x08\xdc\x6a\xbc"
+                         "\xad\x0c\x7a\x63\xf6\x61\xfd\x9b",
+               .clen   = 16,
+       }, {
+               .key    = "\x56\xdf\x5c\x8f\x26\x3f\x0e\x42"
+                         "\xef\x7a\xd3\xce\xfc\x84\x60\x62"
+                         "\xca\xb4\x40\xaf\x5f\xc9\xc9\x01",
+               .klen   = 24,
+               .iv     = "\x03\xd6\x3c\x8c\x86\x84\xb6\xcd"
+                         "\xef\x09\x2e\x94\x00\x00\x00\x00",
+               .assoc  = "\x02\x65\x78\x3c\xe9\x21\x30\x91"
+                         "\xb1\xb9\xda\x76\x9a\x78\x6d\x95"
+                         "\xf2\x88\x32\xa3\xf2\x50\xcb\x4c"
+                         "\xe3\x00\x73\x69\x84\x69\x87\x79",
+               .alen   = 32,
+               .ptext  = "\x9f\xd2\x02\x4b\x52\x49\x31\x3c"
+                         "\x43\x69\x3a\x2d\x8e\x70\xad\x7e"
+                         "\xe0\xe5\x46\x09\x80\x89\x13\xb2"
+                         "\x8c\x8b\xd9\x3f\x86\xfb\xb5\x6b",
+               .plen   = 32,
+               .ctext  = "\x39\xdf\x7c\x3c\x5a\x29\xb9\x62"
+                         "\x5d\x51\xc2\x16\xd8\xbd\x06\x9f"
+                         "\x9b\x6a\x09\x70\xc1\x51\x83\xc2"
+                         "\x66\x88\x1d\x4f\x9a\xda\xe0\x1e"
+                         "\xc7\x79\x11\x58\xe5\x6b\x20\x40"
+                         "\x7a\xea\x46\x42\x8b\xe4\x6f\xe1",
+               .clen   = 48,
        }, {
-               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe"
-                         "\x19\xde\x6b\x76\xa8\x28\x08\x07"
-                         "\x4b\x9a\xa0\xdd\xc1\x84\x58\x79",
+               .key    = "\xe0\x8d\x99\x71\x60\xd7\x97\x1a"
+                         "\xbd\x01\x99\xd5\x8a\xdf\x71\x3a"
+                         "\xd3\xdf\x24\x4b\x5e\x3d\x4b\x4e"
+                         "\x30\x7a\xb9\xd8\x53\x0a\x5e\x2b",
                .klen   = 32,
-               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f"
-                         "\xe4\x8f\xed\x97\xe9\xd0\xe8\x0d"
-                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e",
-               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .alen   = 65,
-               .input  = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
-                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
-                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
-                         "\x2f",
-               .ilen   = 33,
-               .result = "\x33\xc1\xda\xfa\x15\x21\x07\x8e"
-                         "\x93\x68\xea\x64\x7b\x3d\x4b\x6b"
-                         "\x71\x5e\x5e\x6b\x92\xaa\x65\xc2"
-                         "\x7a\x2a\xc1\xa9\x0a\xa1\x24\x81"
-                         "\x26\x3a\x5a\x09\xe8\xce\x73\x72"
-                         "\xde\x7b\x58\x9e\x85\xb9\xa4\x28"
-                         "\xda",
-               .rlen   = 49,
+               .iv     = "\x03\x1e\x29\x91\xad\x8e\xc1\x53"
+                         "\x0a\xcf\x2d\xbe\x00\x00\x00\x00",
+               .assoc  = "\x19\xb6\x1f\x57\xc4\xf3\xf0\x8b"
+                         "\x78\x2b\x94\x02\x29\x0f\x42\x27"
+                         "\x6b\x75\xcb\x98\x34\x08\x7e\x79"
+                         "\xe4\x3e\x49\x0d\x84\x8b\x22\x87",
+               .alen   = 32,
+               .ptext  = "\xe1\xd9\xd8\x13\xeb\x3a\x75\x3f"
+                         "\x9d\xbd\x5f\x66\xbe\xdc\xbb\x66"
+                         "\xbf\x17\x99\x62\x4a\x39\x27\x1f"
+                         "\x1d\xdc\x24\xae\x19\x2f\x98\x4c",
+               .plen   = 32,
+               .ctext  = "\x19\xb8\x61\x33\x45\x2b\x43\x96"
+                         "\x6f\x51\xd0\x20\x30\x7d\x9b\xc6"
+                         "\x26\x3d\xf8\xc9\x65\x16\xa8\x9f"
+                         "\xf0\x62\x17\x34\xf2\x1e\x8d\x75"
+                         "\x4e\x13\xcc\xc0\xc3\x2a\x54\x2d",
+               .clen   = 40,
        }, {
-               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04"
-                         "\x44\xa1\x76\xfb\xad\xc8\x8a\x21"
-                         "\x0d\xc8\x7f\xb6\x9b\xe3\xf8\x4f",
+               .key    = "\x7c\xc8\x18\x3b\x8d\x99\xe0\x7c"
+                         "\x45\x41\xb8\xbd\x5c\xa7\xc2\x32"
+                         "\x8a\xb8\x02\x59\xa4\xfe\xa9\x2c"
+                         "\x09\x75\x9a\x9b\x3c\x9b\x27\x39",
                .klen   = 32,
-               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
-                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85"
-                         "\x0e\x51\xf9\x1c\xee\x70\x6a\x27"
-                         "\x3d\xd3\xb7\xac\x51\xfa\xdf\x05",
-               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .alen   = 16,
-               .input  = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
-                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .ilen   = 16,
-               .result = "\x3e\xf8\x86\x3d\x39\xf8\x96\x02"
-                         "\x0f\xdf\xc9\x6e\x37\x1e\x57\x99"
-                         "\x07\x2a\x1a\xac\xd1\xda\xfd\x3b"
-                         "\xc7\xff\xbd\xbc\x85\x09\x0b",
-               .rlen   = 31,
+               .iv     = "\x03\xf9\xd9\x4e\x63\xb5\x3d\x9d"
+                         "\x43\xf6\x1e\x50\0\0\0\0",
+               .assoc  = "\x57\xf5\x6b\x8b\x57\x5c\x3d\x3b"
+                         "\x13\x02\x01\x0c\x83\x4c\x96\x35"
+                         "\x8e\xd6\x39\xcf\x7d\x14\x9b\x94"
+                         "\xb0\x39\x36\xe6\x8f\x57\xe0\x13",
+               .alen   = 32,
+               .ptext  = "\x3b\x6c\x29\x36\xb6\xef\x07\xa6"
+                         "\x83\x72\x07\x4f\xcf\xfa\x66\x89"
+                         "\x5f\xca\xb1\xba\xd5\x8f\x2c\x27"
+                         "\x30\xdb\x75\x09\x93\xd4\x65\xe4",
+               .plen   = 32,
+               .ctext  = "\xb0\x88\x5a\x33\xaa\xe5\xc7\x1d"
+                         "\x85\x23\xc7\xc6\x2f\xf4\x1e\x3d"
+                         "\xcc\x63\x44\x25\x07\x78\x4f\x9e"
+                         "\x96\xb8\x88\xeb\xbc\x48\x1f\x06"
+                         "\x39\xaf\x39\xac\xd8\x4a\x80\x39"
+                         "\x7b\x72\x8a\xf7",
+               .clen   = 44,
        }, {
-               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a"
-                         "\x6e\x63\x82\x7f\xb2\x68\x0c\x3a"
-                         "\xce\xf5\x5e\x8e\x75\x42\x97\x26",
+               .key    = "\xab\xd0\xe9\x33\x07\x26\xe5\x83"
+                         "\x8c\x76\x95\xd4\xb6\xdc\xf3\x46"
+                         "\xf9\x8f\xad\xe3\x02\x13\x83\x77"
+                         "\x3f\xb0\xf1\xa1\xa1\x22\x0f\x2b",
                .klen   = 32,
-               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
-                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c"
-                         "\x39\x14\x05\xa0\xf3\x10\xec\x41"
-                         "\xff\x01\x95\x84\x2b\x59\x7f\xdb",
-               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .alen   = 16,
-               .input  = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
-                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .ilen   = 16,
-               .result = "\x2f\xc4\xd8\x0d\xa6\x07\xef\x2e"
-                         "\x6c\xd9\x84\x63\x70\x97\x61\x37"
-                         "\x08\x2f\x16\x90\x9e\x62\x30\x0d"
-                         "\x62\xd5\xc8\xf0\x46\x1a",
-               .rlen   = 30,
+               .iv     = "\x03\x24\xa7\x8b\x07\xcb\xcc\x0e"
+                         "\xe6\x33\xbf\xf5\x00\x00\x00\x00",
+               .assoc  = "\xd4\xdb\x30\x1d\x03\xfe\xfd\x5f"
+                         "\x87\xd4\x8c\xb6\xb6\xf1\x7a\x5d"
+                         "\xab\x90\x65\x8d\x8e\xca\x4d\x4f"
+                         "\x16\x0c\x40\x90\x4b\xc7\x36\x73",
+               .alen   = 32,
+               .ptext  = "\xf5\xc6\x7d\x48\xc1\xb7\xe6\x92"
+                         "\x97\x5a\xca\xc4\xa9\x6d\xf9\x3d"
+                         "\x6c\xde\xbc\xf1\x90\xea\x6a\xb2"
+                         "\x35\x86\x36\xaf\x5c\xfe\x4b\x3a",
+               .plen   = 32,
+               .ctext  = "\x83\x6f\x40\x87\x72\xcf\xc1\x13"
+                         "\xef\xbb\x80\x21\x04\x6c\x58\x09"
+                         "\x07\x1b\xfc\xdf\xc0\x3f\x5b\xc7"
+                         "\xe0\x79\xa8\x6e\x71\x7c\x3f\xcf"
+                         "\x5c\xda\xb2\x33\xe5\x13\xe2\x0d"
+                         "\x74\xd1\xef\xb5\x0f\x3a\xb5\xf8",
+               .clen   = 48,
        }, {
-               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10"
-                         "\x98\x25\x8d\x03\xb7\x08\x8e\x54"
-                         "\x90\x23\x3d\x67\x4f\xa1\x36\xfc",
-               .klen   = 32,
-               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
-                         "\xd5\x07\x58\x59\x72\xd7\xde\x92"
-                         "\x63\xd6\x10\x24\xf8\xb0\x6e\x5a"
-                         "\xc0\x2e\x74\x5d\x06\xb8\x1e\xb2",
-               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .alen   = 16,
-               .input  = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .ilen   = 16,
-               .result = "\xce\xf3\x17\x87\x49\xc2\x00\x46"
-                         "\xc6\x12\x5c\x8f\x81\x38\xaa\x55"
-                         "\xf8\x67\x75\xf1\x75\xe3\x2a\x24",
-               .rlen   = 24,
-       },
-};
-
-static const struct aead_testvec aegis256_dec_tv_template[] = {
-       {
-               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81"
-                         "\xca\xb0\x82\x21\x41\xa8\xe0\x06"
-                         "\x30\x0b\x37\xf6\xb6\x17\xe7\xb5",
-               .klen   = 32,
-               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
-                         "\x40\x6d\x59\x48\xfc\x92\x61\x03"
-                         "\x95\x61\x05\x42\x82\x50\xc0\x0c"
-                         "\x60\x16\x6f\xec\x6d\x2f\xcf\x6b",
-               .assoc  = "",
+               /* This is taken from FIPS CAVS. */
+               .key    = "\xab\x2f\x8a\x74\xb7\x1c\xd2\xb1"
+                         "\xff\x80\x2e\x48\x7d\x82\xf8\xb9",
+               .klen   = 16,
+               .iv     = "\x03\xc6\xfb\x7d\x80\x0d\x13\xab"
+                         "\xd8\xa6\xb2\xd8\x00\x00\x00\x00",
                .alen   = 0,
-               .input  = "\xd5\x65\x3a\xa9\x03\x51\xd7\xaa"
-                         "\xfa\x4b\xd8\xa2\x41\x9b\xc1\xb2",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "\x00",
+               .plen   = 0,
+               .ctext  = "\xd5\xe8\x93\x9f\xc7\x89\x2e\x2b",
+               .clen   = 8,
+               .novrfy = 1,
        }, {
-               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87"
-                         "\xf4\x72\x8e\xa5\x46\x48\x62\x20"
-                         "\xf1\x38\x16\xce\x90\x76\x87\x8c",
-               .klen   = 32,
-               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
-                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09"
-                         "\xbf\x23\x11\xc6\x87\xf0\x42\x26"
-                         "\x22\x44\x4e\xc4\x47\x8e\x6e\x41",
-               .assoc  = "",
+               .key    = "\xab\x2f\x8a\x74\xb7\x1c\xd2\xb1"
+                         "\xff\x80\x2e\x48\x7d\x82\xf8\xb9",
+               .klen   = 16,
+               .iv     = "\x03\xaf\x94\x87\x78\x35\x82\x81"
+                         "\x7f\x88\x94\x68\x00\x00\x00\x00",
                .alen   = 0,
-               .input  = "\x84\xa2\x8f\xad\xdb\x8d\x2c\x16"
-                         "\x9e\x89\xd9\x06\xa6\xa8\x14\x29"
-                         "\x8b",
-               .ilen   = 17,
-               .result = "\x79",
-               .rlen   = 1,
+               .ptext  = "\x00",
+               .plen   = 0,
+               .ctext  = "\x41\x3c\xb8\x87\x73\xcb\xf3\xf3",
+               .clen   = 8,
        }, {
-               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e"
-                         "\x1f\x35\x9a\x29\x4b\xe8\xe4\x39"
-                         "\xb3\x66\xf5\xa6\x6a\xd5\x26\x62",
-               .klen   = 32,
-               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
-                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f"
-                         "\xe9\xe5\x1d\x4a\x8c\x90\xc4\x40"
-                         "\xe3\x71\x2d\x9c\x21\xed\x0e\x18",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x09\x94\x1f\xa6\x13\xc3\x74\x75"
-                         "\x17\xad\x8a\x0e\xd8\x66\x9a\x28"
-                         "\xd7\x30\x66\x09\x2a\xdc\xfa\x2a"
-                         "\x9f\x3b\xd7\xdd\x66\xd1\x2b",
-               .ilen   = 31,
-               .result = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47",
-               .rlen   = 15,
+               .key    = "\x61\x0e\x8c\xae\xe3\x23\xb6\x38"
+                         "\x76\x1c\xf6\x3a\x67\xa3\x9c\xd8",
+               .klen   = 16,
+               .iv     = "\x03\xc6\xfb\x7d\x80\x0d\x13\xab"
+                         "\xd8\xa6\xb2\xd8\x00\x00\x00\x00",
+               .assoc  = "\xf3\x94\x87\x78\x35\x82\x81\x7f"
+                         "\x88\x94\x68\xb1\x78\x6b\x2b\xd6"
+                         "\x04\x1f\x4e\xed\x78\xd5\x33\x66"
+                         "\xd8\x94\x99\x91\x81\x54\x62\x57",
+               .alen   = 32,
+               .ptext  = "\x50\x82\x3e\x07\xe2\x1e\xb6\xfb"
+                         "\x33\xe4\x73\xce\xd2\xfb\x95\x79"
+                         "\xe8\xb4\xb5\x77\x11\x10\x62\x6f"
+                         "\x6a\x82\xd1\x13\xec\xf5\xd0\x48",
+               .plen   = 32,
+               .ctext  = "\xf0\x7c\x29\x02\xae\x1c\x2f\x55"
+                         "\xd0\xd1\x3d\x1a\xa3\x6d\xe4\x0a"
+                         "\x86\xb0\x87\x6b\x62\x33\x8c\x34"
+                         "\xce\xab\x57\xcc\x79\x0b\xe0\x6f"
+                         "\x5c\x3e\x48\x1f\x6c\x46\xf7\x51"
+                         "\x8b\x84\x83\x2a\xc1\x05\xb8\xc5",
+               .clen   = 48,
+               .novrfy = 1,
        }, {
-               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94"
-                         "\x49\xf7\xa5\xad\x50\x88\x66\x53"
-                         "\x74\x94\xd4\x7f\x44\x34\xc5\x39",
-               .klen   = 32,
-               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
-                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15"
-                         "\x14\xa8\x28\xce\x92\x30\x46\x59"
-                         "\xa4\x9f\x0b\x75\xfb\x4c\xad\xee",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x8a\x46\xa2\x22\x8c\x03\xab\x6f"
-                         "\x54\x63\x4e\x7f\xc9\x8e\xfa\x70"
-                         "\x7b\xe5\x8d\x78\xbc\xe9\xb6\xa1"
-                         "\x29\x17\xc8\x3b\x52\xa4\x98\x72",
-               .ilen   = 32,
-               .result = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
-                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .rlen   = 16,
+               .key    = "\x61\x0e\x8c\xae\xe3\x23\xb6\x38"
+                         "\x76\x1c\xf6\x3a\x67\xa3\x9c\xd8",
+               .klen   = 16,
+               .iv     = "\x03\x05\xe0\xc9\x0f\xed\x34\xea"
+                         "\x97\xd4\x3b\xdf\x00\x00\x00\x00",
+               .assoc  = "\x49\x5c\x50\x1f\x1d\x94\xcc\x81"
+                         "\xba\xb7\xb6\x03\xaf\xa5\xc1\xa1"
+                         "\xd8\x5c\x42\x68\xe0\x6c\xda\x89"
+                         "\x05\xac\x56\xac\x1b\x2a\xd3\x86",
+               .alen   = 32,
+               .ptext  = "\x75\x05\xbe\xc2\xd9\x1e\xde\x60"
+                         "\x47\x3d\x8c\x7d\xbd\xb5\xd9\xb7"
+                         "\xf2\xae\x61\x05\x8f\x82\x24\x3f"
+                         "\x9c\x67\x91\xe1\x38\x4f\xe4\x0c",
+               .plen   = 32,
+               .ctext  = "\x39\xbe\x7d\x15\x62\x77\xf3\x3c"
+                         "\xad\x83\x52\x6d\x71\x03\x25\x1c"
+                         "\xed\x81\x3a\x9a\x16\x7d\x19\x80"
+                         "\x72\x04\x72\xd0\xf6\xff\x05\x0f"
+                         "\xb7\x14\x30\x00\x32\x9e\xa0\xa6"
+                         "\x9e\x5a\x18\xa1\xb8\xfe\xdb\xd3",
+               .clen   = 48,
+       }, {
+               .key    = "\x39\xbb\xa7\xbe\x59\x97\x9e\x73"
+                         "\xa2\xbc\x6b\x98\xd7\x75\x7f\xe3"
+                         "\xa4\x48\x93\x39\x26\x71\x4a\xc6",
+               .klen   = 24,
+               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
+                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
+               .assoc  = "\x44\xa6\x2c\x05\xe9\xe1\x43\xb1"
+                         "\x58\x7c\xf2\x5c\x6d\x39\x0a\x64"
+                         "\xa4\xf0\x13\x05\xd1\x77\x99\x67"
+                         "\x11\xc4\xc6\xdb\x00\x56\x36\x61",
+               .alen   = 32,
+               .ptext  = "\x00",
+               .plen   = 0,
+               .ctext  = "\x71\x99\xfa\xf4\x44\x12\x68\x9b",
+               .clen   = 8,
+       }, {
+               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
+                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
+                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba",
+               .klen   = 24,
+               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
+                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
+               .assoc  = "\x44\xa6\x2c\x05\xe9\xe1\x43\xb1"
+                         "\x58\x7c\xf2\x5c\x6d\x39\x0a\x64"
+                         "\xa4\xf0\x13\x05\xd1\x77\x99\x67"
+                         "\x11\xc4\xc6\xdb\x00\x56\x36\x61",
+               .alen   = 32,
+               .ptext  = "\x85\x34\x66\x42\xc8\x92\x0f\x36"
+                         "\x58\xe0\x6b\x91\x3c\x98\x5c\xbb"
+                         "\x0a\x85\xcc\x02\xad\x7a\x96\xe9"
+                         "\x65\x43\xa4\xc3\x0f\xdc\x55\x81",
+               .plen   = 32,
+               .ctext  = "\xfb\xe5\x5d\x34\xbe\xe5\xe8\xe7"
+                         "\x5a\xef\x2f\xbf\x1f\x7f\xd4\xb2"
+                         "\x66\xca\x61\x1e\x96\x7a\x61\xb3"
+                         "\x1c\x16\x45\x52\xba\x04\x9c\x9f"
+                         "\xb1\xd2\x40\xbc\x52\x7c\x6f\xb1",
+               .clen   = 40,
        }, {
-               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a"
-                         "\x74\xb9\xb1\x32\x55\x28\xe8\x6d"
-                         "\x35\xc1\xb3\x57\x1f\x93\x64\x0f",
-               .klen   = 32,
-               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
-                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c"
-                         "\x3e\x6a\x34\x53\x97\xd0\xc8\x73"
-                         "\x66\xcd\xea\x4d\xd5\xab\x4c\xc5",
-               .assoc  = "",
-               .alen   = 0,
-               .input  = "\x71\x6b\x37\x0b\x02\x61\x28\x12"
-                         "\x83\xab\x66\x90\x84\xc7\xd1\xc5"
-                         "\xb2\x7a\xb4\x7b\xb4\xfe\x02\xb2"
-                         "\xc0\x00\x39\x13\xb5\x51\x68\x44"
-                         "\xad",
-               .ilen   = 33,
-               .result = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
-                         "\xd3",
-               .rlen   = 17,
+               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
+                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
+                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba",
+               .klen   = 24,
+               .iv     = "\x03\xd1\xfc\x57\x9c\xfe\xb8\x9c"
+                         "\xad\x71\xaa\x1f\x00\x00\x00\x00",
+               .assoc  = "\x86\x67\xa5\xa9\x14\x5f\x0d\xc6"
+                         "\xff\x14\xc7\x44\xbf\x6c\x3a\xc3"
+                         "\xff\xb6\x81\xbd\xe2\xd5\x06\xc7"
+                         "\x3c\xa1\x52\x13\x03\x8a\x23\x3a",
+               .alen   = 32,
+               .ptext  = "\x02\x87\x4d\x28\x80\x6e\xb2\xed"
+                         "\x99\x2a\xa8\xca\x04\x25\x45\x90"
+                         "\x1d\xdd\x5a\xd9\xe4\xdb\x9c\x9c"
+                         "\x49\xe9\x01\xfe\xa7\x80\x6d\x6b",
+               .plen   = 32,
+               .ctext  = "\x3f\x66\xb0\x9d\xe5\x4b\x38\x00"
+                         "\xc6\x0e\x6e\xe5\xd6\x98\xa6\x37"
+                         "\x8c\x26\x33\xc6\xb2\xa2\x17\xfa"
+                         "\x64\x19\xc0\x30\xd7\xfc\x14\x6b"
+                         "\xe3\x33\xc2\x04\xb0\x37\xbe\x3f"
+                         "\xa9\xb4\x2d\x68\x03\xa3\x44\xef",
+               .clen   = 48,
+               .novrfy = 1,
        }, {
-               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0"
-                         "\x9e\x7c\xbc\xb6\x5b\xc8\x6a\x86"
-                         "\xf7\xef\x91\x30\xf9\xf2\x04\xe6",
+               .key    = "\xa4\x4b\x54\x29\x0a\xb8\x6d\x01"
+                         "\x5b\x80\x2a\xcf\x25\xc4\xb7\x5c"
+                         "\x20\x2c\xad\x30\xc2\x2b\x41\xfb"
+                         "\x0e\x85\xbc\x33\xad\x0f\x2b\xff",
                .klen   = 32,
-               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
-                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22"
-                         "\x69\x2c\x3f\xd7\x9c\x70\x4a\x8d"
-                         "\x27\xfa\xc9\x26\xaf\x0a\xeb\x9c",
-               .assoc  = "",
+               .iv     = "\x03\xee\x49\x83\xe9\xa9\xff\xe9"
+                         "\x57\xba\xfd\x9e\x00\x00\x00\x00",
                .alen   = 0,
-               .input  = "\xaf\xa4\x34\x0d\x59\xe6\x1c\x2f"
-                         "\x06\x3b\x52\x18\x49\x75\x1b\xf0"
-                         "\x53\x09\x72\x7b\x45\x79\xe0\xbe"
-                         "\x89\x85\x23\x15\xb8\x79\x07\x4c"
-                         "\x53\x7a\x15\x37\x0a\xee\xb7\xfb"
-                         "\xc4\x1f\x12\x27\xcf\x77\x90",
-               .ilen   = 47,
-               .result = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
-                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
-                         "\x88\x11\x39\x12\x1c\x3a\xbb",
-               .rlen   = 31,
+               .ptext  = "\x00",
+               .plen   = 0,
+               .ctext  = "\x1f\xb8\x8f\xa3\xdd\x54\x00\xf2",
+               .clen   = 8,
        }, {
-               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6"
-                         "\xc8\x3e\xc8\x3a\x60\x68\xec\xa0"
-                         "\xb8\x1c\x70\x08\xd3\x51\xa3\xbd",
+               .key    = "\x39\xbb\xa7\xbe\x59\x97\x9e\x73"
+                         "\xa2\xbc\x6b\x98\xd7\x75\x7f\xe3"
+                         "\xa4\x48\x93\x39\x26\x71\x4a\xc6"
+                         "\xae\x8f\x11\x4c\xc2\x9c\x4a\xbb",
                .klen   = 32,
-               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
-                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28"
-                         "\x93\xef\x4b\x5b\xa1\x10\xcc\xa6"
-                         "\xe8\x28\xa8\xfe\x89\x69\x8b\x72",
-               .assoc  = "",
+               .iv     = "\x03\x85\x34\x66\x42\xc8\x92\x0f"
+                         "\x36\x58\xe0\x6b\x00\x00\x00\x00",
                .alen   = 0,
-               .input  = "\xe2\xc9\x0b\x33\x31\x02\xb3\xb4"
-                         "\x33\xfe\xeb\xa8\xb7\x9b\xb2\xd7"
-                         "\xeb\x0f\x05\x2b\xba\xb3\xca\xef"
-                         "\xf6\xd1\xb6\xc0\xb9\x9b\x85\xc5"
-                         "\xbf\x7a\x3e\xcc\x31\x76\x09\x80"
-                         "\x32\x5d\xbb\xe8\x38\x0e\x77\xd3",
-               .ilen   = 48,
-               .result = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
-                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
-                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
-               .rlen   = 32,
-       }, {
-               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad"
-                         "\xf3\x00\xd4\xbf\x65\x08\x6e\xb9"
-                         "\x7a\x4a\x4f\xe0\xad\xb0\x42\x93",
-               .klen   = 32,
-               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
-                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e"
-                         "\xbd\xb1\x57\xe0\xa6\xb0\x4e\xc0"
-                         "\xaa\x55\x87\xd6\x63\xc8\x2a\x49",
-               .assoc  = "\xd5",
-               .alen   = 1,
-               .input  = "\x96\x43\x30\xca\x6c\x4f\xd7\x12"
-                         "\xba\xd9\xb3\x18\x86\xdf\xc3\x52",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "\xdc\x56\xf2\x71\xb0\xb1\xa0\x6c"
+                         "\xf0\x97\x3a\xfb\x6d\xe7\x32\x99"
+                         "\x3e\xaf\x70\x5e\xb2\x4d\xea\x39"
+                         "\x89\xd4\x75\x7a\x63\xb1\xda\x93",
+               .plen   = 32,
+               .ctext  = "\x48\x01\x5e\x02\x24\x04\x66\x47"
+                         "\xa1\xea\x6f\xaf\xe8\xfc\xfb\xdd"
+                         "\xa5\xa9\x87\x8d\x84\xee\x2e\x77"
+                         "\xbb\x86\xb9\xf5\x5c\x6c\xff\xf6"
+                         "\x72\xc3\x8e\xf7\x70\xb1\xb2\x07"
+                         "\xbc\xa8\xa3\xbd\x83\x7c\x1d\x2a",
+               .clen   = 48,
+               .novrfy = 1,
        }, {
-               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3"
-                         "\x1d\xc3\xdf\x43\x6a\xa8\xf0\xd3"
-                         "\x3b\x77\x2e\xb9\x87\x0f\xe1\x6a",
+               .key    = "\x58\x5d\xa0\x96\x65\x1a\x04\xd7"
+                         "\x96\xe5\xc5\x68\xaa\x95\x35\xe0"
+                         "\x29\xa0\xba\x9e\x48\x78\xd1\xba"
+                         "\x0d\x1a\x53\x3b\xb5\xe3\xf8\x8b",
                .klen   = 32,
-               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34"
-                         "\xe8\x73\x62\x64\xab\x50\xd0\xda"
-                         "\x6b\x83\x66\xaf\x3e\x27\xc9\x1f",
-               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
-                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
-               .alen   = 15,
-               .input  = "\x2f\xab\x45\xe2\xa7\x46\xc5\x83"
-                         "\x11\x9f\xb0\x74\xee\xc7\x03\xdd",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .iv     = "\x03\xcf\x76\x3f\xd9\x95\x75\x8f"
+                         "\x44\x89\x40\x7b\x00\x00\x00\x00",
+               .assoc  = "\x8f\x86\x6c\x4d\x1d\xc5\x39\x88"
+                         "\xc8\xf3\x5c\x52\x10\x63\x6f\x2b"
+                         "\x8a\x2a\xc5\x6f\x30\x23\x58\x7b"
+                         "\xfb\x36\x03\x11\xb4\xd9\xf2\xfe",
+               .alen   = 32,
+               .ptext  = "\xc2\x54\xc8\xde\x78\x87\x77\x40"
+                         "\x49\x71\xe4\xb7\xe7\xcb\x76\x61"
+                         "\x0a\x41\xb9\xe9\xc0\x76\x54\xab"
+                         "\x04\x49\x3b\x19\x93\x57\x25\x5d",
+               .plen   = 32,
+               .ctext  = "\x48\x58\xd6\xf3\xad\x63\x58\xbf"
+                         "\xae\xc7\x5e\xae\x83\x8f\x7b\xe4"
+                         "\x78\x5c\x4c\x67\x71\x89\x94\xbf"
+                         "\x47\xf1\x63\x7e\x1c\x59\xbd\xc5"
+                         "\x7f\x44\x0a\x0c\x01\x18\x07\x92"
+                         "\xe1\xd3\x51\xce\x32\x6d\x0c\x5b",
+               .clen   = 48,
+       },
+};
+
+/*
+ * rfc4309 refers to section 8 of rfc3610 for test vectors, but they all
+ * use a 13-byte nonce, we only support an 11-byte nonce.  Worse,
+ * they use AD lengths which are not valid ESP header lengths.
+ *
+ * These vectors are copied/generated from the ones for rfc4106 with
+ * the key truncated by one byte..
+ */
+static const struct aead_testvec aes_ccm_rfc4309_tv_template[] = {
+       { /* Generated using Crypto++ */
+               .key    = zeroed_string,
+               .klen   = 19,
+               .iv     = zeroed_string,
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .assoc  = zeroed_string,
+               .alen   = 16,
+               .ctext  = "\x2E\x9A\xCA\x6B\xDA\x54\xFC\x6F"
+                         "\x12\x50\xE8\xDE\x81\x3C\x63\x08"
+                         "\x1A\x22\xBA\x75\xEE\xD4\xD5\xB5"
+                         "\x27\x50\x01\xAC\x03\x33\x39\xFB",
+               .clen   = 32,
+       },{
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .ptext  = zeroed_string,
+               .plen   = 16,
+               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .alen   = 16,
+               .ctext  = "\xCF\xB9\x99\x17\xC8\x86\x0E\x7F"
+                         "\x7E\x76\xF8\xE6\xF8\xCC\x1F\x17"
+                         "\x6A\xE0\x53\x9F\x4B\x73\x7E\xDA"
+                         "\x08\x09\x4E\xC4\x1E\xAD\xC6\xB0",
+               .clen   = 32,
+
        }, {
-               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9"
-                         "\x47\x85\xeb\xc7\x6f\x48\x72\xed"
-                         "\xfc\xa5\x0d\x91\x61\x6e\x81\x40",
-               .klen   = 32,
-               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
-                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b"
-                         "\x12\x35\x6e\xe8\xb0\xf0\x52\xf3"
-                         "\x2d\xb0\x45\x87\x18\x86\x68\xf6",
-               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
-                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = zeroed_string,
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01",
+               .plen   = 16,
+               .assoc  = zeroed_string,
                .alen   = 16,
-               .input  = "\x16\x44\x73\x33\x5d\xf2\xb9\x04"
-                         "\x6b\x79\x98\xef\xdb\xd5\xc5\xf1",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ctext  = "\x33\xDE\x73\xBC\xA6\xCE\x4E\xA6"
+                         "\x61\xF4\xF5\x41\x03\x4A\xE3\x86"
+                         "\xA1\xE2\xC2\x42\x2B\x81\x70\x40"
+                         "\xFD\x7F\x76\xD1\x03\x07\xBB\x0C",
+               .clen   = 32,
        }, {
-               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf"
-                         "\x72\x47\xf6\x4b\x74\xe8\xf4\x06"
-                         "\xbe\xd3\xec\x6a\x3b\xcd\x20\x17",
-               .klen   = 32,
-               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41"
-                         "\x3c\xf8\x79\x6c\xb6\x90\xd4\x0d"
-                         "\xee\xde\x23\x60\xf2\xe5\x08\xcc",
-               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
-                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
-                         "\x07",
-               .alen   = 17,
-               .input  = "\xa4\x9b\xb8\x47\xc0\xed\x7a\x45"
-                         "\x98\x54\x8c\xed\x3d\x17\xf0\xdd",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = zeroed_string,
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01",
+               .plen   = 16,
+               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .alen   = 16,
+               .ctext  = "\x33\xDE\x73\xBC\xA6\xCE\x4E\xA6"
+                         "\x61\xF4\xF5\x41\x03\x4A\xE3\x86"
+                         "\x5B\xC0\x73\xE0\x2B\x73\x68\xC9"
+                         "\x2D\x8C\x58\xC2\x90\x3D\xB0\x3E",
+               .clen   = 32,
        }, {
-               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6"
-                         "\x9c\x0a\x02\xd0\x79\x88\x76\x20"
-                         "\x7f\x00\xca\x42\x15\x2c\xbf\xed",
-               .klen   = 32,
-               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47"
-                         "\x67\xba\x85\xf1\xbb\x30\x56\x26"
-                         "\xaf\x0b\x02\x38\xcc\x44\xa7\xa3",
-               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
-                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
-                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
-                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
-               .alen   = 31,
-               .input  = "\x20\x24\xe2\x33\x5c\x60\xc9\xf0"
-                         "\xa4\x96\x2f\x0d\x53\xc2\xf8\xfc",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01",
+               .plen   = 16,
+               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .alen   = 16,
+               .ctext  = "\xCE\xB8\x98\x16\xC9\x87\x0F\x7E"
+                         "\x7F\x77\xF9\xE7\xF9\xCD\x1E\x16"
+                         "\x43\x8E\x76\x57\x3B\xB4\x05\xE8"
+                         "\xA9\x9B\xBF\x25\xE0\x4F\xC0\xED",
+               .clen   = 32,
        }, {
-               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc"
-                         "\xc6\xcc\x0e\x54\x7f\x28\xf8\x3a"
-                         "\x40\x2e\xa9\x1a\xf0\x8b\x5e\xc4",
-               .klen   = 32,
-               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d"
-                         "\x91\x7c\x91\x75\xc0\xd0\xd8\x40"
-                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a",
-               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
-                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
-                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
-                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
-               .alen   = 32,
-               .input  = "\x6f\x4a\xb9\xe0\xff\x51\xa3\xf1"
-                         "\xd2\x64\x3e\x66\x6a\xb2\x03\xc0",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .key    = "\xfe\xff\xe9\x92\x86\x65\x73\x1c"
+                         "\x6d\x6a\x8f\x94\x67\x30\x83\x08"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .ptext  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x01\x01\x01\x01\x01\x01\x01\x01",
+               .plen   = 64,
+               .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"
+                         "\x00\x00\x00\x00\x00\x00\x00\x01",
+               .alen   = 16,
+               .ctext  = "\xCE\xB8\x98\x16\xC9\x87\x0F\x7E"
+                         "\x7F\x77\xF9\xE7\xF9\xCD\x1E\x16"
+                         "\x9C\xA4\x97\x83\x3F\x01\xA5\xF4"
+                         "\x43\x09\xE7\xB8\xE9\xD1\xD7\x02"
+                         "\x9B\xAB\x39\x18\xEB\x94\x34\x36"
+                         "\xE6\xC5\xC8\x9B\x00\x81\x9E\x49"
+                         "\x1D\x78\xE1\x48\xE3\xE9\xEA\x8E"
+                         "\x3A\x2B\x67\x5D\x35\x6A\x0F\xDB"
+                         "\x02\x73\xDD\xE7\x30\x4A\x30\x54"
+                         "\x1A\x9D\x09\xCA\xC8\x1C\x32\x5F",
+               .clen   = 80,
        }, {
-               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2"
-                         "\xf1\x8e\x19\xd8\x84\xc8\x7a\x53"
-                         "\x02\x5b\x88\xf3\xca\xea\xfe\x9b",
-               .klen   = 32,
-               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
-                         "\xcc\x81\x63\xab\xae\x6b\x43\x54"
-                         "\xbb\x3f\x9c\xf9\xc5\x70\x5a\x5a"
-                         "\x32\x67\xc0\xe9\x80\x02\xe5\x50",
-               .assoc  = "\x40",
-               .alen   = 1,
-               .input  = "\x2c\xfb\xad\x7e\xbe\xa0\x9a\x5b"
-                         "\x7a\x3f\x81\xf7\xfc\x1b\x79\x83"
-                         "\xc7",
-               .ilen   = 17,
-               .result = "\x4f",
-               .rlen   = 1,
+               .key    = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",
+               .ptext  = "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff"
+                         "\xff\xff\xff\xff\xff\xff\xff\xff",
+               .plen   = 192,
+               .assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                         "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"
+                         "\x89\xab\xcd\xef",
+               .alen   = 20,
+               .ctext  = "\x64\x17\xDC\x24\x9D\x92\xBA\x5E"
+                         "\x7C\x64\x6D\x33\x46\x77\xAC\xB1"
+                         "\x5C\x9E\xE2\xC7\x27\x11\x3E\x95"
+                         "\x7D\xBE\x28\xC8\xC1\xCA\x5E\x8C"
+                         "\xB4\xE2\xDE\x9F\x53\x59\x26\xDB"
+                         "\x0C\xD4\xE4\x07\x9A\xE6\x3E\x01"
+                         "\x58\x0D\x3E\x3D\xD5\x21\xEB\x04"
+                         "\x06\x9D\x5F\xB9\x02\x49\x1A\x2B"
+                         "\xBA\xF0\x4E\x3B\x85\x50\x5B\x09"
+                         "\xFE\xEC\xFC\x54\xEC\x0C\xE2\x79"
+                         "\x8A\x2F\x5F\xD7\x05\x5D\xF1\x6D"
+                         "\x22\xEB\xD1\x09\x80\x3F\x5A\x70"
+                         "\xB2\xB9\xD3\x63\x99\xC2\x4D\x1B"
+                         "\x36\x12\x00\x89\xAA\x5D\x55\xDA"
+                         "\x1D\x5B\xD8\x3C\x5F\x09\xD2\xE6"
+                         "\x39\x41\x5C\xF0\xBE\x26\x4E\x5F"
+                         "\x2B\x50\x44\x52\xC2\x10\x7D\x38"
+                         "\x82\x64\x83\x0C\xAE\x49\xD0\xE5"
+                         "\x4F\xE5\x66\x4C\x58\x7A\xEE\x43"
+                         "\x3B\x51\xFE\xBA\x24\x8A\xFE\xDC"
+                         "\x19\x6D\x60\x66\x61\xF9\x9A\x3F"
+                         "\x75\xFC\x38\x53\x5B\xB5\xCD\x52"
+                         "\x4F\xE5\xE4\xC9\xFE\x10\xCB\x98"
+                         "\xF0\x06\x5B\x07\xAB\xBB\xF4\x0E"
+                         "\x2D\xC2\xDD\x5D\xDD\x22\x9A\xCC"
+                         "\x39\xAB\x63\xA5\x3D\x9C\x51\x8A",
+               .clen   = 208,
+       }, { /* From draft-mcgrew-gcm-test-01 */
+               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
+                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
+                         "\x2E\x44\x3B",
+               .klen   = 19,
+               .iv     = "\x49\x56\xED\x7E\x3B\x24\x4C\xFE",
+               .ptext  = "\x45\x00\x00\x48\x69\x9A\x00\x00"
+                         "\x80\x11\x4D\xB7\xC0\xA8\x01\x02"
+                         "\xC0\xA8\x01\x01\x0A\x9B\xF1\x56"
+                         "\x38\xD3\x01\x00\x00\x01\x00\x00"
+                         "\x00\x00\x00\x00\x04\x5F\x73\x69"
+                         "\x70\x04\x5F\x75\x64\x70\x03\x73"
+                         "\x69\x70\x09\x63\x79\x62\x65\x72"
+                         "\x63\x69\x74\x79\x02\x64\x6B\x00"
+                         "\x00\x21\x00\x01\x01\x02\x02\x01",
+               .plen   = 72,
+               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
+                         "\x00\x00\x00\x00\x49\x56\xED\x7E"
+                         "\x3B\x24\x4C\xFE",
+               .alen   = 20,
+               .ctext  = "\x89\xBA\x3E\xEF\xE6\xD6\xCF\xDB"
+                         "\x83\x60\xF5\xBA\x3A\x56\x79\xE6"
+                         "\x7E\x0C\x53\xCF\x9E\x87\xE0\x4E"
+                         "\x1A\x26\x01\x24\xC7\x2E\x3D\xBF"
+                         "\x29\x2C\x91\xC1\xB8\xA8\xCF\xE0"
+                         "\x39\xF8\x53\x6D\x31\x22\x2B\xBF"
+                         "\x98\x81\xFC\x34\xEE\x85\x36\xCD"
+                         "\x26\xDB\x6C\x7A\x0C\x77\x8A\x35"
+                         "\x18\x85\x54\xB2\xBC\xDD\x3F\x43"
+                         "\x61\x06\x8A\xDF\x86\x3F\xB4\xAC"
+                         "\x97\xDC\xBD\xFD\x92\x10\xC5\xFF",
+               .clen   = 88,
        }, {
-               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8"
-                         "\x1b\x50\x25\x5d\x89\x68\xfc\x6d"
-                         "\xc3\x89\x67\xcb\xa4\x49\x9d\x71",
-               .klen   = 32,
-               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a"
-                         "\xe6\x01\xa8\x7e\xca\x10\xdc\x73"
-                         "\xf4\x94\x9f\xc1\x5a\x61\x85\x27",
-               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37",
-               .alen   = 15,
-               .input  = "\x1f\x7f\xca\x3c\x2b\xe7\x27\xba"
-                         "\x7e\x98\x83\x02\x34\x23\xf7\x94"
-                         "\xde\x35\xe6\x1d\x14\x18\xe5\x38"
-                         "\x14\x80\x6a\xa7\x1b\xae\x1d",
-               .ilen   = 31,
-               .result = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
-               .rlen   = 15,
+               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
+                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
+                         "\xCA\xFE\xBA",
+               .klen   = 19,
+               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
+               .ptext  = "\x45\x00\x00\x3E\x69\x8F\x00\x00"
+                         "\x80\x11\x4D\xCC\xC0\xA8\x01\x02"
+                         "\xC0\xA8\x01\x01\x0A\x98\x00\x35"
+                         "\x00\x2A\x23\x43\xB2\xD0\x01\x00"
+                         "\x00\x01\x00\x00\x00\x00\x00\x00"
+                         "\x03\x73\x69\x70\x09\x63\x79\x62"
+                         "\x65\x72\x63\x69\x74\x79\x02\x64"
+                         "\x6B\x00\x00\x01\x00\x01\x00\x01",
+               .plen   = 64,
+               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
+                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
+               .alen   = 16,
+               .ctext  = "\x4B\xC2\x70\x60\x64\xD2\xF3\xC8"
+                         "\xE5\x26\x8A\xDE\xB8\x7E\x7D\x16"
+                         "\x56\xC7\xD2\x88\xBA\x8D\x58\xAF"
+                         "\xF5\x71\xB6\x37\x84\xA7\xB1\x99"
+                         "\x51\x5C\x0D\xA0\x27\xDE\xE7\x2D"
+                         "\xEF\x25\x88\x1F\x1D\x77\x11\xFF"
+                         "\xDB\xED\xEE\x56\x16\xC5\x5C\x9B"
+                         "\x00\x62\x1F\x68\x4E\x7C\xA0\x97"
+                         "\x10\x72\x7E\x53\x13\x3B\x68\xE4"
+                         "\x30\x99\x91\x79\x09\xEA\xFF\x6A",
+               .clen   = 80,
        }, {
-               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf"
-                         "\x46\x13\x31\xe1\x8e\x08\x7e\x87"
-                         "\x85\xb6\x46\xa3\x7e\xa8\x3c\x48",
-               .klen   = 32,
-               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
-                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60"
-                         "\x10\xc3\xb3\x02\xcf\xb0\x5e\x8d"
-                         "\xb5\xc2\x7e\x9a\x35\xc0\x24\xfd",
-               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
+               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\x11\x22\x33",
+               .klen   = 35,
+               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
+               .ptext  = "\x45\x00\x00\x30\x69\xA6\x40\x00"
+                         "\x80\x06\x26\x90\xC0\xA8\x01\x02"
+                         "\x93\x89\x15\x5E\x0A\x9E\x00\x8B"
+                         "\x2D\xC5\x7E\xE0\x00\x00\x00\x00"
+                         "\x70\x02\x40\x00\x20\xBF\x00\x00"
+                         "\x02\x04\x05\xB4\x01\x01\x04\x02"
+                         "\x01\x02\x02\x01",
+               .plen   = 52,
+               .assoc  = "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"
+                         "\x01\x02\x03\x04\x05\x06\x07\x08",
                .alen   = 16,
-               .input  = "\x05\x86\x9e\xd7\x2b\xa3\x97\x01"
-                         "\xbe\x28\x98\x10\x6f\xe9\x61\x32"
-                         "\x96\xbb\xb1\x2e\x8f\x0c\x44\xb9"
-                         "\x46\x2d\x55\xe3\x42\x67\xf2\xaf",
-               .ilen   = 32,
-               .result = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
-                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .rlen   = 16,
+               .ctext  = "\xD6\x31\x0D\x2B\x3D\x6F\xBD\x2F"
+                         "\x58\x41\x7E\xFF\x9A\x9E\x09\xB4"
+                         "\x1A\xF7\xF6\x42\x31\xCD\xBF\xAD"
+                         "\x27\x0E\x2C\xF2\xDB\x10\xDF\x55"
+                         "\x8F\x0D\xD7\xAC\x23\xBD\x42\x10"
+                         "\xD0\xB2\xAF\xD8\x37\xAC\x6B\x0B"
+                         "\x11\xD4\x0B\x12\xEC\xB4\xB1\x92"
+                         "\x23\xA6\x10\xB0\x26\xD6\xD9\x26"
+                         "\x5A\x48\x6A\x3E",
+               .clen   = 68,
+       }, {
+               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00",
+               .klen   = 19,
+               .iv     = "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .ptext  = "\x45\x00\x00\x3C\x99\xC5\x00\x00"
+                         "\x80\x01\xCB\x7A\x40\x67\x93\x18"
+                         "\x01\x01\x01\x01\x08\x00\x07\x5C"
+                         "\x02\x00\x44\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
+                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
+                         "\x75\x76\x77\x61\x62\x63\x64\x65"
+                         "\x66\x67\x68\x69\x01\x02\x02\x01",
+               .plen   = 64,
+               .assoc  = "\x00\x00\x00\x00\x00\x00\x00\x01"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
+               .alen   = 16,
+               .ctext  = "\x6B\x9A\xCA\x57\x43\x91\xFC\x6F"
+                         "\x92\x51\x23\xA4\xC1\x5B\xF0\x10"
+                         "\xF3\x13\xF4\xF8\xA1\x9A\xB4\xDC"
+                         "\x89\xC8\xF8\x42\x62\x95\xB7\xCB"
+                         "\xB8\xF5\x0F\x1B\x2E\x94\xA2\xA7"
+                         "\xBF\xFB\x8A\x92\x13\x63\xD1\x3C"
+                         "\x08\xF5\xE8\xA6\xAA\xF6\x34\xF9"
+                         "\x42\x05\xAF\xB3\xE7\x9A\xFC\xEE"
+                         "\x36\x25\xC1\x10\x12\x1C\xCA\x82"
+                         "\xEA\xE6\x63\x5A\x57\x28\xA9\x9A",
+               .clen   = 80,
+       }, {
+               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
+                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
+                         "\x57\x69\x0E",
+               .klen   = 19,
+               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
+               .ptext  = "\x45\x00\x00\x3C\x99\xC3\x00\x00"
+                         "\x80\x01\xCB\x7C\x40\x67\x93\x18"
+                         "\x01\x01\x01\x01\x08\x00\x08\x5C"
+                         "\x02\x00\x43\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
+                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
+                         "\x75\x76\x77\x61\x62\x63\x64\x65"
+                         "\x66\x67\x68\x69\x01\x02\x02\x01",
+               .plen   = 64,
+               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
+                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
+                         "\xA2\xFC\xA1\xA3",
+               .alen   = 20,
+               .ctext  = "\x6A\x6B\x45\x2B\x7C\x67\x52\xF6"
+                         "\x10\x60\x40\x62\x6B\x4F\x97\x8E"
+                         "\x0B\xB2\x22\x97\xCB\x21\xE0\x90"
+                         "\xA2\xE7\xD1\x41\x30\xE4\x4B\x1B"
+                         "\x79\x01\x58\x50\x01\x06\xE1\xE0"
+                         "\x2C\x83\x79\xD3\xDE\x46\x97\x1A"
+                         "\x30\xB8\xE5\xDF\xD7\x12\x56\x75"
+                         "\xD0\x95\xB7\xB8\x91\x42\xF7\xFD"
+                         "\x97\x57\xCA\xC1\x20\xD0\x86\xB9"
+                         "\x66\x9D\xB4\x2B\x96\x22\xAC\x67",
+               .clen   = 80,
        }, {
-               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5"
-                         "\x70\xd5\x3c\x65\x93\xa8\x00\xa0"
-                         "\x46\xe4\x25\x7c\x58\x08\xdb\x1e",
-               .klen   = 32,
-               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66"
-                         "\x3b\x86\xbf\x86\xd4\x50\xe0\xa7"
-                         "\x76\xef\x5c\x72\x0f\x1f\xc3\xd4",
-               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05",
-               .alen   = 17,
-               .input  = "\x9c\xe0\x06\x7b\x86\xcf\x2e\xd8"
-                         "\x45\x65\x1b\x72\x9b\xaa\xa3\x1e"
-                         "\x87\x9d\x26\xdf\xff\x81\x11\xd2"
-                         "\x47\x41\xb9\x24\xc1\x8a\xa3\x8b"
-                         "\x55",
-               .ilen   = 33,
-               .result = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
-                         "\xd0",
-               .rlen   = 17,
+               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
+                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
+                         "\x57\x69\x0E",
+               .klen   = 19,
+               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
+               .ptext  = "\x45\x00\x00\x1C\x42\xA2\x00\x00"
+                         "\x80\x01\x44\x1F\x40\x67\x93\xB6"
+                         "\xE0\x00\x00\x02\x0A\x00\xF5\xFF"
+                         "\x01\x02\x02\x01",
+               .plen   = 28,
+               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
+                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
+                         "\xA2\xFC\xA1\xA3",
+               .alen   = 20,
+               .ctext  = "\x6A\x6B\x45\x0B\xA7\x06\x52\xF6"
+                         "\x10\x60\xCF\x01\x6B\x4F\x97\x20"
+                         "\xEA\xB3\x23\x94\xC9\x21\x1D\x33"
+                         "\xA1\xE5\x90\x40\x05\x37\x45\x70"
+                         "\xB5\xD6\x09\x0A\x23\x73\x33\xF9"
+                         "\x08\xB4\x22\xE4",
+               .clen   = 44,
        }, {
-               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb"
-                         "\x9a\x97\x48\xe9\x98\x48\x82\xba"
-                         "\x07\x11\x04\x54\x32\x67\x7b\xf5",
-               .klen   = 32,
-               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d"
-                         "\x65\x48\xcb\x0a\xda\xf0\x62\xc0"
-                         "\x38\x1d\x3b\x4a\xe9\x7e\x62\xaa",
-               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
-                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
-                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a",
-               .alen   = 31,
-               .input  = "\xa0\xc8\xde\x83\x0d\xc3\x4e\xd5"
-                         "\x69\x7f\x7a\xdd\x8c\x46\xda\xba"
-                         "\x0a\x5c\x0e\x7f\xac\xee\x02\xd2"
-                         "\xe5\x4b\x0a\xba\xb8\xa4\x7b\x66"
-                         "\xde\xae\xdb\xc2\xc0\x0b\xf7\x2b"
-                         "\xdf\xb8\xea\xd8\xa9\x38\xed",
-               .ilen   = 47,
-               .result = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
-                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
-                         "\x98\x34\xab\x37\x56\xae\x32",
-               .rlen   = 31,
+               .key    = "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
+                         "\x6D\x6A\x8F\x94\x67\x30\x83\x08"
+                         "\xFE\xFF\xE9\x92\x86\x65\x73\x1C"
+                         "\xCA\xFE\xBA",
+               .klen   = 27,
+               .iv     = "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
+               .ptext  = "\x45\x00\x00\x28\xA4\xAD\x40\x00"
+                         "\x40\x06\x78\x80\x0A\x01\x03\x8F"
+                         "\x0A\x01\x06\x12\x80\x23\x06\xB8"
+                         "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"
+                         "\x50\x10\x16\xD0\x75\x68\x00\x01",
+               .plen   = 40,
+               .assoc  = "\x00\x00\xA5\xF8\x00\x00\x00\x0A"
+                         "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",
+               .alen   = 16,
+               .ctext  = "\x05\x22\x15\xD1\x52\x56\x85\x04"
+                         "\xA8\x5C\x5D\x6D\x7E\x6E\xF5\xFA"
+                         "\xEA\x16\x37\x50\xF3\xDF\x84\x3B"
+                         "\x2F\x32\x18\x57\x34\x2A\x8C\x23"
+                         "\x67\xDF\x6D\x35\x7B\x54\x0D\xFB"
+                         "\x34\xA5\x9F\x6C\x48\x30\x1E\x22"
+                         "\xFE\xB1\x22\x17\x17\x8A\xB9\x5B",
+               .clen   = 56,
        }, {
-               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1"
-                         "\xc5\x5a\x53\x6e\x9d\xe8\x04\xd4"
-                         "\xc9\x3f\xe2\x2d\x0c\xc6\x1a\xcb",
-               .klen   = 32,
-               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73"
-                         "\x8f\x0a\xd6\x8f\xdf\x90\xe4\xda"
-                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81",
-               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .alen   = 32,
-               .input  = "\xd3\x68\x14\x70\x3c\x01\x43\x86"
-                         "\x02\xab\xbe\x75\xaa\xe7\xf5\x53"
-                         "\x5c\x05\xbd\x9b\x19\xbb\x2a\x61"
-                         "\x8f\x69\x05\x75\x8e\xca\x60\x0c"
-                         "\x5b\xa2\x48\x61\x32\x74\x11\x2b"
-                         "\xf6\xcf\x06\x78\x6f\x78\x1a\x4a",
-               .ilen   = 48,
-               .result = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
-                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
-                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
-               .rlen   = 32,
+               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\xDE\xCA\xF8",
+               .klen   = 19,
+               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
+               .ptext  = "\x45\x00\x00\x49\x33\xBA\x00\x00"
+                         "\x7F\x11\x91\x06\xC3\xFB\x1D\x10"
+                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
+                         "\x00\x35\xDD\x7B\x80\x03\x02\xD5"
+                         "\x00\x00\x4E\x20\x00\x1E\x8C\x18"
+                         "\xD7\x5B\x81\xDC\x91\xBA\xA0\x47"
+                         "\x6B\x91\xB9\x24\xB2\x80\x38\x9D"
+                         "\x92\xC9\x63\xBA\xC0\x46\xEC\x95"
+                         "\x9B\x62\x66\xC0\x47\x22\xB1\x49"
+                         "\x23\x01\x01\x01",
+               .plen   = 76,
+               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
+                         "\xCE\xFA\xCE\x74",
+               .alen   = 20,
+               .ctext  = "\x92\xD0\x53\x79\x33\x38\xD5\xF3"
+                         "\x7D\xE4\x7A\x8E\x86\x03\xC9\x90"
+                         "\x96\x35\xAB\x9C\xFB\xE8\xA3\x76"
+                         "\xE9\xE9\xE2\xD1\x2E\x11\x0E\x00"
+                         "\xFA\xCE\xB5\x9E\x02\xA7\x7B\xEA"
+                         "\x71\x9A\x58\xFB\xA5\x8A\xE1\xB7"
+                         "\x9C\x39\x9D\xE3\xB5\x6E\x69\xE6"
+                         "\x63\xC9\xDB\x05\x69\x51\x12\xAD"
+                         "\x3E\x00\x32\x73\x86\xF2\xEE\xF5"
+                         "\x0F\xE8\x81\x7E\x84\xD3\xC0\x0D"
+                         "\x76\xD6\x55\xC6\xB4\xC2\x34\xC7"
+                         "\x12\x25\x0B\xF9",
+               .clen   = 92,
        }, {
-               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7"
-                         "\xef\x1c\x5f\xf2\xa3\x88\x86\xed"
-                         "\x8a\x6d\xc1\x05\xe7\x25\xb9\xa2",
-               .klen   = 32,
-               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79"
-                         "\xba\xcd\xe2\x13\xe4\x30\x66\xf4"
-                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58",
-               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d",
-               .alen   = 33,
-               .input  = "\x07\x0a\x35\xb0\x82\x03\x5a\xd2"
-                         "\x15\x3a\x6c\x72\x83\x9b\xb1\x75"
-                         "\xea\xf2\xfc\xff\xc6\xf1\x13\xa4"
-                         "\x1a\x93\x33\x79\x97\x82\x81\xc0"
-                         "\x96\xc2\x00\xab\x39\xae\xa1\x62"
-                         "\x53\xa3\x86\xc9\x07\x8c\xaf\x22"
-                         "\x47\x31\x29\xca\x4a\x95\xf5\xd5"
-                         "\x20\x63\x5a\x54\x80\x2c\x4a\x63"
-                         "\xfb\x18\x73\x31\x4f\x08\x21\x5d"
-                         "\x20\xe9\xc3\x7e\xea\x25\x77\x3a"
-                         "\x65",
-               .ilen   = 81,
-               .result = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
-                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
-                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
-                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
-                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
-                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
-                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
-                         "\xbd",
-               .rlen   = 65,
+               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\x73\x61\x6C",
+               .klen   = 35,
+               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
+               .ptext  = "\x45\x08\x00\x28\x73\x2C\x00\x00"
+                         "\x40\x06\xE9\xF9\x0A\x01\x06\x12"
+                         "\x0A\x01\x03\x8F\x06\xB8\x80\x23"
+                         "\xDD\x6B\xAF\xBE\xCB\x71\x26\x02"
+                         "\x50\x10\x1F\x64\x6D\x54\x00\x01",
+               .plen   = 40,
+               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
+                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
+                         "\x69\x76\x65\x63",
+               .alen   = 20,
+               .ctext  = "\xCC\x74\xB7\xD3\xB0\x38\x50\x42"
+                         "\x2C\x64\x87\x46\x1E\x34\x10\x05"
+                         "\x29\x6B\xBB\x36\xE9\x69\xAD\x92"
+                         "\x82\xA1\x10\x6A\xEB\x0F\xDC\x7D"
+                         "\x08\xBA\xF3\x91\xCA\xAA\x61\xDA"
+                         "\x62\xF4\x14\x61\x5C\x9D\xB5\xA7"
+                         "\xEE\xD7\xB9\x7E\x87\x99\x9B\x7D",
+               .clen   = 56,
        }, {
-               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe"
-                         "\x19\xde\x6b\x76\xa8\x28\x08\x07"
-                         "\x4b\x9a\xa0\xdd\xc1\x84\x58\x79",
-               .klen   = 32,
-               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f"
-                         "\xe4\x8f\xed\x97\xe9\xd0\xe8\x0d"
-                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e",
-               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .alen   = 65,
-               .input  = "\x33\xc1\xda\xfa\x15\x21\x07\x8e"
-                         "\x93\x68\xea\x64\x7b\x3d\x4b\x6b"
-                         "\x71\x5e\x5e\x6b\x92\xaa\x65\xc2"
-                         "\x7a\x2a\xc1\xa9\x0a\xa1\x24\x81"
-                         "\x26\x3a\x5a\x09\xe8\xce\x73\x72"
-                         "\xde\x7b\x58\x9e\x85\xb9\xa4\x28"
-                         "\xda",
-               .ilen   = 49,
-               .result = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
-                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
-                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
-                         "\x2f",
-               .rlen   = 33,
+               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
+                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
+                         "\x57\x69\x0E",
+               .klen   = 19,
+               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
+               .ptext  = "\x45\x00\x00\x49\x33\x3E\x00\x00"
+                         "\x7F\x11\x91\x82\xC3\xFB\x1D\x10"
+                         "\xC2\xB1\xD3\x26\xC0\x28\x31\xCE"
+                         "\x00\x35\xCB\x45\x80\x03\x02\x5B"
+                         "\x00\x00\x01\xE0\x00\x1E\x8C\x18"
+                         "\xD6\x57\x59\xD5\x22\x84\xA0\x35"
+                         "\x2C\x71\x47\x5C\x88\x80\x39\x1C"
+                         "\x76\x4D\x6E\x5E\xE0\x49\x6B\x32"
+                         "\x5A\xE2\x70\xC0\x38\x99\x49\x39"
+                         "\x15\x01\x01\x01",
+               .plen   = 76,
+               .assoc  = "\x42\xF6\x7E\x3F\x10\x10\x10\x10"
+                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
+                         "\xA2\xFC\xA1\xA3",
+               .alen   = 20,
+               .ctext  = "\x6A\x6B\x45\x5E\xD6\x9A\x52\xF6"
+                         "\xEF\x70\x1A\x9C\xE8\xD3\x19\x86"
+                         "\xC8\x02\xF0\xB0\x03\x09\xD9\x02"
+                         "\xA0\xD2\x59\x04\xD1\x85\x2A\x24"
+                         "\x1C\x67\x3E\xD8\x68\x72\x06\x94"
+                         "\x97\xBA\x4F\x76\x8D\xB0\x44\x5B"
+                         "\x69\xBF\xD5\xE2\x3D\xF1\x0B\x0C"
+                         "\xC0\xBF\xB1\x8F\x70\x09\x9E\xCE"
+                         "\xA5\xF2\x55\x58\x84\xFA\xF9\xB5"
+                         "\x23\xF4\x84\x40\x74\x14\x8A\x6B"
+                         "\xDB\xD7\x67\xED\xA4\x93\xF3\x47"
+                         "\xCC\xF7\x46\x6F",
+               .clen   = 92,
        }, {
-               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04"
-                         "\x44\xa1\x76\xfb\xad\xc8\x8a\x21"
-                         "\x0d\xc8\x7f\xb6\x9b\xe3\xf8\x4f",
-               .klen   = 32,
-               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
-                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85"
-                         "\x0e\x51\xf9\x1c\xee\x70\x6a\x27"
-                         "\x3d\xd3\xb7\xac\x51\xfa\xdf\x05",
-               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
+               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\x73\x61\x6C",
+               .klen   = 35,
+               .iv     = "\x61\x6E\x64\x01\x69\x76\x65\x63",
+               .ptext  = "\x63\x69\x73\x63\x6F\x01\x72\x75"
+                         "\x6C\x65\x73\x01\x74\x68\x65\x01"
+                         "\x6E\x65\x74\x77\x65\x01\x64\x65"
+                         "\x66\x69\x6E\x65\x01\x74\x68\x65"
+                         "\x74\x65\x63\x68\x6E\x6F\x6C\x6F"
+                         "\x67\x69\x65\x73\x01\x74\x68\x61"
+                         "\x74\x77\x69\x6C\x6C\x01\x64\x65"
+                         "\x66\x69\x6E\x65\x74\x6F\x6D\x6F"
+                         "\x72\x72\x6F\x77\x01\x02\x02\x01",
+               .plen   = 72,
+               .assoc  = "\x17\x40\x5E\x67\x15\x6F\x31\x26"
+                         "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"
+                         "\x69\x76\x65\x63",
+               .alen   = 20,
+               .ctext  = "\xEA\x15\xC4\x98\xAC\x15\x22\x37"
+                         "\x00\x07\x1D\xBE\x60\x5D\x73\x16"
+                         "\x4D\x0F\xCC\xCE\x8A\xD0\x49\xD4"
+                         "\x39\xA3\xD1\xB1\x21\x0A\x92\x1A"
+                         "\x2C\xCF\x8F\x9D\xC9\x91\x0D\xB4"
+                         "\x15\xFC\xBC\xA5\xC5\xBF\x54\xE5"
+                         "\x1C\xC7\x32\x41\x07\x7B\x2C\xB6"
+                         "\x5C\x23\x7C\x93\xEA\xEF\x23\x1C"
+                         "\x73\xF4\xE7\x12\x84\x4C\x37\x0A"
+                         "\x4A\x8F\x06\x37\x48\xF9\xF9\x05"
+                         "\x55\x13\x40\xC3\xD5\x55\x3A\x3D",
+               .clen   = 88,
+       }, {
+               .key    = "\x7D\x77\x3D\x00\xC1\x44\xC5\x25"
+                         "\xAC\x61\x9D\x18\xC8\x4A\x3F\x47"
+                         "\xD9\x66\x42",
+               .klen   = 19,
+               .iv     = "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
+               .ptext  = "\x01\x02\x02\x01",
+               .plen   = 4,
+               .assoc  = "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"
+                         "\x43\x45\x7E\x91\x82\x44\x3B\xC6",
                .alen   = 16,
-               .input  = "\x3e\xf8\x86\x3d\x39\xf8\x96\x02"
-                         "\x0f\xdf\xc9\x6e\x37\x1e\x57\x99"
-                         "\x07\x2a\x1a\xac\xd1\xda\xfd\x3b"
-                         "\xc7\xff\xbd\xbc\x85\x09\x0b",
-               .ilen   = 31,
-               .result = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
-                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .rlen   = 16,
+               .ctext  = "\x4C\x72\x63\x30\x2F\xE6\x56\xDD"
+                         "\xD0\xD8\x60\x9D\x8B\xEF\x85\x90"
+                         "\xF7\x61\x24\x62",
+               .clen   = 20,
        }, {
-               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a"
-                         "\x6e\x63\x82\x7f\xb2\x68\x0c\x3a"
-                         "\xce\xf5\x5e\x8e\x75\x42\x97\x26",
+               .key    = "\xAB\xBC\xCD\xDE\xF0\x01\x12\x23"
+                         "\x34\x45\x56\x67\x78\x89\x9A\xAB"
+                         "\xDE\xCA\xF8",
+               .klen   = 19,
+               .iv     = "\xCA\xFE\xDE\xBA\xCE\xFA\xCE\x74",
+               .ptext  = "\x74\x6F\x01\x62\x65\x01\x6F\x72"
+                         "\x01\x6E\x6F\x74\x01\x74\x6F\x01"
+                         "\x62\x65\x00\x01",
+               .plen   = 20,
+               .assoc  = "\x00\x00\x01\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"
+                         "\xCE\xFA\xCE\x74",
+               .alen   = 20,
+               .ctext  = "\xA3\xBF\x52\x52\x65\x83\xBA\x81"
+                         "\x03\x9B\x84\xFC\x44\x8C\xBB\x81"
+                         "\x36\xE1\x78\xBB\xA5\x49\x3A\xD0"
+                         "\xF0\x6B\x21\xAF\x98\xC0\x34\xDC"
+                         "\x17\x17\x65\xAD",
+               .clen   = 36,
+       }, {
+               .key    = "\x6C\x65\x67\x61\x6C\x69\x7A\x65"
+                         "\x6D\x61\x72\x69\x6A\x75\x61\x6E"
+                         "\x61\x61\x6E\x64\x64\x6F\x69\x74"
+                         "\x62\x65\x66\x6F\x72\x65\x69\x61"
+                         "\x74\x75\x72",
+               .klen   = 35,
+               .iv     = "\x33\x30\x21\x69\x67\x65\x74\x6D",
+               .ptext  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
+                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
+                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
+                         "\x02\x00\x07\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
+                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
+                         "\x01\x02\x02\x01",
+               .plen   = 52,
+               .assoc  = "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"
+                         "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"
+                         "\x67\x65\x74\x6D",
+               .alen   = 20,
+               .ctext  = "\x96\xFD\x86\xF8\xD1\x98\xFF\x10"
+                         "\xAB\x8C\xDA\x8A\x5A\x08\x38\x1A"
+                         "\x48\x59\x80\x18\x1A\x18\x1A\x04"
+                         "\xC9\x0D\xE3\xE7\x0E\xA4\x0B\x75"
+                         "\x92\x9C\x52\x5C\x0B\xFB\xF8\xAF"
+                         "\x16\xC3\x35\xA8\xE7\xCE\x84\x04"
+                         "\xEB\x40\x6B\x7A\x8E\x75\xBB\x42"
+                         "\xE0\x63\x4B\x21\x44\xA2\x2B\x2B"
+                         "\x39\xDB\xC8\xDC",
+               .clen   = 68,
+       }, {
+               .key    = "\x3D\xE0\x98\x74\xB3\x88\xE6\x49"
+                         "\x19\x88\xD0\xC3\x60\x7E\xAE\x1F"
+                         "\x57\x69\x0E",
+               .klen   = 19,
+               .iv     = "\x4E\x28\x00\x00\xA2\xFC\xA1\xA3",
+               .ptext  = "\x45\x00\x00\x30\xDA\x3A\x00\x00"
+                         "\x80\x01\xDF\x3B\xC0\xA8\x00\x05"
+                         "\xC0\xA8\x00\x01\x08\x00\xC6\xCD"
+                         "\x02\x00\x07\x00\x61\x62\x63\x64"
+                         "\x65\x66\x67\x68\x69\x6A\x6B\x6C"
+                         "\x6D\x6E\x6F\x70\x71\x72\x73\x74"
+                         "\x01\x02\x02\x01",
+               .plen   = 52,
+               .assoc  = "\x3F\x7E\xF6\x42\x10\x10\x10\x10"
+                         "\x10\x10\x10\x10\x4E\x28\x00\x00"
+                         "\xA2\xFC\xA1\xA3",
+               .alen   = 20,
+               .ctext  = "\x6A\x6B\x45\x27\x3F\x9E\x52\xF6"
+                         "\x10\x60\x54\x25\xEB\x80\x04\x93"
+                         "\xCA\x1B\x23\x97\xCB\x21\x2E\x01"
+                         "\xA2\xE7\x95\x41\x30\xE4\x4B\x1B"
+                         "\x79\x01\x58\x50\x01\x06\xE1\xE0"
+                         "\x2C\x83\x79\xD3\xDE\x46\x97\x1A"
+                         "\x44\xCC\x90\xBF\x00\x94\x94\x92"
+                         "\x20\x17\x0C\x1B\x55\xDE\x7E\x68"
+                         "\xF4\x95\x5D\x4F",
+               .clen   = 68,
+       }, {
+               .key    = "\x4C\x80\xCD\xEF\xBB\x5D\x10\xDA"
+                         "\x90\x6A\xC7\x3C\x36\x13\xA6\x34"
+                         "\x22\x43\x3C",
+               .klen   = 19,
+               .iv     = "\x48\x55\xEC\x7D\x3A\x23\x4B\xFD",
+               .ptext  = "\x08\x00\xC6\xCD\x02\x00\x07\x00"
+                         "\x61\x62\x63\x64\x65\x66\x67\x68"
+                         "\x69\x6A\x6B\x6C\x6D\x6E\x6F\x70"
+                         "\x71\x72\x73\x74\x01\x02\x02\x01",
+               .plen   = 32,
+               .assoc  = "\x00\x00\x43\x21\x87\x65\x43\x21"
+                         "\x00\x00\x00\x07\x48\x55\xEC\x7D"
+                         "\x3A\x23\x4B\xFD",
+               .alen   = 20,
+               .ctext  = "\x67\xE9\x28\xB3\x1C\xA4\x6D\x02"
+                         "\xF0\xB5\x37\xB6\x6B\x2F\xF5\x4F"
+                         "\xF8\xA3\x4C\x53\xB8\x12\x09\xBF"
+                         "\x58\x7D\xCF\x29\xA3\x41\x68\x6B"
+                         "\xCE\xE8\x79\x85\x3C\xB0\x3A\x8F"
+                         "\x16\xB0\xA1\x26\xC9\xBC\xBC\xA6",
+               .clen   = 48,
+       }
+};
+
+/*
+ * ChaCha20-Poly1305 AEAD test vectors from RFC7539 2.8.2./A.5.
+ */
+static const struct aead_testvec rfc7539_tv_template[] = {
+       {
+               .key    = "\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",
                .klen   = 32,
-               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
-                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c"
-                         "\x39\x14\x05\xa0\xf3\x10\xec\x41"
-                         "\xff\x01\x95\x84\x2b\x59\x7f\xdb",
-               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .alen   = 16,
-               .input  = "\x2f\xc4\xd8\x0d\xa6\x07\xef\x2e"
-                         "\x6c\xd9\x84\x63\x70\x97\x61\x37"
-                         "\x08\x2f\x16\x90\x9e\x62\x30\x0d"
-                         "\x62\xd5\xc8\xf0\x46\x1a",
-               .ilen   = 30,
-               .result = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
-                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .rlen   = 16,
+               .iv     = "\x07\x00\x00\x00\x40\x41\x42\x43"
+                         "\x44\x45\x46\x47",
+               .assoc  = "\x50\x51\x52\x53\xc0\xc1\xc2\xc3"
+                         "\xc4\xc5\xc6\xc7",
+               .alen   = 12,
+               .ptext  = "\x4c\x61\x64\x69\x65\x73\x20\x61"
+                         "\x6e\x64\x20\x47\x65\x6e\x74\x6c"
+                         "\x65\x6d\x65\x6e\x20\x6f\x66\x20"
+                         "\x74\x68\x65\x20\x63\x6c\x61\x73"
+                         "\x73\x20\x6f\x66\x20\x27\x39\x39"
+                         "\x3a\x20\x49\x66\x20\x49\x20\x63"
+                         "\x6f\x75\x6c\x64\x20\x6f\x66\x66"
+                         "\x65\x72\x20\x79\x6f\x75\x20\x6f"
+                         "\x6e\x6c\x79\x20\x6f\x6e\x65\x20"
+                         "\x74\x69\x70\x20\x66\x6f\x72\x20"
+                         "\x74\x68\x65\x20\x66\x75\x74\x75"
+                         "\x72\x65\x2c\x20\x73\x75\x6e\x73"
+                         "\x63\x72\x65\x65\x6e\x20\x77\x6f"
+                         "\x75\x6c\x64\x20\x62\x65\x20\x69"
+                         "\x74\x2e",
+               .plen   = 114,
+               .ctext  = "\xd3\x1a\x8d\x34\x64\x8e\x60\xdb"
+                         "\x7b\x86\xaf\xbc\x53\xef\x7e\xc2"
+                         "\xa4\xad\xed\x51\x29\x6e\x08\xfe"
+                         "\xa9\xe2\xb5\xa7\x36\xee\x62\xd6"
+                         "\x3d\xbe\xa4\x5e\x8c\xa9\x67\x12"
+                         "\x82\xfa\xfb\x69\xda\x92\x72\x8b"
+                         "\x1a\x71\xde\x0a\x9e\x06\x0b\x29"
+                         "\x05\xd6\xa5\xb6\x7e\xcd\x3b\x36"
+                         "\x92\xdd\xbd\x7f\x2d\x77\x8b\x8c"
+                         "\x98\x03\xae\xe3\x28\x09\x1b\x58"
+                         "\xfa\xb3\x24\xe4\xfa\xd6\x75\x94"
+                         "\x55\x85\x80\x8b\x48\x31\xd7\xbc"
+                         "\x3f\xf4\xde\xf0\x8e\x4b\x7a\x9d"
+                         "\xe5\x76\xd2\x65\x86\xce\xc6\x4b"
+                         "\x61\x16\x1a\xe1\x0b\x59\x4f\x09"
+                         "\xe2\x6a\x7e\x90\x2e\xcb\xd0\x60"
+                         "\x06\x91",
+               .clen   = 130,
        }, {
-               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10"
-                         "\x98\x25\x8d\x03\xb7\x08\x8e\x54"
-                         "\x90\x23\x3d\x67\x4f\xa1\x36\xfc",
+               .key    = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"
+                         "\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
+                         "\x47\x39\x17\xc1\x40\x2b\x80\x09"
+                         "\x9d\xca\x5c\xbc\x20\x70\x75\xc0",
                .klen   = 32,
-               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
-                         "\xd5\x07\x58\x59\x72\xd7\xde\x92"
-                         "\x63\xd6\x10\x24\xf8\xb0\x6e\x5a"
-                         "\xc0\x2e\x74\x5d\x06\xb8\x1e\xb2",
-               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .alen   = 16,
-               .input  = "\xce\xf3\x17\x87\x49\xc2\x00\x46"
-                         "\xc6\x12\x5c\x8f\x81\x38\xaa\x55"
-                         "\xf8\x67\x75\xf1\x75\xe3\x2a\x24",
-               .ilen   = 24,
-               .result = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .rlen   = 16,
+               .iv     = "\x00\x00\x00\x00\x01\x02\x03\x04"
+                         "\x05\x06\x07\x08",
+               .assoc  = "\xf3\x33\x88\x86\x00\x00\x00\x00"
+                         "\x00\x00\x4e\x91",
+               .alen   = 12,
+               .ptext  = "\x49\x6e\x74\x65\x72\x6e\x65\x74"
+                         "\x2d\x44\x72\x61\x66\x74\x73\x20"
+                         "\x61\x72\x65\x20\x64\x72\x61\x66"
+                         "\x74\x20\x64\x6f\x63\x75\x6d\x65"
+                         "\x6e\x74\x73\x20\x76\x61\x6c\x69"
+                         "\x64\x20\x66\x6f\x72\x20\x61\x20"
+                         "\x6d\x61\x78\x69\x6d\x75\x6d\x20"
+                         "\x6f\x66\x20\x73\x69\x78\x20\x6d"
+                         "\x6f\x6e\x74\x68\x73\x20\x61\x6e"
+                         "\x64\x20\x6d\x61\x79\x20\x62\x65"
+                         "\x20\x75\x70\x64\x61\x74\x65\x64"
+                         "\x2c\x20\x72\x65\x70\x6c\x61\x63"
+                         "\x65\x64\x2c\x20\x6f\x72\x20\x6f"
+                         "\x62\x73\x6f\x6c\x65\x74\x65\x64"
+                         "\x20\x62\x79\x20\x6f\x74\x68\x65"
+                         "\x72\x20\x64\x6f\x63\x75\x6d\x65"
+                         "\x6e\x74\x73\x20\x61\x74\x20\x61"
+                         "\x6e\x79\x20\x74\x69\x6d\x65\x2e"
+                         "\x20\x49\x74\x20\x69\x73\x20\x69"
+                         "\x6e\x61\x70\x70\x72\x6f\x70\x72"
+                         "\x69\x61\x74\x65\x20\x74\x6f\x20"
+                         "\x75\x73\x65\x20\x49\x6e\x74\x65"
+                         "\x72\x6e\x65\x74\x2d\x44\x72\x61"
+                         "\x66\x74\x73\x20\x61\x73\x20\x72"
+                         "\x65\x66\x65\x72\x65\x6e\x63\x65"
+                         "\x20\x6d\x61\x74\x65\x72\x69\x61"
+                         "\x6c\x20\x6f\x72\x20\x74\x6f\x20"
+                         "\x63\x69\x74\x65\x20\x74\x68\x65"
+                         "\x6d\x20\x6f\x74\x68\x65\x72\x20"
+                         "\x74\x68\x61\x6e\x20\x61\x73\x20"
+                         "\x2f\xe2\x80\x9c\x77\x6f\x72\x6b"
+                         "\x20\x69\x6e\x20\x70\x72\x6f\x67"
+                         "\x72\x65\x73\x73\x2e\x2f\xe2\x80"
+                         "\x9d",
+               .plen   = 265,
+               .ctext  = "\x64\xa0\x86\x15\x75\x86\x1a\xf4"
+                         "\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
+                         "\x5e\x80\x5c\xfd\x34\x5c\xf3\x89"
+                         "\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
+                         "\x4c\x6c\xfc\x18\x75\x5d\x43\xee"
+                         "\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
+                         "\xbd\xb7\xb7\x3c\x32\x1b\x01\x00"
+                         "\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
+                         "\x33\x2f\x83\x0e\x71\x0b\x97\xce"
+                         "\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
+                         "\x14\xad\x17\x6e\x00\x8d\x33\xbd"
+                         "\x60\xf9\x82\xb1\xff\x37\xc8\x55"
+                         "\x97\x97\xa0\x6e\xf4\xf0\xef\x61"
+                         "\xc1\x86\x32\x4e\x2b\x35\x06\x38"
+                         "\x36\x06\x90\x7b\x6a\x7c\x02\xb0"
+                         "\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
+                         "\xb9\x16\x6c\x76\x7b\x80\x4d\x46"
+                         "\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
+                         "\x90\x40\xc5\xa4\x04\x33\x22\x5e"
+                         "\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
+                         "\xaf\x45\x34\xd7\xf8\x3f\xa1\x15"
+                         "\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
+                         "\x0d\x07\x2b\x04\xb3\x56\x4e\xea"
+                         "\x1b\x42\x22\x73\xf5\x48\x27\x1a"
+                         "\x0b\xb2\x31\x60\x53\xfa\x76\x99"
+                         "\x19\x55\xeb\xd6\x31\x59\x43\x4e"
+                         "\xce\xbb\x4e\x46\x6d\xae\x5a\x10"
+                         "\x73\xa6\x72\x76\x27\x09\x7a\x10"
+                         "\x49\xe6\x17\xd9\x1d\x36\x10\x94"
+                         "\xfa\x68\xf0\xff\x77\x98\x71\x30"
+                         "\x30\x5b\xea\xba\x2e\xda\x04\xdf"
+                         "\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
+                         "\xa6\xad\x5c\xb4\x02\x2b\x02\x70"
+                         "\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
+                         "\x22\x39\x23\x36\xfe\xa1\x85\x1f"
+                         "\x38",
+               .clen   = 281,
        },
 };
 
 /*
- * MORUS-640 test vectors - generated via reference implementation from
+ * draft-irtf-cfrg-chacha20-poly1305
+ */
+static const struct aead_testvec rfc7539esp_tv_template[] = {
+       {
+               .key    = "\x1c\x92\x40\xa5\xeb\x55\xd3\x8a"
+                         "\xf3\x33\x88\x86\x04\xf6\xb5\xf0"
+                         "\x47\x39\x17\xc1\x40\x2b\x80\x09"
+                         "\x9d\xca\x5c\xbc\x20\x70\x75\xc0"
+                         "\x00\x00\x00\x00",
+               .klen   = 36,
+               .iv     = "\x01\x02\x03\x04\x05\x06\x07\x08",
+               .assoc  = "\xf3\x33\x88\x86\x00\x00\x00\x00"
+                         "\x00\x00\x4e\x91\x01\x02\x03\x04"
+                         "\x05\x06\x07\x08",
+               .alen   = 20,
+               .ptext  = "\x49\x6e\x74\x65\x72\x6e\x65\x74"
+                         "\x2d\x44\x72\x61\x66\x74\x73\x20"
+                         "\x61\x72\x65\x20\x64\x72\x61\x66"
+                         "\x74\x20\x64\x6f\x63\x75\x6d\x65"
+                         "\x6e\x74\x73\x20\x76\x61\x6c\x69"
+                         "\x64\x20\x66\x6f\x72\x20\x61\x20"
+                         "\x6d\x61\x78\x69\x6d\x75\x6d\x20"
+                         "\x6f\x66\x20\x73\x69\x78\x20\x6d"
+                         "\x6f\x6e\x74\x68\x73\x20\x61\x6e"
+                         "\x64\x20\x6d\x61\x79\x20\x62\x65"
+                         "\x20\x75\x70\x64\x61\x74\x65\x64"
+                         "\x2c\x20\x72\x65\x70\x6c\x61\x63"
+                         "\x65\x64\x2c\x20\x6f\x72\x20\x6f"
+                         "\x62\x73\x6f\x6c\x65\x74\x65\x64"
+                         "\x20\x62\x79\x20\x6f\x74\x68\x65"
+                         "\x72\x20\x64\x6f\x63\x75\x6d\x65"
+                         "\x6e\x74\x73\x20\x61\x74\x20\x61"
+                         "\x6e\x79\x20\x74\x69\x6d\x65\x2e"
+                         "\x20\x49\x74\x20\x69\x73\x20\x69"
+                         "\x6e\x61\x70\x70\x72\x6f\x70\x72"
+                         "\x69\x61\x74\x65\x20\x74\x6f\x20"
+                         "\x75\x73\x65\x20\x49\x6e\x74\x65"
+                         "\x72\x6e\x65\x74\x2d\x44\x72\x61"
+                         "\x66\x74\x73\x20\x61\x73\x20\x72"
+                         "\x65\x66\x65\x72\x65\x6e\x63\x65"
+                         "\x20\x6d\x61\x74\x65\x72\x69\x61"
+                         "\x6c\x20\x6f\x72\x20\x74\x6f\x20"
+                         "\x63\x69\x74\x65\x20\x74\x68\x65"
+                         "\x6d\x20\x6f\x74\x68\x65\x72\x20"
+                         "\x74\x68\x61\x6e\x20\x61\x73\x20"
+                         "\x2f\xe2\x80\x9c\x77\x6f\x72\x6b"
+                         "\x20\x69\x6e\x20\x70\x72\x6f\x67"
+                         "\x72\x65\x73\x73\x2e\x2f\xe2\x80"
+                         "\x9d",
+               .plen   = 265,
+               .ctext  = "\x64\xa0\x86\x15\x75\x86\x1a\xf4"
+                         "\x60\xf0\x62\xc7\x9b\xe6\x43\xbd"
+                         "\x5e\x80\x5c\xfd\x34\x5c\xf3\x89"
+                         "\xf1\x08\x67\x0a\xc7\x6c\x8c\xb2"
+                         "\x4c\x6c\xfc\x18\x75\x5d\x43\xee"
+                         "\xa0\x9e\xe9\x4e\x38\x2d\x26\xb0"
+                         "\xbd\xb7\xb7\x3c\x32\x1b\x01\x00"
+                         "\xd4\xf0\x3b\x7f\x35\x58\x94\xcf"
+                         "\x33\x2f\x83\x0e\x71\x0b\x97\xce"
+                         "\x98\xc8\xa8\x4a\xbd\x0b\x94\x81"
+                         "\x14\xad\x17\x6e\x00\x8d\x33\xbd"
+                         "\x60\xf9\x82\xb1\xff\x37\xc8\x55"
+                         "\x97\x97\xa0\x6e\xf4\xf0\xef\x61"
+                         "\xc1\x86\x32\x4e\x2b\x35\x06\x38"
+                         "\x36\x06\x90\x7b\x6a\x7c\x02\xb0"
+                         "\xf9\xf6\x15\x7b\x53\xc8\x67\xe4"
+                         "\xb9\x16\x6c\x76\x7b\x80\x4d\x46"
+                         "\xa5\x9b\x52\x16\xcd\xe7\xa4\xe9"
+                         "\x90\x40\xc5\xa4\x04\x33\x22\x5e"
+                         "\xe2\x82\xa1\xb0\xa0\x6c\x52\x3e"
+                         "\xaf\x45\x34\xd7\xf8\x3f\xa1\x15"
+                         "\x5b\x00\x47\x71\x8c\xbc\x54\x6a"
+                         "\x0d\x07\x2b\x04\xb3\x56\x4e\xea"
+                         "\x1b\x42\x22\x73\xf5\x48\x27\x1a"
+                         "\x0b\xb2\x31\x60\x53\xfa\x76\x99"
+                         "\x19\x55\xeb\xd6\x31\x59\x43\x4e"
+                         "\xce\xbb\x4e\x46\x6d\xae\x5a\x10"
+                         "\x73\xa6\x72\x76\x27\x09\x7a\x10"
+                         "\x49\xe6\x17\xd9\x1d\x36\x10\x94"
+                         "\xfa\x68\xf0\xff\x77\x98\x71\x30"
+                         "\x30\x5b\xea\xba\x2e\xda\x04\xdf"
+                         "\x99\x7b\x71\x4d\x6c\x6f\x2c\x29"
+                         "\xa6\xad\x5c\xb4\x02\x2b\x02\x70"
+                         "\x9b\xee\xad\x9d\x67\x89\x0c\xbb"
+                         "\x22\x39\x23\x36\xfe\xa1\x85\x1f"
+                         "\x38",
+               .clen   = 281,
+       },
+};
+
+/*
+ * AEGIS-128 test vectors - generated via reference implementation from
  * SUPERCOP (https://bench.cr.yp.to/supercop.html):
  *
  *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
- *   (see crypto_aead/morus640128v2/)
+ *   (see crypto_aead/aegis128/)
  */
-static const struct aead_testvec morus640_enc_tv_template[] = {
+static const struct aead_testvec aegis128_tv_template[] = {
        {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 16,
-               .iv     = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
+               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
                          "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
+               .klen   = 16,
+               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
+                         "\x40\x6d\x59\x48\xfc\x92\x61\x03",
                .assoc  = "",
                .alen   = 0,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x89\x62\x7d\xf3\x07\x9d\x52\x05"
-                         "\x53\xc3\x04\x60\x93\xb4\x37\x9a",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x07\xa5\x11\xf2\x9d\x40\xb8\x6d"
+                         "\xda\xb8\x12\x34\x4c\x53\xd9\x72",
+               .clen   = 16,
        }, {
-               .key    = "\x3c\x24\x39\x9f\x10\x7b\xa8\x1b"
-                         "\x80\xda\xb2\x91\xf9\x24\xc2\x06",
-               .klen   = 16,
-               .iv     = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
+               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
                          "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
+               .klen   = 16,
+               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
+                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x69",
-               .ilen   = 1,
-               .result = "\xa8\x8d\xe4\x90\xb5\x50\x8f\x78"
-                         "\xb6\x10\x9a\x59\x5f\x61\x37\x70"
-                         "\x09",
-               .rlen   = 17,
+               .ptext  = "\x79",
+               .plen   = 1,
+               .ctext  = "\x9e\x78\x52\xae\xcb\x9e\xe4\xd3"
+                         "\x9a\xd7\x5d\xd7\xaa\x9a\xe9\x5a"
+                         "\xcc",
+               .clen   = 17,
        }, {
-               .key    = "\x79\x49\x73\x3e\x20\xf7\x51\x37"
-                         "\x01\xb4\x64\x22\xf3\x48\x85\x0c",
-               .klen   = 16,
-               .iv     = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
+               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
                          "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
+               .klen   = 16,
+               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
+                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xa6\xa4\x1e\x76\xec\xd4\x50\xcc"
-                         "\x62\x58\xe9\x8f\xef\xa4\x17",
-               .ilen   = 15,
-               .result = "\x76\xdd\xb9\x05\x3d\xce\x61\x38"
-                         "\xf3\xef\xf7\xe5\xd7\xfd\x70\xa5"
-                         "\xcf\x9d\x64\xb8\x0a\x9f\xfd\x8b"
-                         "\xd4\x6e\xfe\xd9\xc8\x63\x4b",
-               .rlen   = 31,
+               .ptext  = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
+                         "\x82\x8e\x16\xb4\xed\x6d\x47",
+               .plen   = 15,
+               .ctext  = "\xc3\x80\x83\x04\x5f\xaa\x61\xc7"
+                         "\xca\xdd\x6f\xac\x85\x08\xb5\x35"
+                         "\x2b\xc2\x3e\x0b\x1b\x39\x37\x2b"
+                         "\x7a\x21\x16\xb3\xe6\x67\x66",
+               .clen   = 31,
        }, {
-               .key    = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47\x12",
-               .klen   = 16,
-               .iv     = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
+               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
                          "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
+               .klen   = 16,
+               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
+                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xe2\xc9\x58\x15\xfc\x4f\xf8\xe8"
-                         "\xe3\x32\x9b\x21\xe9\xc8\xd9\x97",
-               .ilen   = 16,
-               .result = "\xdc\x72\xe8\x14\xfb\x63\xad\x72"
-                         "\x1f\x57\x9a\x1f\x88\x81\xdb\xd6"
-                         "\xc1\x91\x9d\xb9\x25\xc4\x99\x4c"
-                         "\x97\xcd\x8a\x0c\x9d\x68\x00\x1c",
-               .rlen   = 32,
-       }, {
-               .key    = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
+               .ptext  = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
                          "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .klen   = 16,
-               .iv     = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
+               .plen   = 16,
+               .ctext  = "\x23\x25\x30\xe5\x6a\xb6\x36\x7d"
+                         "\x38\xfd\x3a\xd2\xc2\x58\xa9\x11"
+                         "\x1e\xa8\x30\x9c\x16\xa4\xdb\x65"
+                         "\x51\x10\x16\x27\x70\x9b\x64\x29",
+               .clen   = 32,
+       }, {
+               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
                          "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
+               .klen   = 16,
+               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
+                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x1f\xee\x92\xb4\x0c\xcb\xa1\x04"
-                         "\x64\x0c\x4d\xb2\xe3\xec\x9c\x9d"
-                         "\x09",
-               .ilen   = 17,
-               .result = "\x6b\x4f\x3b\x90\x9a\xa2\xb3\x82"
-                         "\x0a\xb8\x55\xee\xeb\x73\x4d\x7f"
-                         "\x54\x11\x3a\x8a\x31\xa3\xb5\xf2"
-                         "\xcd\x49\xdb\xf3\xee\x26\xbd\xa2"
-                         "\x0d",
-               .rlen   = 33,
+               .ptext  = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
+                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
+                         "\xd3",
+               .plen   = 17,
+               .ctext  = "\x2a\x8d\x56\x91\xc6\xf3\x56\xa5"
+                         "\x1f\xf0\x89\x2e\x13\xad\xe6\xf6"
+                         "\x46\x80\xb1\x0e\x18\x30\x40\x97"
+                         "\x03\xdf\x64\x3c\xbe\x93\x9e\xc9"
+                         "\x3b",
+               .clen   = 33,
        }, {
-               .key    = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f",
-               .klen   = 16,
-               .iv     = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
+               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
                          "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
+               .klen   = 16,
+               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
+                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x5c\x13\xcb\x54\x1c\x47\x4a\x1f"
-                         "\xe5\xe6\xff\x44\xdd\x11\x5f\xa3"
-                         "\x33\xdd\xc2\xf8\xdd\x18\x2b\x93"
-                         "\x57\x05\x01\x1c\x66\x22\xd3",
-               .ilen   = 31,
-               .result = "\x59\xd1\x0f\x6b\xee\x27\x84\x92"
-                         "\xb7\xa9\xb5\xdd\x02\xa4\x12\xa5"
-                         "\x50\x32\xb4\x9a\x2e\x35\x83\x55"
-                         "\x36\x12\x12\xed\xa3\x31\xc5\x30"
-                         "\xa7\xe2\x4a\x6d\x05\x59\x43\x91"
-                         "\x75\xfa\x6c\x17\xc6\x73\xca",
-               .rlen   = 47,
+               .ptext  = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
+                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
+                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
+                         "\x88\x11\x39\x12\x1c\x3a\xbb",
+               .plen   = 31,
+               .ctext  = "\x4e\xf6\xfa\x13\xde\x43\x63\x4c"
+                         "\xe2\x04\x3e\xe4\x85\x14\xb6\x3f"
+                         "\xb1\x8f\x4c\xdb\x41\xa2\x14\x99"
+                         "\xf5\x53\x0f\x73\x86\x7e\x97\xa1"
+                         "\x4b\x56\x5b\x94\xce\xcd\x74\xcd"
+                         "\x75\xc4\x53\x01\x89\x45\x59",
+               .clen   = 47,
        }, {
-               .key    = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25",
-               .klen   = 16,
-               .iv     = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
+               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
                          "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
+               .klen   = 16,
+               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
+                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x98\x37\x05\xf3\x2c\xc2\xf3\x3b"
-                         "\x66\xc0\xb1\xd5\xd7\x35\x21\xaa"
-                         "\x5d\x9f\xce\x7c\xe2\xb8\xad\xad"
-                         "\x19\x33\xe0\xf4\x40\x81\x72\x28",
-               .ilen   = 32,
-               .result = "\xdb\x49\x68\x0f\x91\x5b\x21\xb1"
-                         "\xcf\x50\xb2\x4c\x32\xe1\xa6\x69"
-                         "\xc0\xfb\x44\x1f\xa0\x9a\xeb\x39"
-                         "\x1b\xde\x68\x38\xcc\x27\x52\xc5"
-                         "\xf6\x3e\x74\xea\x66\x5b\x5f\x0c"
-                         "\x65\x9e\x58\xe6\x52\xa2\xfe\x59",
-               .rlen   = 48,
+               .ptext  = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
+                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
+                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
+                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
+               .plen   = 32,
+               .ctext  = "\xa4\x9a\xb7\xfd\xa0\xd4\xd6\x47"
+                         "\x95\xf4\x58\x38\x14\x83\x27\x01"
+                         "\x4c\xed\x32\x2c\xf7\xd6\x31\xf7"
+                         "\x38\x1b\x2c\xc9\xb6\x31\xce\xaa"
+                         "\xa5\x3c\x1a\x18\x5c\xce\xb9\xdf"
+                         "\x51\x52\x77\xf2\x5e\x85\x80\x41",
+               .clen   = 48,
        }, {
-               .key    = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b",
-               .klen   = 16,
-               .iv     = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
+               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
                          "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .assoc  = "\xc5",
+               .klen   = 16,
+               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
+                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e",
+               .assoc  = "\xd5",
                .alen   = 1,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x56\xe7\x24\x52\xdd\x95\x60\x5b"
-                         "\x09\x48\x39\x69\x9c\xb3\x62\x46",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xfb\xd4\x83\x71\x9e\x63\xad\x60"
+                         "\xb9\xf9\xeb\x34\x52\x49\xcf\xb7",
+               .clen   = 16,
        }, {
-               .key    = "\xe4\x25\xcd\xfa\x80\xdd\x46\xde"
-                         "\x07\xd1\x90\x8b\xcf\x23\x15\x31",
-               .klen   = 16,
-               .iv     = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
+               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
                          "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .assoc  = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76",
+               .klen   = 16,
+               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
+                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34",
+               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
+                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
                .alen   = 15,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xdd\xfa\x6c\x1f\x5d\x86\x87\x01"
-                         "\x13\xe5\x73\x46\x46\xf2\x5c\xe1",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x0c\xaf\x2e\x96\xf6\x97\x08\x71"
+                         "\x7d\x3a\x84\xc4\x44\x57\x77\x7e",
+               .clen   = 16,
        }, {
-               .key    = "\x20\x4a\x07\x99\x91\x58\xee\xfa"
-                         "\x88\xab\x42\x1c\xc9\x47\xd7\x38",
-               .klen   = 16,
-               .iv     = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
+               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
                          "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .assoc  = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
+               .klen   = 16,
+               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
                          "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
+               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
+                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
                .alen   = 16,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xa6\x1b\xb9\xd7\x5e\x3c\xcf\xac"
-                         "\xa9\x21\x45\x0b\x16\x52\xf7\xe1",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xc7\x87\x09\x3b\xc7\x19\x74\x22"
+                         "\x22\xa5\x67\x10\xb2\x36\xb3\x45",
+               .clen   = 16,
        }, {
-               .key    = "\x5d\x6f\x41\x39\xa1\xd4\x97\x16"
-                         "\x09\x85\xf4\xae\xc3\x6b\x9a\x3e",
-               .klen   = 16,
-               .iv     = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
+               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
                          "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .assoc  = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41"
-                         "\x3c",
+               .klen   = 16,
+               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
+                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41",
+               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
+                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
+                         "\x07",
                .alen   = 17,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x15\xff\xde\x3b\x34\xfc\xf6\xf9"
-                         "\xbb\xa8\x62\xad\x0a\xf5\x48\x60",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x02\xc6\x3b\x46\x65\xb2\xef\x91"
+                         "\x31\xf0\x45\x48\x8a\x2a\xed\xe4",
+               .clen   = 16,
        }, {
-               .key    = "\x99\x93\x7a\xd8\xb1\x50\x40\x31"
-                         "\x8a\x60\xa6\x3f\xbd\x90\x5d\x44",
-               .klen   = 16,
-               .iv     = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
+               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
                          "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .assoc  = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47"
-                         "\x67\xba\x85\xf1\xbb\x30\x56\x26"
-                         "\xaf\x0b\x02\x38\xcc\x44\xa7",
+               .klen   = 16,
+               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
+                         "\xca\xcd\xff\x88\xba\x22\xbe\x47",
+               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
+                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
+                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
+                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
                .alen   = 31,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xd2\x9d\xf8\x3b\xd7\x84\xe9\x2d"
-                         "\x4b\xef\x75\x16\x0a\x99\xae\x6b",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x20\x85\xa8\xd0\x91\x48\x85\xf3"
+                         "\x5a\x16\xc0\x57\x68\x47\xdd\xcb",
+               .clen   = 16,
        }, {
-               .key    = "\xd6\xb8\xb4\x77\xc1\xcb\xe9\x4d"
-                         "\x0a\x3a\x58\xd1\xb7\xb4\x1f\x4a",
-               .klen   = 16,
-               .iv     = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
+               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
                          "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .assoc  = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d"
-                         "\x91\x7c\x91\x75\xc0\xd0\xd8\x40"
-                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a",
+               .klen   = 16,
+               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
+                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d",
+               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
+                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
+                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
+                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
                .alen   = 32,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xe4\x8d\xa7\xa7\x45\xc1\x31\x4f"
-                         "\xce\xfb\xaf\xd6\xc2\xe6\xee\xc0",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x6a\xf8\x8d\x9c\x42\x75\x35\x79"
+                         "\xc1\x96\xbd\x31\x6e\x69\x1b\x50",
+               .clen   = 16,
        }, {
-               .key    = "\x12\xdd\xee\x17\xd1\x47\x92\x69"
-                         "\x8b\x14\x0a\x62\xb1\xd9\xe2\x50",
-               .klen   = 16,
-               .iv     = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
+               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
                          "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .assoc  = "\x31",
+               .klen   = 16,
+               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
+                         "\xcc\x81\x63\xab\xae\x6b\x43\x54",
+               .assoc  = "\x40",
                .alen   = 1,
-               .input  = "\x40",
-               .ilen   = 1,
-               .result = "\xe2\x67\x38\x4f\xb9\xad\x7d\x38"
-                         "\x01\xfe\x84\x14\x85\xf8\xd1\xe3"
-                         "\x22",
-               .rlen   = 17,
+               .ptext  = "\x4f",
+               .plen   = 1,
+               .ctext  = "\x01\x24\xb1\xba\xf6\xd3\xdf\x83"
+                         "\x70\x45\xe3\x2a\x9d\x5c\x63\x98"
+                         "\x39",
+               .clen   = 17,
        }, {
-               .key    = "\x4f\x01\x27\xb6\xe1\xc3\x3a\x85"
-                         "\x0c\xee\xbc\xf4\xab\xfd\xa5\x57",
-               .klen   = 16,
-               .iv     = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
+               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
                          "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .assoc  = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06",
-               .alen   = 15,
-               .input  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
+               .klen   = 16,
+               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
+                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a",
+               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
                          "\x6d\x92\x42\x61\xa7\x58\x37",
-               .ilen   = 15,
-               .result = "\x77\x32\x61\xeb\xb4\x33\x29\x92"
-                         "\x29\x95\xc5\x8e\x85\x76\xab\xfc"
-                         "\x07\x95\xa7\x44\x74\xf7\x22\xff"
-                         "\xd8\xd8\x36\x3d\x8a\x7f\x9e",
-               .rlen   = 31,
+               .alen   = 15,
+               .ptext  = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
+                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
+               .plen   = 15,
+               .ctext  = "\x18\x78\xc2\x6e\xe1\xf7\xe6\x8a"
+                         "\xca\x0e\x62\x00\xa8\x21\xb5\x21"
+                         "\x3d\x36\xdb\xf7\xcc\x31\x94\x9c"
+                         "\x98\xbd\x71\x7a\xef\xa4\xfa",
+               .clen   = 31,
        }, {
-               .key    = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67\x5d",
-               .klen   = 16,
-               .iv     = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
+               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
                          "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .assoc  = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
+               .klen   = 16,
+               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
                          "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
-               .alen   = 16,
-               .input  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
+               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
                          "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .ilen   = 16,
-               .result = "\xd8\xfd\x44\x45\xf6\x42\x12\x38"
-                         "\xf2\x0b\xea\x4f\x9e\x11\x61\x07"
-                         "\x48\x67\x98\x18\x9b\xd0\x0c\x59"
-                         "\x67\xa4\x11\xb3\x2b\xd6\xc1\x70",
-               .rlen   = 32,
-       }, {
-               .key    = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
+               .alen   = 16,
+               .ptext  = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
                          "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .klen   = 16,
-               .iv     = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
+               .plen   = 16,
+               .ctext  = "\xea\xd1\x81\x75\xb4\x13\x1d\x86"
+                         "\xd4\x17\x26\xe5\xd6\x89\x39\x04"
+                         "\xa9\x6c\xca\xac\x40\x73\xb2\x4c"
+                         "\x9c\xb9\x0e\x79\x4c\x40\x65\xc6",
+               .clen   = 32,
+       }, {
+               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
                          "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .assoc  = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66"
-                         "\x3b",
-               .alen   = 17,
-               .input  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
+               .klen   = 16,
+               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
+                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66",
+               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
                          "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
                          "\x05",
-               .ilen   = 17,
-               .result = "\xb1\xab\x53\x4e\xc7\x40\x16\xb6"
-                         "\x71\x3a\x00\x9f\x41\x88\xb0\xb2"
-                         "\x71\x83\x85\x5f\xc8\x79\x0a\x99"
-                         "\x99\xdc\x89\x1c\x88\xd2\x3e\xf9"
-                         "\x83",
-               .rlen   = 33,
+               .alen   = 17,
+               .ptext  = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
+                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
+                         "\xd0",
+               .plen   = 17,
+               .ctext  = "\xf4\xb2\x84\xd1\x81\xfa\x98\x1c"
+                         "\x38\x2d\x69\x90\x1c\x71\x38\x98"
+                         "\x9f\xe1\x19\x3b\x63\x91\xaf\x6e"
+                         "\x4b\x07\x2c\xac\x53\xc5\xd5\xfe"
+                         "\x93",
+               .clen   = 33,
        }, {
-               .key    = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69",
-               .klen   = 16,
-               .iv     = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
+               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
                          "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .assoc  = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d"
-                         "\x65\x48\xcb\x0a\xda\xf0\x62\xc0"
-                         "\x38\x1d\x3b\x4a\xe9\x7e\x62",
-               .alen   = 31,
-               .input  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
+               .klen   = 16,
+               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
+                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d",
+               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
                          "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
                          "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
                          "\x68\x28\x73\x40\x9f\x96\x4a",
-               .ilen   = 31,
-               .result = "\x29\xc4\xf0\x03\xc1\x86\xdf\x06"
-                         "\x5c\x7b\xef\x64\x87\x00\xd1\x37"
-                         "\xa7\x08\xbc\x7f\x8f\x41\x54\xd0"
-                         "\x3e\xf1\xc3\xa2\x96\x84\xdd\x2a"
-                         "\x2d\x21\x30\xf9\x02\xdb\x06\x0c"
-                         "\xf1\x5a\x66\x69\xe0\xca\x83",
-               .rlen   = 47,
+               .alen   = 31,
+               .ptext  = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
+                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
+                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
+                         "\x98\x34\xab\x37\x56\xae\x32",
+               .plen   = 31,
+               .ctext  = "\xa0\xe7\x0a\x60\xe7\xb8\x8a\xdb"
+                         "\x94\xd3\x93\xf2\x41\x86\x16\xdd"
+                         "\x4c\xe8\xe7\xe0\x62\x48\x89\x40"
+                         "\xc0\x49\x9b\x63\x32\xec\x8b\xdb"
+                         "\xdc\xa6\xea\x2c\xc2\x7f\xf5\x04"
+                         "\xcb\xe5\x47\xbb\xa7\xd1\x9d",
+               .clen   = 47,
        }, {
-               .key    = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70",
-               .klen   = 16,
-               .iv     = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
+               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
                          "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .assoc  = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73"
-                         "\x8f\x0a\xd6\x8f\xdf\x90\xe4\xda"
-                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81",
-               .alen   = 32,
-               .input  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
+               .klen   = 16,
+               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
+                         "\x50\xc4\xde\x82\x90\x21\x11\x73",
+               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
                          "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
                          "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
                          "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .ilen   = 32,
-               .result = "\xe2\x2e\x44\xdf\xd3\x60\x6d\xb2"
-                         "\x70\x57\x37\xc5\xc2\x4f\x8d\x14"
-                         "\xc6\xbf\x8b\xec\xf5\x62\x67\xf2"
-                         "\x2f\xa1\xe6\xd6\xa7\xb1\x8c\x54"
-                         "\xe5\x6b\x49\xf9\x6e\x90\xc3\xaa"
-                         "\x7a\x00\x2e\x4d\x7f\x31\x2e\x81",
-               .rlen   = 48,
+               .alen   = 32,
+               .ptext  = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
+                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
+                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
+                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
+               .plen   = 32,
+               .ctext  = "\x62\xdc\x2d\x68\x2d\x71\xbb\x33"
+                         "\x13\xdf\xc0\x46\xf6\x61\x94\xa7"
+                         "\x60\xd3\xd4\xca\xd9\xbe\x82\xf3"
+                         "\xf1\x5b\xa0\xfa\x15\xba\xda\xea"
+                         "\x87\x68\x47\x08\x5d\xdd\x83\xb0"
+                         "\x60\xf4\x93\x20\xdf\x34\x8f\xea",
+               .clen   = 48,
        }, {
-               .key    = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76",
-               .klen   = 16,
-               .iv     = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
+               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
                          "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .assoc  = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79"
-                         "\xba\xcd\xe2\x13\xe4\x30\x66\xf4"
-                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58"
-                         "\x1a",
-               .alen   = 33,
-               .input  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
+               .klen   = 16,
+               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
+                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79",
+               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
                          "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
                          "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
                          "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d\x4d\x54\x51\x84\x61\xf6\x8e"
-                         "\x03\x31\xf2\x25\x16\xcc\xaa\xc6"
-                         "\x75\x73\x20\x30\x59\x54\xb2\xf0"
-                         "\x3a\x4b\xe0\x23\x8e\xa6\x08\x35"
-                         "\x8a",
-               .ilen   = 65,
-               .result = "\xc7\xca\x26\x61\x57\xee\xa2\xb9"
-                         "\xb1\x37\xde\x95\x06\x90\x11\x08"
-                         "\x4d\x30\x9f\x24\xc0\x56\xb7\xe1"
-                         "\x0b\x9f\xd2\x57\xe9\xd2\xb1\x76"
-                         "\x56\x9a\xb4\x58\xc5\x08\xfc\xb5"
-                         "\xf2\x31\x9b\xc9\xcd\xb3\x64\xdb"
-                         "\x6f\x50\xbf\xf4\x73\x9d\xfb\x6b"
-                         "\xef\x35\x25\x48\xed\xcf\x29\xa8"
-                         "\xac\xc3\xb9\xcb\x61\x8f\x73\x92"
-                         "\x2c\x7a\x6f\xda\xf9\x09\x6f\xe1"
-                         "\xc4",
-               .rlen   = 81,
+                         "\x9d",
+               .alen   = 33,
+               .ptext  = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
+                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
+                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
+                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
+                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
+                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
+                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
+                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
+                         "\xbd",
+               .plen   = 65,
+               .ctext  = "\x84\xc5\x21\xab\xe1\xeb\xbb\x6d"
+                         "\xaa\x2a\xaf\xeb\x3b\x3b\x69\xe7"
+                         "\x2c\x47\xef\x9d\xb7\x53\x36\xb7"
+                         "\xb6\xf5\xe5\xa8\xc9\x9e\x02\xd7"
+                         "\x83\x88\xc2\xbd\x2f\xf9\x10\xc0"
+                         "\xf5\xa1\x6e\xd3\x97\x64\x82\xa3"
+                         "\xfb\xda\x2c\xb1\x94\xa1\x58\x32"
+                         "\xe8\xd4\x39\xfc\x9e\x26\xf9\xf1"
+                         "\x61\xe6\xae\x07\xf2\xe0\xa7\x44"
+                         "\x96\x28\x3b\xee\x6b\xc6\x16\x31"
+                         "\x3f",
+               .clen   = 81,
        }, {
-               .key    = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c",
-               .klen   = 16,
-               .iv     = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
+               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
                          "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .assoc  = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f"
-                         "\xe4\x8f\xed\x97\xe9\xd0\xe8\x0d"
-                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e"
-                         "\x28\xce\x57\x34\xcd\x6e\x84\x4c"
-                         "\x17\x3c\xe1\xb2\xa8\x0b\xbb\xf1"
-                         "\x96\x41\x0d\x69\xe8\x54\x0a\xc8"
-                         "\x15\x4e\x91\x92\x89\x4b\xb7\x9b"
-                         "\x21",
-               .alen   = 65,
-               .input  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
+               .klen   = 16,
+               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
+                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f",
+               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
                          "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
                          "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
                          "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac",
-               .ilen   = 33,
-               .result = "\x57\xcd\x3d\x46\xc5\xf9\x68\x3b"
-                         "\x2c\x0f\xb4\x7e\x7b\x64\x3e\x40"
-                         "\xf3\x78\x63\x34\x89\x79\x39\x6b"
-                         "\x61\x64\x4a\x9a\xfa\x70\xa4\xd3"
-                         "\x54\x0b\xea\x05\xa6\x95\x64\xed"
-                         "\x3d\x69\xa2\x0c\x27\x56\x2f\x34"
-                         "\x66",
-               .rlen   = 49,
+                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
+                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
+                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
+                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
+                         "\x54",
+               .alen   = 65,
+               .ptext  = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
+                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
+                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
+                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
+                         "\x2f",
+               .plen   = 33,
+               .ctext  = "\x8f\x23\x47\xfb\xf2\xac\x23\x83"
+                         "\x77\x09\xac\x74\xef\xd2\x56\xae"
+                         "\x20\x7b\x7b\xca\x45\x8e\xc8\xc2"
+                         "\x50\xbd\xc7\x44\x1c\x54\x98\xd8"
+                         "\x1f\xd0\x9a\x79\xaa\xf9\xe1\xb3"
+                         "\xb4\x98\x5a\x9b\xe4\x4d\xbf\x4e"
+                         "\x39",
+               .clen   = 49,
        }, {
-               .key    = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82",
-               .klen   = 16,
-               .iv     = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
+               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
                          "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .assoc  = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
+               .klen   = 16,
+               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
                          "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
-               .alen   = 16,
-               .input  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
+               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
                          "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .ilen   = 16,
-               .result = "\xfc\x85\x06\x28\x8f\xe8\x23\x1f"
-                         "\x33\x98\x87\xde\x08\xb6\xb6\xae"
-                         "\x3e\xa4\xf8\x19\xf1\x92\x60\x39"
-                         "\xb9\x6b\x3f\xdf\xc8\xcb\x30",
-               .rlen   = 31,
-       }, {
-               .key    = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
+               .alen   = 16,
+               .ptext  = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
                          "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .klen   = 16,
-               .iv     = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
+               .plen   = 16,
+               .ctext  = "\x42\xc3\x58\xfb\x29\xe2\x4a\x56"
+                         "\xf1\xf5\xe1\x51\x55\x4b\x0a\x45"
+                         "\x46\xb5\x8d\xac\xb6\x34\xd8\x8b"
+                         "\xde\x20\x59\x77\xc1\x74\x90",
+               .clen   = 31,
+       }, {
+               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
                          "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .assoc  = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
+               .klen   = 16,
+               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
                          "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
-               .alen   = 16,
-               .input  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
+               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
                          "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .ilen   = 16,
-               .result = "\x74\x7d\x70\x07\xe9\xba\x01\xee"
-                         "\x6c\xc6\x6f\x50\x25\x33\xbe\x50"
-                         "\x17\xb8\x17\x62\xed\x80\xa2\xf5"
-                         "\x03\xde\x85\x71\x5d\x34",
-               .rlen   = 30,
-       }, {
-               .key    = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
+               .alen   = 16,
+               .ptext  = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
                          "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .klen   = 16,
-               .iv     = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
+               .plen   = 16,
+               .ctext  = "\xb2\xfb\xf6\x97\x69\x7a\xe9\xec"
+                         "\xe2\x94\xa1\x8b\xa0\x2b\x60\x72"
+                         "\x1d\x04\xdd\x6a\xef\x46\x8f\x68"
+                         "\xe9\xe0\x17\x45\x70\x12",
+               .clen   = 30,
+       }, {
+               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
                          "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
-               .assoc  = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
+               .klen   = 16,
+               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
                          "\xd5\x07\x58\x59\x72\xd7\xde\x92",
-               .alen   = 16,
-               .input  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
+               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
                          "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .ilen   = 16,
-               .result = "\xf4\xb3\x85\xf9\xac\xde\xb1\x38"
-                         "\x29\xfd\x6c\x7c\x49\xe5\x1d\xaf"
-                         "\xba\xea\xd4\xfa\x3f\x11\x33\x98",
-               .rlen   = 24,
-       }, {
-               .key    = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .klen   = 16,
-               .iv     = "\xbb\x3a\xf7\x57\xc6\x36\x7c\x22"
-                         "\x36\xab\xde\xc6\x6d\x32\x70\x17",
-               .assoc  = "\xcb\x03\x85\xbf\x0a\xd5\x26\xa9"
-                         "\x56\xe1\x0a\xeb\x6c\xfb\xa1\x98",
                .alen   = 16,
-               .input  = "\xda\xcc\x14\x27\x4e\x74\xd1\x30"
-                         "\x76\x18\x37\x0f\x6a\xc4\xd1\x1a",
-               .ilen   = 16,
-               .result = "\xe6\x5c\x49\x4f\x78\xf3\x62\x86"
-                         "\xe1\xb7\xa5\xc3\x32\x88\x3c\x8c"
-                         "\x6e",
-               .rlen   = 17,
+               .ptext  = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
+                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
+               .plen   = 16,
+               .ctext  = "\x47\xda\x54\x42\x51\x72\xc4\x8b"
+                         "\xf5\x57\x0f\x2f\x49\x0e\x11\x3b"
+                         "\x78\x93\xec\xfc\xf4\xff\xe1\x2d",
+               .clen   = 24,
        },
 };
 
-static const struct aead_testvec morus640_dec_tv_template[] = {
+/*
+ * AEGIS-128L test vectors - generated via reference implementation from
+ * SUPERCOP (https://bench.cr.yp.to/supercop.html):
+ *
+ *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
+ *   (see crypto_aead/aegis128l/)
+ */
+static const struct aead_testvec aegis128l_tv_template[] = {
        {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 16,
-               .iv     = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
+               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
                          "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
+               .klen   = 16,
+               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
+                         "\x40\x6d\x59\x48\xfc\x92\x61\x03",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x89\x62\x7d\xf3\x07\x9d\x52\x05"
-                         "\x53\xc3\x04\x60\x93\xb4\x37\x9a",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x30\x4f\xf3\xe9\xb1\xfa\x81\xa6"
+                         "\x20\x72\x78\xdd\x93\xc8\x57\xef",
+               .clen   = 16,
        }, {
-               .key    = "\x3c\x24\x39\x9f\x10\x7b\xa8\x1b"
-                         "\x80\xda\xb2\x91\xf9\x24\xc2\x06",
-               .klen   = 16,
-               .iv     = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
+               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
                          "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
+               .klen   = 16,
+               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
+                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xa8\x8d\xe4\x90\xb5\x50\x8f\x78"
-                         "\xb6\x10\x9a\x59\x5f\x61\x37\x70"
-                         "\x09",
-               .ilen   = 17,
-               .result = "\x69",
-               .rlen   = 1,
+               .ptext  = "\x79",
+               .plen   = 1,
+               .ctext  = "\xa9\x24\xa0\xb6\x2d\xdd\x29\xdb"
+                         "\x40\xb3\x71\xc5\x22\x58\x31\x77"
+                         "\x6d",
+               .clen   = 17,
        }, {
-               .key    = "\x79\x49\x73\x3e\x20\xf7\x51\x37"
-                         "\x01\xb4\x64\x22\xf3\x48\x85\x0c",
-               .klen   = 16,
-               .iv     = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
+               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
                          "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
+               .klen   = 16,
+               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
+                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x76\xdd\xb9\x05\x3d\xce\x61\x38"
-                         "\xf3\xef\xf7\xe5\xd7\xfd\x70\xa5"
-                         "\xcf\x9d\x64\xb8\x0a\x9f\xfd\x8b"
-                         "\xd4\x6e\xfe\xd9\xc8\x63\x4b",
-               .ilen   = 31,
-               .result = "\xa6\xa4\x1e\x76\xec\xd4\x50\xcc"
-                         "\x62\x58\xe9\x8f\xef\xa4\x17",
-               .rlen   = 15,
+               .ptext  = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
+                         "\x82\x8e\x16\xb4\xed\x6d\x47",
+               .plen   = 15,
+               .ctext  = "\xbb\x0a\x53\xc4\xaa\x7e\xa4\x03"
+                         "\x2b\xee\x62\x99\x7b\x98\x13\x1f"
+                         "\xe0\x76\x4c\x2e\x53\x99\x4f\xbe"
+                         "\xe1\xa8\x04\x7f\xe1\x71\xbe",
+               .clen   = 31,
        }, {
-               .key    = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47\x12",
-               .klen   = 16,
-               .iv     = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
+               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
                          "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
+               .klen   = 16,
+               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
+                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xdc\x72\xe8\x14\xfb\x63\xad\x72"
-                         "\x1f\x57\x9a\x1f\x88\x81\xdb\xd6"
-                         "\xc1\x91\x9d\xb9\x25\xc4\x99\x4c"
-                         "\x97\xcd\x8a\x0c\x9d\x68\x00\x1c",
-               .ilen   = 32,
-               .result = "\xe2\xc9\x58\x15\xfc\x4f\xf8\xe8"
-                         "\xe3\x32\x9b\x21\xe9\xc8\xd9\x97",
-               .rlen   = 16,
-       }, {
-               .key    = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
+               .ptext  = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
                          "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .klen   = 16,
-               .iv     = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
+               .plen   = 16,
+               .ctext  = "\x66\xdf\x6e\x71\xc0\x6e\xa4\x4c"
+                         "\x9d\xb7\x8c\x9a\xdb\x1f\xd2\x2e"
+                         "\x23\xb6\xa4\xfb\xd3\x86\xdd\xbb"
+                         "\xde\x54\x9b\xf5\x92\x8b\x93\xc5",
+               .clen   = 32,
+       }, {
+               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
                          "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
+               .klen   = 16,
+               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
+                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x6b\x4f\x3b\x90\x9a\xa2\xb3\x82"
-                         "\x0a\xb8\x55\xee\xeb\x73\x4d\x7f"
-                         "\x54\x11\x3a\x8a\x31\xa3\xb5\xf2"
-                         "\xcd\x49\xdb\xf3\xee\x26\xbd\xa2"
-                         "\x0d",
-               .ilen   = 33,
-               .result = "\x1f\xee\x92\xb4\x0c\xcb\xa1\x04"
-                         "\x64\x0c\x4d\xb2\xe3\xec\x9c\x9d"
-                         "\x09",
-               .rlen   = 17,
+               .ptext  = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
+                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
+                         "\xd3",
+               .plen   = 17,
+               .ctext  = "\x4f\xc3\x69\xb6\xd3\xa4\x64\x8b"
+                         "\x71\xc3\x8a\x91\x22\x4f\x1b\xd2"
+                         "\x33\x6d\x86\xbc\xf8\x2f\x06\xf9"
+                         "\x82\x64\xc7\x72\x00\x30\xfc\xf0"
+                         "\xf8",
+               .clen   = 33,
        }, {
-               .key    = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f",
-               .klen   = 16,
-               .iv     = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
+               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
                          "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
+               .klen   = 16,
+               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
+                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x59\xd1\x0f\x6b\xee\x27\x84\x92"
-                         "\xb7\xa9\xb5\xdd\x02\xa4\x12\xa5"
-                         "\x50\x32\xb4\x9a\x2e\x35\x83\x55"
-                         "\x36\x12\x12\xed\xa3\x31\xc5\x30"
-                         "\xa7\xe2\x4a\x6d\x05\x59\x43\x91"
-                         "\x75\xfa\x6c\x17\xc6\x73\xca",
-               .ilen   = 47,
-               .result = "\x5c\x13\xcb\x54\x1c\x47\x4a\x1f"
-                         "\xe5\xe6\xff\x44\xdd\x11\x5f\xa3"
-                         "\x33\xdd\xc2\xf8\xdd\x18\x2b\x93"
-                         "\x57\x05\x01\x1c\x66\x22\xd3",
-               .rlen   = 31,
+               .ptext  = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
+                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
+                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
+                         "\x88\x11\x39\x12\x1c\x3a\xbb",
+               .plen   = 31,
+               .ctext  = "\xe3\x93\x15\xae\x5f\x9d\x3c\xb5"
+                         "\xd6\x9d\xee\xee\xcf\xaa\xaf\xe1"
+                         "\x45\x10\x96\xe0\xbf\x55\x0f\x4c"
+                         "\x1a\xfd\xf4\xda\x4e\x10\xde\xc9"
+                         "\x0e\x6f\xc7\x3c\x49\x94\x41\xfc"
+                         "\x59\x28\x88\x3c\x79\x10\x6b",
+               .clen   = 47,
        }, {
-               .key    = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25",
-               .klen   = 16,
-               .iv     = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
+               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
                          "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
+               .klen   = 16,
+               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
+                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xdb\x49\x68\x0f\x91\x5b\x21\xb1"
-                         "\xcf\x50\xb2\x4c\x32\xe1\xa6\x69"
-                         "\xc0\xfb\x44\x1f\xa0\x9a\xeb\x39"
-                         "\x1b\xde\x68\x38\xcc\x27\x52\xc5"
-                         "\xf6\x3e\x74\xea\x66\x5b\x5f\x0c"
-                         "\x65\x9e\x58\xe6\x52\xa2\xfe\x59",
-               .ilen   = 48,
-               .result = "\x98\x37\x05\xf3\x2c\xc2\xf3\x3b"
-                         "\x66\xc0\xb1\xd5\xd7\x35\x21\xaa"
-                         "\x5d\x9f\xce\x7c\xe2\xb8\xad\xad"
-                         "\x19\x33\xe0\xf4\x40\x81\x72\x28",
-               .rlen   = 32,
+               .ptext  = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
+                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
+                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
+                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
+               .plen   = 32,
+               .ctext  = "\x1c\x8e\x22\x34\xfd\xab\xe6\x0d"
+                         "\x1c\x9f\x06\x54\x8b\x0b\xb4\x40"
+                         "\xde\x11\x59\x3e\xfd\x74\xf6\x42"
+                         "\x97\x17\xf7\x24\xb6\x7e\xc4\xc6"
+                         "\x06\xa3\x94\xda\x3d\x7f\x55\x0a"
+                         "\x92\x07\x2f\xa6\xf3\x6b\x2c\xfc",
+               .clen   = 48,
        }, {
-               .key    = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b",
-               .klen   = 16,
-               .iv     = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
+               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
                          "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .assoc  = "\xc5",
+               .klen   = 16,
+               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
+                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e",
+               .assoc  = "\xd5",
                .alen   = 1,
-               .input  = "\x56\xe7\x24\x52\xdd\x95\x60\x5b"
-                         "\x09\x48\x39\x69\x9c\xb3\x62\x46",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xa0\x2a\xb4\x9a\x91\x00\x15\xb8"
+                         "\x0f\x9a\x15\x60\x0e\x9b\x13\x8f",
+               .clen   = 16,
        }, {
-               .key    = "\xe4\x25\xcd\xfa\x80\xdd\x46\xde"
-                         "\x07\xd1\x90\x8b\xcf\x23\x15\x31",
-               .klen   = 16,
-               .iv     = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
+               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
                          "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .assoc  = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
-                         "\x47\x3e\xe9\xd4\xcc\xb5\x76",
+               .klen   = 16,
+               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
+                         "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34",
+               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
+                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
                .alen   = 15,
-               .input  = "\xdd\xfa\x6c\x1f\x5d\x86\x87\x01"
-                         "\x13\xe5\x73\x46\x46\xf2\x5c\xe1",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x4c\x26\xad\x9c\x14\xfd\x9c\x8c"
+                         "\x84\xfb\x26\xfb\xd5\xca\x62\x39",
+               .clen   = 16,
        }, {
-               .key    = "\x20\x4a\x07\x99\x91\x58\xee\xfa"
-                         "\x88\xab\x42\x1c\xc9\x47\xd7\x38",
-               .klen   = 16,
-               .iv     = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
+               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
                          "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .assoc  = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
+               .klen   = 16,
+               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
                          "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
+               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
+                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
                .alen   = 16,
-               .input  = "\xa6\x1b\xb9\xd7\x5e\x3c\xcf\xac"
-                         "\xa9\x21\x45\x0b\x16\x52\xf7\xe1",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x45\x85\x0e\x0f\xf4\xae\x96\xa1"
+                         "\x99\x4d\x6d\xb4\x67\x32\xb0\x3a",
+               .clen   = 16,
        }, {
-               .key    = "\x5d\x6f\x41\x39\xa1\xd4\x97\x16"
-                         "\x09\x85\xf4\xae\xc3\x6b\x9a\x3e",
-               .klen   = 16,
-               .iv     = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
+               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
                          "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .assoc  = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
-                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41"
-                         "\x3c",
+               .klen   = 16,
+               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
+                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41",
+               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
+                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
+                         "\x07",
                .alen   = 17,
-               .input  = "\x15\xff\xde\x3b\x34\xfc\xf6\xf9"
-                         "\xbb\xa8\x62\xad\x0a\xf5\x48\x60",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x33\xb1\x42\x97\x8e\x16\x7b\x63"
+                         "\x06\xba\x5b\xcb\xae\x6d\x8b\x56",
+               .clen   = 16,
        }, {
-               .key    = "\x99\x93\x7a\xd8\xb1\x50\x40\x31"
-                         "\x8a\x60\xa6\x3f\xbd\x90\x5d\x44",
-               .klen   = 16,
-               .iv     = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
+               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
                          "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .assoc  = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
-                         "\xca\xcd\xff\x88\xba\x22\xbe\x47"
-                         "\x67\xba\x85\xf1\xbb\x30\x56\x26"
-                         "\xaf\x0b\x02\x38\xcc\x44\xa7",
+               .klen   = 16,
+               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
+                         "\xca\xcd\xff\x88\xba\x22\xbe\x47",
+               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
+                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
+                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
+                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
                .alen   = 31,
-               .input  = "\xd2\x9d\xf8\x3b\xd7\x84\xe9\x2d"
-                         "\x4b\xef\x75\x16\x0a\x99\xae\x6b",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xda\x44\x08\x8c\x2a\xa5\x07\x35"
+                         "\x0b\x54\x4e\x6d\xe3\xfd\xc4\x5f",
+               .clen   = 16,
        }, {
-               .key    = "\xd6\xb8\xb4\x77\xc1\xcb\xe9\x4d"
-                         "\x0a\x3a\x58\xd1\xb7\xb4\x1f\x4a",
-               .klen   = 16,
-               .iv     = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
+               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
                          "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .assoc  = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
-                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d"
-                         "\x91\x7c\x91\x75\xc0\xd0\xd8\x40"
-                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a",
+               .klen   = 16,
+               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
+                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d",
+               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
+                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
+                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
+                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
                .alen   = 32,
-               .input  = "\xe4\x8d\xa7\xa7\x45\xc1\x31\x4f"
-                         "\xce\xfb\xaf\xd6\xc2\xe6\xee\xc0",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x1b\xb1\xf1\xa8\x9e\xc2\xb2\x88"
+                         "\x40\x7f\x7b\x19\x7a\x52\x8c\xf0",
+               .clen   = 16,
        }, {
-               .key    = "\x12\xdd\xee\x17\xd1\x47\x92\x69"
-                         "\x8b\x14\x0a\x62\xb1\xd9\xe2\x50",
-               .klen   = 16,
-               .iv     = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
+               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
                          "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .assoc  = "\x31",
+               .klen   = 16,
+               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
+                         "\xcc\x81\x63\xab\xae\x6b\x43\x54",
+               .assoc  = "\x40",
                .alen   = 1,
-               .input  = "\xe2\x67\x38\x4f\xb9\xad\x7d\x38"
-                         "\x01\xfe\x84\x14\x85\xf8\xd1\xe3"
-                         "\x22",
-               .ilen   = 17,
-               .result = "\x40",
-               .rlen   = 1,
+               .ptext  = "\x4f",
+               .plen   = 1,
+               .ctext  = "\x6e\xc8\xfb\x15\x9d\x98\x49\xc9"
+                         "\xa0\x98\x09\x85\xbe\x56\x8e\x79"
+                         "\xf4",
+               .clen   = 17,
        }, {
-               .key    = "\x4f\x01\x27\xb6\xe1\xc3\x3a\x85"
-                         "\x0c\xee\xbc\xf4\xab\xfd\xa5\x57",
-               .klen   = 16,
-               .iv     = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
+               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
                          "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .assoc  = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
-                         "\x4d\x5b\x15\x3c\xa8\x8f\x06",
-               .alen   = 15,
-               .input  = "\x77\x32\x61\xeb\xb4\x33\x29\x92"
-                         "\x29\x95\xc5\x8e\x85\x76\xab\xfc"
-                         "\x07\x95\xa7\x44\x74\xf7\x22\xff"
-                         "\xd8\xd8\x36\x3d\x8a\x7f\x9e",
-               .ilen   = 31,
-               .result = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
+               .klen   = 16,
+               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
+                         "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a",
+               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
                          "\x6d\x92\x42\x61\xa7\x58\x37",
-               .rlen   = 15,
+               .alen   = 15,
+               .ptext  = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
+                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
+               .plen   = 15,
+               .ctext  = "\x99\x2e\x84\x50\x64\x5c\xab\x29"
+                         "\x20\xba\xb9\x2f\x62\x3a\xce\x2a"
+                         "\x75\x25\x3b\xe3\x40\xe0\x1d\xfc"
+                         "\x20\x63\x0b\x49\x7e\x97\x08",
+               .clen   = 31,
        }, {
-               .key    = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67\x5d",
-               .klen   = 16,
-               .iv     = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
+               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
                          "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .assoc  = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
+               .klen   = 16,
+               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
                          "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
-               .alen   = 16,
-               .input  = "\xd8\xfd\x44\x45\xf6\x42\x12\x38"
-                         "\xf2\x0b\xea\x4f\x9e\x11\x61\x07"
-                         "\x48\x67\x98\x18\x9b\xd0\x0c\x59"
-                         "\x67\xa4\x11\xb3\x2b\xd6\xc1\x70",
-               .ilen   = 32,
-               .result = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
+               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
                          "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
-               .rlen   = 16,
-       }, {
-               .key    = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
+               .alen   = 16,
+               .ptext  = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
                          "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .klen   = 16,
-               .iv     = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
+               .plen   = 16,
+               .ctext  = "\xd9\x8e\xfd\x50\x8f\x02\x9f\xee"
+                         "\x78\x08\x12\xec\x09\xaf\x53\x14"
+                         "\x90\x3e\x3d\x76\xad\x71\x21\x08"
+                         "\x77\xe5\x4b\x15\xc2\xe6\xbc\xdb",
+               .clen   = 32,
+       }, {
+               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
                          "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .assoc  = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
-                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66"
-                         "\x3b",
-               .alen   = 17,
-               .input  = "\xb1\xab\x53\x4e\xc7\x40\x16\xb6"
-                         "\x71\x3a\x00\x9f\x41\x88\xb0\xb2"
-                         "\x71\x83\x85\x5f\xc8\x79\x0a\x99"
-                         "\x99\xdc\x89\x1c\x88\xd2\x3e\xf9"
-                         "\x83",
-               .ilen   = 33,
-               .result = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
+               .klen   = 16,
+               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
+                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66",
+               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
                          "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
                          "\x05",
-               .rlen   = 17,
+               .alen   = 17,
+               .ptext  = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
+                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
+                         "\xd0",
+               .plen   = 17,
+               .ctext  = "\xf3\xe7\x95\x86\xcf\x34\x95\x96"
+                         "\x17\xfe\x1b\xae\x1b\x31\xf2\x1a"
+                         "\xbd\xbc\xc9\x4e\x11\x29\x09\x5c"
+                         "\x05\xd3\xb4\x2e\x4a\x74\x59\x49"
+                         "\x7d",
+               .clen   = 33,
        }, {
-               .key    = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69",
-               .klen   = 16,
-               .iv     = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
+               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
                          "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .assoc  = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
-                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d"
-                         "\x65\x48\xcb\x0a\xda\xf0\x62\xc0"
-                         "\x38\x1d\x3b\x4a\xe9\x7e\x62",
-               .alen   = 31,
-               .input  = "\x29\xc4\xf0\x03\xc1\x86\xdf\x06"
-                         "\x5c\x7b\xef\x64\x87\x00\xd1\x37"
-                         "\xa7\x08\xbc\x7f\x8f\x41\x54\xd0"
-                         "\x3e\xf1\xc3\xa2\x96\x84\xdd\x2a"
-                         "\x2d\x21\x30\xf9\x02\xdb\x06\x0c"
-                         "\xf1\x5a\x66\x69\xe0\xca\x83",
-               .ilen   = 47,
-               .result = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
+               .klen   = 16,
+               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
+                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d",
+               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
                          "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
                          "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
                          "\x68\x28\x73\x40\x9f\x96\x4a",
-               .rlen   = 31,
+               .alen   = 31,
+               .ptext  = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
+                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
+                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
+                         "\x98\x34\xab\x37\x56\xae\x32",
+               .plen   = 31,
+               .ctext  = "\x06\x96\xb2\xbf\x63\xf4\x1e\x24"
+                         "\x0d\x19\x15\x61\x65\x3b\x06\x26"
+                         "\x71\xe8\x7e\x16\xdb\x96\x01\x01"
+                         "\x52\xcd\x49\x5b\x07\x33\x4e\xe7"
+                         "\xaa\x91\xf5\xd5\xc6\xfe\x41\xb5"
+                         "\xed\x90\xce\xb9\xcd\xcc\xa1",
+               .clen   = 47,
        }, {
-               .key    = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70",
-               .klen   = 16,
-               .iv     = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
+               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
                          "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .assoc  = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
-                         "\x50\xc4\xde\x82\x90\x21\x11\x73"
-                         "\x8f\x0a\xd6\x8f\xdf\x90\xe4\xda"
-                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81",
-               .alen   = 32,
-               .input  = "\xe2\x2e\x44\xdf\xd3\x60\x6d\xb2"
-                         "\x70\x57\x37\xc5\xc2\x4f\x8d\x14"
-                         "\xc6\xbf\x8b\xec\xf5\x62\x67\xf2"
-                         "\x2f\xa1\xe6\xd6\xa7\xb1\x8c\x54"
-                         "\xe5\x6b\x49\xf9\x6e\x90\xc3\xaa"
-                         "\x7a\x00\x2e\x4d\x7f\x31\x2e\x81",
-               .ilen   = 48,
-               .result = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
+               .klen   = 16,
+               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
+                         "\x50\xc4\xde\x82\x90\x21\x11\x73",
+               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
                          "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
                          "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
                          "\x29\x56\x52\x19\x79\xf5\xe9\x37",
-               .rlen   = 32,
+               .alen   = 32,
+               .ptext  = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
+                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
+                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
+                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
+               .plen   = 32,
+               .ctext  = "\xf9\xd7\xee\x17\xfd\x24\xcd\xf1"
+                         "\xbc\x0f\x35\x97\x97\x0c\x4b\x18"
+                         "\xce\x58\xc8\x3b\xd4\x85\x93\x79"
+                         "\xcc\x9c\xea\xc1\x73\x13\x0b\x4c"
+                         "\xcc\x6f\x28\xf8\xa4\x4e\xb8\x56"
+                         "\x64\x4e\x47\xce\xb2\xb4\x92\xb4",
+               .clen   = 48,
        }, {
-               .key    = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76",
-               .klen   = 16,
-               .iv     = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
+               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
                          "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .assoc  = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
-                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79"
-                         "\xba\xcd\xe2\x13\xe4\x30\x66\xf4"
-                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58"
-                         "\x1a",
-               .alen   = 33,
-               .input  = "\xc7\xca\x26\x61\x57\xee\xa2\xb9"
-                         "\xb1\x37\xde\x95\x06\x90\x11\x08"
-                         "\x4d\x30\x9f\x24\xc0\x56\xb7\xe1"
-                         "\x0b\x9f\xd2\x57\xe9\xd2\xb1\x76"
-                         "\x56\x9a\xb4\x58\xc5\x08\xfc\xb5"
-                         "\xf2\x31\x9b\xc9\xcd\xb3\x64\xdb"
-                         "\x6f\x50\xbf\xf4\x73\x9d\xfb\x6b"
-                         "\xef\x35\x25\x48\xed\xcf\x29\xa8"
-                         "\xac\xc3\xb9\xcb\x61\x8f\x73\x92"
-                         "\x2c\x7a\x6f\xda\xf9\x09\x6f\xe1"
-                         "\xc4",
-               .ilen   = 81,
-               .result = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
+               .klen   = 16,
+               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
+                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79",
+               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
                          "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
                          "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
                          "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d\x4d\x54\x51\x84\x61\xf6\x8e"
-                         "\x03\x31\xf2\x25\x16\xcc\xaa\xc6"
-                         "\x75\x73\x20\x30\x59\x54\xb2\xf0"
-                         "\x3a\x4b\xe0\x23\x8e\xa6\x08\x35"
-                         "\x8a",
-               .rlen   = 65,
+                         "\x9d",
+               .alen   = 33,
+               .ptext  = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
+                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
+                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
+                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
+                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
+                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
+                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
+                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
+                         "\xbd",
+               .plen   = 65,
+               .ctext  = "\x58\xfa\x3a\x3d\xd9\x88\x63\xe8"
+                         "\xc5\x78\x50\x8b\x4a\xc9\xdf\x7f"
+                         "\x4b\xfa\xc8\x2e\x67\x43\xf3\x63"
+                         "\x42\x8e\x99\x5a\x9c\x0b\x84\x77"
+                         "\xbc\x46\x76\x48\x82\xc7\x57\x96"
+                         "\xe1\x65\xd1\xed\x1d\xdd\x80\x24"
+                         "\xa6\x4d\xa9\xf1\x53\x8b\x5e\x0e"
+                         "\x26\xb9\xcc\x37\xe5\x43\xe1\x5a"
+                         "\x8a\xd6\x8c\x5a\xe4\x95\xd1\x8d"
+                         "\xf7\x33\x64\xc1\xd3\xf2\xfc\x35"
+                         "\x01",
+               .clen   = 81,
        }, {
-               .key    = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c",
-               .klen   = 16,
-               .iv     = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
+               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
                          "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .assoc  = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
-                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f"
-                         "\xe4\x8f\xed\x97\xe9\xd0\xe8\x0d"
-                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e"
-                         "\x28\xce\x57\x34\xcd\x6e\x84\x4c"
-                         "\x17\x3c\xe1\xb2\xa8\x0b\xbb\xf1"
-                         "\x96\x41\x0d\x69\xe8\x54\x0a\xc8"
-                         "\x15\x4e\x91\x92\x89\x4b\xb7\x9b"
-                         "\x21",
-               .alen   = 65,
-               .input  = "\x57\xcd\x3d\x46\xc5\xf9\x68\x3b"
-                         "\x2c\x0f\xb4\x7e\x7b\x64\x3e\x40"
-                         "\xf3\x78\x63\x34\x89\x79\x39\x6b"
-                         "\x61\x64\x4a\x9a\xfa\x70\xa4\xd3"
-                         "\x54\x0b\xea\x05\xa6\x95\x64\xed"
-                         "\x3d\x69\xa2\x0c\x27\x56\x2f\x34"
-                         "\x66",
-               .ilen   = 49,
-               .result = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
+               .klen   = 16,
+               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
+                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f",
+               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
                          "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
                          "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
                          "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac",
-               .rlen   = 33,
+                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
+                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
+                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
+                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
+                         "\x54",
+               .alen   = 65,
+               .ptext  = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
+                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
+                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
+                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
+                         "\x2f",
+               .plen   = 33,
+               .ctext  = "\x4c\xa9\xac\x71\xed\x10\xa6\x24"
+                         "\xb7\xa7\xdf\x8b\xf5\xc2\x41\xcb"
+                         "\x05\xc9\xd6\x97\xb6\x10\x7f\x17"
+                         "\xc2\xc0\x93\xcf\xe0\x94\xfd\x99"
+                         "\xf2\x62\x25\x28\x01\x23\x6f\x8b"
+                         "\x04\x52\xbc\xb0\x3e\x66\x52\x90"
+                         "\x9f",
+               .clen   = 49,
        }, {
-               .key    = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82",
-               .klen   = 16,
-               .iv     = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
+               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
                          "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .assoc  = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
+               .klen   = 16,
+               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
                          "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
-               .alen   = 16,
-               .input  = "\xfc\x85\x06\x28\x8f\xe8\x23\x1f"
-                         "\x33\x98\x87\xde\x08\xb6\xb6\xae"
-                         "\x3e\xa4\xf8\x19\xf1\x92\x60\x39"
-                         "\xb9\x6b\x3f\xdf\xc8\xcb\x30",
-               .ilen   = 31,
-               .result = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
+               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
                          "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
-               .rlen   = 16,
-       }, {
-               .key    = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
+               .alen   = 16,
+               .ptext  = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
                          "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .klen   = 16,
-               .iv     = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
+               .plen   = 16,
+               .ctext  = "\x6d\xed\x04\x7a\x2f\x0c\x30\xa5"
+                         "\x96\xe6\x97\xe4\x10\xeb\x40\x95"
+                         "\xc5\x9a\xdf\x31\xd5\xa5\xa6\xec"
+                         "\x05\xa8\x31\x50\x11\x19\x44",
+               .clen   = 31,
+       }, {
+               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
                          "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .assoc  = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
+               .klen   = 16,
+               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
                          "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
-               .alen   = 16,
-               .input  = "\x74\x7d\x70\x07\xe9\xba\x01\xee"
-                         "\x6c\xc6\x6f\x50\x25\x33\xbe\x50"
-                         "\x17\xb8\x17\x62\xed\x80\xa2\xf5"
-                         "\x03\xde\x85\x71\x5d\x34",
-               .ilen   = 30,
-               .result = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
+               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
                          "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
-               .rlen   = 16,
-       }, {
-               .key    = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
+               .alen   = 16,
+               .ptext  = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
                          "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .klen   = 16,
-               .iv     = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
+               .plen   = 16,
+               .ctext  = "\x30\x95\x7d\xea\xdc\x62\xc0\x88"
+                         "\xa1\xe3\x8d\x8c\xac\x04\x10\xa7"
+                         "\xfa\xfa\x07\xbd\xa0\xf0\x36\xeb"
+                         "\x21\x93\x2e\x31\x84\x83",
+               .clen   = 30,
+       }, {
+               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
                          "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
-               .assoc  = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
+               .klen   = 16,
+               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
                          "\xd5\x07\x58\x59\x72\xd7\xde\x92",
-               .alen   = 16,
-               .input  = "\xf4\xb3\x85\xf9\xac\xde\xb1\x38"
-                         "\x29\xfd\x6c\x7c\x49\xe5\x1d\xaf"
-                         "\xba\xea\xd4\xfa\x3f\x11\x33\x98",
-               .ilen   = 24,
-               .result = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
+               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
                          "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
-               .rlen   = 16,
-       }, {
-               .key    = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
-                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
-               .klen   = 16,
-               .iv     = "\xbb\x3a\xf7\x57\xc6\x36\x7c\x22"
-                         "\x36\xab\xde\xc6\x6d\x32\x70\x17",
-               .assoc  = "\xcb\x03\x85\xbf\x0a\xd5\x26\xa9"
-                         "\x56\xe1\x0a\xeb\x6c\xfb\xa1\x98",
                .alen   = 16,
-               .input  = "\xe6\x5c\x49\x4f\x78\xf3\x62\x86"
-                         "\xe1\xb7\xa5\xc3\x32\x88\x3c\x8c"
-                         "\x6e",
-               .ilen   = 17,
-               .result = "\xda\xcc\x14\x27\x4e\x74\xd1\x30"
-                         "\x76\x18\x37\x0f\x6a\xc4\xd1\x1a",
-               .rlen   = 16,
+               .ptext  = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
+                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
+               .plen   = 16,
+               .ctext  = "\x93\xcd\xee\xd4\xcb\x9d\x8d\x16"
+                         "\x63\x0d\x43\xd5\x49\xca\xa8\x85"
+                         "\x49\xc0\xae\x13\xbc\x26\x1d\x4b",
+               .clen   = 24,
        },
 };
 
 /*
- * MORUS-1280 test vectors - generated via reference implementation from
+ * AEGIS-256 test vectors - generated via reference implementation from
  * SUPERCOP (https://bench.cr.yp.to/supercop.html):
  *
  *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
- *   (see crypto_aead/morus1280128v2/ and crypto_aead/morus1280256v2/ )
+ *   (see crypto_aead/aegis256/)
  */
-static const struct aead_testvec morus1280_enc_tv_template[] = {
+static const struct aead_testvec aegis256_tv_template[] = {
        {
-               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
-                         "\x00\x00\x00\x00\x00\x00\x00\x00",
-               .klen   = 16,
-               .iv     = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
-                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
+               .key    = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
+                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81"
+                         "\xca\xb0\x82\x21\x41\xa8\xe0\x06"
+                         "\x30\x0b\x37\xf6\xb6\x17\xe7\xb5",
+               .klen   = 32,
+               .iv     = "\x1e\x92\x1c\xcf\x88\x3d\x54\x0d"
+                         "\x40\x6d\x59\x48\xfc\x92\x61\x03"
+                         "\x95\x61\x05\x42\x82\x50\xc0\x0c"
+                         "\x60\x16\x6f\xec\x6d\x2f\xcf\x6b",
                .assoc  = "",
                .alen   = 0,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x91\x85\x0f\xf5\x52\x9e\xce\xce"
-                         "\x65\x99\xc7\xbf\xd3\x76\xe8\x98",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xd5\x65\x3a\xa9\x03\x51\xd7\xaa"
+                         "\xfa\x4b\xd8\xa2\x41\x9b\xc1\xb2",
+               .clen   = 16,
        }, {
-               .key    = "\x3c\x24\x39\x9f\x10\x7b\xa8\x1b"
-                         "\x80\xda\xb2\x91\xf9\x24\xc2\x06",
-               .klen   = 16,
-               .iv     = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
-                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
+               .key    = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
+                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87"
+                         "\xf4\x72\x8e\xa5\x46\x48\x62\x20"
+                         "\xf1\x38\x16\xce\x90\x76\x87\x8c",
+               .klen   = 32,
+               .iv     = "\x5a\xb7\x56\x6e\x98\xb9\xfd\x29"
+                         "\xc1\x47\x0b\xda\xf6\xb6\x23\x09"
+                         "\xbf\x23\x11\xc6\x87\xf0\x42\x26"
+                         "\x22\x44\x4e\xc4\x47\x8e\x6e\x41",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x69",
-               .ilen   = 1,
-               .result = "\x88\xc3\x4c\xf0\x2f\x43\x76\x13"
-                         "\x96\xda\x76\x34\x33\x4e\xd5\x39"
-                         "\x73",
-               .rlen   = 17,
+               .ptext  = "\x79",
+               .plen   = 1,
+               .ctext  = "\x84\xa2\x8f\xad\xdb\x8d\x2c\x16"
+                         "\x9e\x89\xd9\x06\xa6\xa8\x14\x29"
+                         "\x8b",
+               .clen   = 17,
        }, {
-               .key    = "\x79\x49\x73\x3e\x20\xf7\x51\x37"
-                         "\x01\xb4\x64\x22\xf3\x48\x85\x0c",
-               .klen   = 16,
-               .iv     = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
-                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
+               .key    = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
+                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e"
+                         "\x1f\x35\x9a\x29\x4b\xe8\xe4\x39"
+                         "\xb3\x66\xf5\xa6\x6a\xd5\x26\x62",
+               .klen   = 32,
+               .iv     = "\x97\xdb\x90\x0e\xa8\x35\xa5\x45"
+                         "\x42\x21\xbd\x6b\xf0\xda\xe6\x0f"
+                         "\xe9\xe5\x1d\x4a\x8c\x90\xc4\x40"
+                         "\xe3\x71\x2d\x9c\x21\xed\x0e\x18",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xa6\xa4\x1e\x76\xec\xd4\x50\xcc"
-                         "\x62\x58\xe9\x8f\xef\xa4\x17\x91"
-                         "\xb4\x96\x9f\x6b\xce\x38\xa5\x46"
-                         "\x13\x7d\x64\x93\xd7\x05\xf5",
-               .ilen   = 31,
-               .result = "\x3e\x5c\x3b\x58\x3b\x7d\x2a\x22"
-                         "\x75\x0b\x24\xa6\x0e\xc3\xde\x52"
-                         "\x97\x0b\x64\xd4\xce\x90\x52\xf7"
-                         "\xef\xdb\x6a\x38\xd2\xa8\xa1\x0d"
-                         "\xe0\x61\x33\x24\xc6\x4d\x51\xbc"
-                         "\xa4\x21\x74\xcf\x19\x16\x59",
-               .rlen   = 47,
+               .ptext  = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
+                         "\x82\x8e\x16\xb4\xed\x6d\x47",
+               .plen   = 15,
+               .ctext  = "\x09\x94\x1f\xa6\x13\xc3\x74\x75"
+                         "\x17\xad\x8a\x0e\xd8\x66\x9a\x28"
+                         "\xd7\x30\x66\x09\x2a\xdc\xfa\x2a"
+                         "\x9f\x3b\xd7\xdd\x66\xd1\x2b",
+               .clen   = 31,
        }, {
-               .key    = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
-                         "\x82\x8e\x16\xb4\xed\x6d\x47\x12",
-               .klen   = 16,
-               .iv     = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
-                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
+               .key    = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
+                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94"
+                         "\x49\xf7\xa5\xad\x50\x88\x66\x53"
+                         "\x74\x94\xd4\x7f\x44\x34\xc5\x39",
+               .klen   = 32,
+               .iv     = "\xd3\x00\xc9\xad\xb8\xb0\x4e\x61"
+                         "\xc3\xfb\x6f\xfd\xea\xff\xa9\x15"
+                         "\x14\xa8\x28\xce\x92\x30\x46\x59"
+                         "\xa4\x9f\x0b\x75\xfb\x4c\xad\xee",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xe2\xc9\x58\x15\xfc\x4f\xf8\xe8"
-                         "\xe3\x32\x9b\x21\xe9\xc8\xd9\x97"
-                         "\xde\x58\xab\xf0\xd3\xd8\x27\x60"
-                         "\xd5\xaa\x43\x6b\xb1\x64\x95\xa4",
-               .ilen   = 32,
-               .result = "\x30\x82\x9c\x2b\x67\xcb\xf9\x1f"
-                         "\xde\x9f\x77\xb2\xda\x92\x61\x5c"
-                         "\x09\x0b\x2d\x9a\x26\xaa\x1c\x06"
-                         "\xab\x74\xb7\x2b\x95\x5f\x9f\xa1"
-                         "\x9a\xff\x50\xa0\xa2\xff\xc5\xad"
-                         "\x21\x8e\x84\x5c\x12\x61\xb2\xae",
-               .rlen   = 48,
-       }, {
-               .key    = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
+               .ptext  = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
                          "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
-               .klen   = 16,
-               .iv     = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
-                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
+               .plen   = 16,
+               .ctext  = "\x8a\x46\xa2\x22\x8c\x03\xab\x6f"
+                         "\x54\x63\x4e\x7f\xc9\x8e\xfa\x70"
+                         "\x7b\xe5\x8d\x78\xbc\xe9\xb6\xa1"
+                         "\x29\x17\xc8\x3b\x52\xa4\x98\x72",
+               .clen   = 32,
+       }, {
+               .key    = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
+                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a"
+                         "\x74\xb9\xb1\x32\x55\x28\xe8\x6d"
+                         "\x35\xc1\xb3\x57\x1f\x93\x64\x0f",
+               .klen   = 32,
+               .iv     = "\x10\x25\x03\x4c\xc8\x2c\xf7\x7d"
+                         "\x44\xd5\x21\x8e\xe4\x23\x6b\x1c"
+                         "\x3e\x6a\x34\x53\x97\xd0\xc8\x73"
+                         "\x66\xcd\xea\x4d\xd5\xab\x4c\xc5",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x1f\xee\x92\xb4\x0c\xcb\xa1\x04"
-                         "\x64\x0c\x4d\xb2\xe3\xec\x9c\x9d"
-                         "\x09\x1a\xb7\x74\xd8\x78\xa9\x79"
-                         "\x96\xd8\x22\x43\x8c\xc3\x34\x7b"
-                         "\xc4",
-               .ilen   = 33,
-               .result = "\x67\x5d\x8e\x45\xc8\x39\xf5\x17"
-                         "\xc1\x1d\x2a\xdd\x88\x67\xda\x1f"
-                         "\x6d\xe8\x37\x28\x5a\xc1\x5e\x9f"
-                         "\xa6\xec\xc6\x92\x05\x4b\xc0\xa3"
-                         "\x63\xef\x88\xa4\x9b\x0a\x5c\xed"
-                         "\x2b\x6a\xac\x63\x52\xaa\x10\x94"
-                         "\xd0",
-               .rlen   = 49,
+               .ptext  = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
+                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f"
+                         "\xd3",
+               .plen   = 17,
+               .ctext  = "\x71\x6b\x37\x0b\x02\x61\x28\x12"
+                         "\x83\xab\x66\x90\x84\xc7\xd1\xc5"
+                         "\xb2\x7a\xb4\x7b\xb4\xfe\x02\xb2"
+                         "\xc0\x00\x39\x13\xb5\x51\x68\x44"
+                         "\xad",
+               .clen   = 33,
        }, {
-               .key    = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
-                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f",
-               .klen   = 16,
-               .iv     = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
-                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
+               .key    = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
+                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0"
+                         "\x9e\x7c\xbc\xb6\x5b\xc8\x6a\x86"
+                         "\xf7\xef\x91\x30\xf9\xf2\x04\xe6",
+               .klen   = 32,
+               .iv     = "\x4c\x49\x3d\xec\xd8\xa8\xa0\x98"
+                         "\xc5\xb0\xd3\x1f\xde\x48\x2e\x22"
+                         "\x69\x2c\x3f\xd7\x9c\x70\x4a\x8d"
+                         "\x27\xfa\xc9\x26\xaf\x0a\xeb\x9c",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x5c\x13\xcb\x54\x1c\x47\x4a\x1f"
-                         "\xe5\xe6\xff\x44\xdd\x11\x5f\xa3"
-                         "\x33\xdd\xc2\xf8\xdd\x18\x2b\x93"
-                         "\x57\x05\x01\x1c\x66\x22\xd3\x51"
-                         "\xd3\xdf\x18\xc9\x30\x66\xed\xb1"
-                         "\x96\x58\xd5\x8c\x64\x8c\x7c\xf5"
-                         "\x01\xd0\x74\x5f\x9b\xaa\xf6\xd1"
-                         "\xe6\x16\xa2\xac\xde\x47\x40",
-               .ilen   = 63,
-               .result = "\x7d\x61\x1a\x35\x20\xcc\x07\x88"
-                         "\x03\x98\x87\xcf\xc0\x6e\x4d\x19"
-                         "\xe3\xd4\x0b\xfb\x29\x8f\x49\x1a"
-                         "\x3a\x06\x77\xce\x71\x2c\xcd\xdd"
-                         "\xed\xf6\xc9\xbe\xa6\x3b\xb8\xfc"
-                         "\x6c\xbe\x77\xed\x74\x0e\x20\x85"
-                         "\xd0\x65\xde\x24\x6f\xe3\x25\xc5"
-                         "\xdf\x5b\x0f\xbd\x8a\x88\x78\xc9"
-                         "\xe5\x81\x37\xde\x84\x7a\xf6\x84"
-                         "\x99\x7a\x72\x9c\x54\x31\xa1",
-               .rlen   = 79,
+               .ptext  = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
+                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25"
+                         "\xfe\x8d\x45\x19\x1e\xc0\x0b\x99"
+                         "\x88\x11\x39\x12\x1c\x3a\xbb",
+               .plen   = 31,
+               .ctext  = "\xaf\xa4\x34\x0d\x59\xe6\x1c\x2f"
+                         "\x06\x3b\x52\x18\x49\x75\x1b\xf0"
+                         "\x53\x09\x72\x7b\x45\x79\xe0\xbe"
+                         "\x89\x85\x23\x15\xb8\x79\x07\x4c"
+                         "\x53\x7a\x15\x37\x0a\xee\xb7\xfb"
+                         "\xc4\x1f\x12\x27\xcf\x77\x90",
+               .clen   = 47,
        }, {
-               .key    = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
-                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25",
-               .klen   = 16,
-               .iv     = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
-                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
+               .key    = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
+                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6"
+                         "\xc8\x3e\xc8\x3a\x60\x68\xec\xa0"
+                         "\xb8\x1c\x70\x08\xd3\x51\xa3\xbd",
+               .klen   = 32,
+               .iv     = "\x89\x6e\x77\x8b\xe8\x23\x49\xb4"
+                         "\x45\x8a\x85\xb1\xd8\x6c\xf1\x28"
+                         "\x93\xef\x4b\x5b\xa1\x10\xcc\xa6"
+                         "\xe8\x28\xa8\xfe\x89\x69\x8b\x72",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x98\x37\x05\xf3\x2c\xc2\xf3\x3b"
-                         "\x66\xc0\xb1\xd5\xd7\x35\x21\xaa"
-                         "\x5d\x9f\xce\x7c\xe2\xb8\xad\xad"
-                         "\x19\x33\xe0\xf4\x40\x81\x72\x28"
-                         "\xe1\x8b\x1c\xf8\x91\x78\xff\xaf"
-                         "\xb0\x68\x69\xf2\x27\x35\x91\x84"
-                         "\x2e\x37\x5b\x00\x04\xff\x16\x9c"
-                         "\xb5\x19\x39\xeb\xd9\xcd\x29\x9a",
-               .ilen   = 64,
-               .result = "\x05\xc5\xb1\xf9\x1b\xb9\xab\x2c"
-                         "\xa5\x07\x12\xa7\x12\x39\x60\x66"
-                         "\x30\x81\x4a\x03\x78\x28\x45\x52"
-                         "\xd2\x2b\x24\xfd\x8b\xa5\xb7\x66"
-                         "\x6f\x45\xd7\x3b\x67\x6f\x51\xb9"
-                         "\xc0\x3d\x6c\xca\x1e\xae\xff\xb6"
-                         "\x79\xa9\xe4\x82\x5d\x4c\x2d\xdf"
-                         "\xeb\x71\x40\xc9\x2c\x40\x45\x6d"
-                         "\x73\x77\x01\xf3\x4f\xf3\x9d\x2a"
-                         "\x5d\x57\xa8\xa1\x18\xa2\xad\xcb",
-               .rlen   = 80,
+               .ptext  = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
+                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b"
+                         "\x28\x50\x51\x9d\x24\x60\x8d\xb3"
+                         "\x49\x3e\x17\xea\xf6\x99\x5a\xdd",
+               .plen   = 32,
+               .ctext  = "\xe2\xc9\x0b\x33\x31\x02\xb3\xb4"
+                         "\x33\xfe\xeb\xa8\xb7\x9b\xb2\xd7"
+                         "\xeb\x0f\x05\x2b\xba\xb3\xca\xef"
+                         "\xf6\xd1\xb6\xc0\xb9\x9b\x85\xc5"
+                         "\xbf\x7a\x3e\xcc\x31\x76\x09\x80"
+                         "\x32\x5d\xbb\xe8\x38\x0e\x77\xd3",
+               .clen   = 48,
        }, {
-               .key    = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
-                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b",
-               .klen   = 16,
-               .iv     = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
-                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
-               .assoc  = "\xc5",
+               .key    = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
+                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad"
+                         "\xf3\x00\xd4\xbf\x65\x08\x6e\xb9"
+                         "\x7a\x4a\x4f\xe0\xad\xb0\x42\x93",
+               .klen   = 32,
+               .iv     = "\xc5\x93\xb0\x2a\xf8\x9f\xf1\xd0"
+                         "\xc6\x64\x37\x42\xd2\x90\xb3\x2e"
+                         "\xbd\xb1\x57\xe0\xa6\xb0\x4e\xc0"
+                         "\xaa\x55\x87\xd6\x63\xc8\x2a\x49",
+               .assoc  = "\xd5",
                .alen   = 1,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x4d\xbf\x11\xac\x7f\x97\x0b\x2e"
-                         "\x89\x3b\x9d\x0f\x83\x1c\x08\xc3",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x96\x43\x30\xca\x6c\x4f\xd7\x12"
+                         "\xba\xd9\xb3\x18\x86\xdf\xc3\x52",
+               .clen   = 16,
        }, {
-               .key    = "\xe4\x25\xcd\xfa\x80\xdd\x46\xde"
-                         "\x07\xd1\x90\x8b\xcf\x23\x15\x31",
-               .klen   = 16,
-               .iv     = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
-                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
-               .assoc  = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
+               .key    = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
+                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3"
+                         "\x1d\xc3\xdf\x43\x6a\xa8\xf0\xd3"
+                         "\x3b\x77\x2e\xb9\x87\x0f\xe1\x6a",
+               .klen   = 32,
+               .iv     = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
                          "\x47\x3e\xe9\xd4\xcc\xb5\x76\x34"
                          "\xe8\x73\x62\x64\xab\x50\xd0\xda"
-                         "\x6b\x83\x66\xaf\x3e\x27\xc9",
-               .alen   = 31,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x5b\xc0\x8d\x54\xe4\xec\xbe\x38"
-                         "\x03\x12\xf9\xcc\x9e\x46\x42\x92",
-               .rlen   = 16,
+                         "\x6b\x83\x66\xaf\x3e\x27\xc9\x1f",
+               .assoc  = "\x11\x81\x78\x32\x4d\xb9\x44\x73"
+                         "\x68\x75\x16\xf8\xcb\x7e\xa7",
+               .alen   = 15,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x2f\xab\x45\xe2\xa7\x46\xc5\x83"
+                         "\x11\x9f\xb0\x74\xee\xc7\x03\xdd",
+               .clen   = 16,
        }, {
-               .key    = "\x20\x4a\x07\x99\x91\x58\xee\xfa"
-                         "\x88\xab\x42\x1c\xc9\x47\xd7\x38",
-               .klen   = 16,
-               .iv     = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
-                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
-               .assoc  = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
+               .key    = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
+                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9"
+                         "\x47\x85\xeb\xc7\x6f\x48\x72\xed"
+                         "\xfc\xa5\x0d\x91\x61\x6e\x81\x40",
+               .klen   = 32,
+               .iv     = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
                          "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b"
                          "\x12\x35\x6e\xe8\xb0\xf0\x52\xf3"
                          "\x2d\xb0\x45\x87\x18\x86\x68\xf6",
-               .alen   = 32,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x48\xc5\xc3\x4c\x40\x2e\x2f\xc2"
-                         "\x6d\x65\xe0\x67\x9c\x1d\xa0\xf0",
-               .rlen   = 16,
+               .assoc  = "\x4e\xa5\xb2\xd1\x5d\x35\xed\x8f"
+                         "\xe8\x4f\xc8\x89\xc5\xa2\x69\xbc",
+               .alen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x16\x44\x73\x33\x5d\xf2\xb9\x04"
+                         "\x6b\x79\x98\xef\xdb\xd5\xc5\xf1",
+               .clen   = 16,
        }, {
-               .key    = "\x5d\x6f\x41\x39\xa1\xd4\x97\x16"
-                         "\x09\x85\xf4\xae\xc3\x6b\x9a\x3e",
-               .klen   = 16,
-               .iv     = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
-                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
-               .assoc  = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
+               .key    = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
+                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf"
+                         "\x72\x47\xf6\x4b\x74\xe8\xf4\x06"
+                         "\xbe\xd3\xec\x6a\x3b\xcd\x20\x17",
+               .klen   = 32,
+               .iv     = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
                          "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41"
                          "\x3c\xf8\x79\x6c\xb6\x90\xd4\x0d"
-                         "\xee\xde\x23\x60\xf2\xe5\x08\xcc"
-                         "\x97",
-               .alen   = 33,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x28\x64\x78\x51\x55\xd8\x56\x4a"
-                         "\x58\x3e\xf7\xbe\xee\x21\xfe\x94",
-               .rlen   = 16,
+                         "\xee\xde\x23\x60\xf2\xe5\x08\xcc",
+               .assoc  = "\x8a\xca\xec\x70\x6d\xb1\x96\xab"
+                         "\x69\x29\x7a\x1b\xbf\xc7\x2c\xc2"
+                         "\x07",
+               .alen   = 17,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xa4\x9b\xb8\x47\xc0\xed\x7a\x45"
+                         "\x98\x54\x8c\xed\x3d\x17\xf0\xdd",
+               .clen   = 16,
        }, {
-               .key    = "\x99\x93\x7a\xd8\xb1\x50\x40\x31"
-                         "\x8a\x60\xa6\x3f\xbd\x90\x5d\x44",
-               .klen   = 16,
-               .iv     = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
-                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
-               .assoc  = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
+               .key    = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
+                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6"
+                         "\x9c\x0a\x02\xd0\x79\x88\x76\x20"
+                         "\x7f\x00\xca\x42\x15\x2c\xbf\xed",
+               .klen   = 32,
+               .iv     = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
                          "\xca\xcd\xff\x88\xba\x22\xbe\x47"
                          "\x67\xba\x85\xf1\xbb\x30\x56\x26"
-                         "\xaf\x0b\x02\x38\xcc\x44\xa7\xa3"
-                         "\xa6\xbf\x31\x93\x60\xcd\xda\x63"
-                         "\x2c\xb1\xaa\x19\xc8\x19\xf8\xeb"
-                         "\x03\xa1\xe8\xbe\x37\x54\xec\xa2"
-                         "\xcd\x2c\x45\x58\xbd\x8e\x80",
-               .alen   = 63,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xb3\xa6\x00\x4e\x09\x20\xac\x21"
-                         "\x77\x72\x69\x76\x2d\x36\xe5\xc8",
-               .rlen   = 16,
+                         "\xaf\x0b\x02\x38\xcc\x44\xa7\xa3",
+               .assoc  = "\xc7\xef\x26\x10\x7d\x2c\x3f\xc6"
+                         "\xea\x03\x2c\xac\xb9\xeb\xef\xc9"
+                         "\x31\x6b\x08\x12\xfc\xd8\x37\x2d"
+                         "\xe0\x17\x3a\x2e\x83\x5c\x8f",
+               .alen   = 31,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x20\x24\xe2\x33\x5c\x60\xc9\xf0"
+                         "\xa4\x96\x2f\x0d\x53\xc2\xf8\xfc",
+               .clen   = 16,
        }, {
-               .key    = "\xd6\xb8\xb4\x77\xc1\xcb\xe9\x4d"
-                         "\x0a\x3a\x58\xd1\xb7\xb4\x1f\x4a",
-               .klen   = 16,
-               .iv     = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
-                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
-               .assoc  = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
+               .key    = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
+                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc"
+                         "\xc6\xcc\x0e\x54\x7f\x28\xf8\x3a"
+                         "\x40\x2e\xa9\x1a\xf0\x8b\x5e\xc4",
+               .klen   = 32,
+               .iv     = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
                          "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d"
                          "\x91\x7c\x91\x75\xc0\xd0\xd8\x40"
-                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a"
-                         "\xb4\x6b\x35\xc2\xc1\xdf\xed\x60"
-                         "\x46\xc1\x3e\x7f\x8c\xc2\x0e\x7a"
-                         "\x30\x08\xd0\x5f\xa0\xaa\x0c\x6d"
-                         "\x9c\x2f\xdb\x97\xb8\x15\x69\x01",
-               .alen   = 64,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x65\x33\x7b\xa1\x63\xf4\x20\xdd"
-                         "\xe4\xb9\x4a\xaa\x9a\x21\xaa\x14",
-               .rlen   = 16,
+                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a",
+               .assoc  = "\x03\x14\x5f\xaf\x8d\xa8\xe7\xe2"
+                         "\x6b\xde\xde\x3e\xb3\x10\xb1\xcf"
+                         "\x5c\x2d\x14\x96\x01\x78\xb9\x47"
+                         "\xa1\x44\x19\x06\x5d\xbb\x2e\x2f",
+               .alen   = 32,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x6f\x4a\xb9\xe0\xff\x51\xa3\xf1"
+                         "\xd2\x64\x3e\x66\x6a\xb2\x03\xc0",
+               .clen   = 16,
        }, {
-               .key    = "\x12\xdd\xee\x17\xd1\x47\x92\x69"
-                         "\x8b\x14\x0a\x62\xb1\xd9\xe2\x50",
-               .klen   = 16,
-               .iv     = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
-                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
-               .assoc  = "\x31",
+               .key    = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
+                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2"
+                         "\xf1\x8e\x19\xd8\x84\xc8\x7a\x53"
+                         "\x02\x5b\x88\xf3\xca\xea\xfe\x9b",
+               .klen   = 32,
+               .iv     = "\x31\x6f\x0b\xe6\x59\x85\xe6\x77"
+                         "\xcc\x81\x63\xab\xae\x6b\x43\x54"
+                         "\xbb\x3f\x9c\xf9\xc5\x70\x5a\x5a"
+                         "\x32\x67\xc0\xe9\x80\x02\xe5\x50",
+               .assoc  = "\x40",
                .alen   = 1,
-               .input  = "\x40",
-               .ilen   = 1,
-               .result = "\x1d\x47\x17\x34\x86\xf5\x54\x1a"
-                         "\x6d\x28\xb8\x5d\x6c\xcf\xa0\xb9"
-                         "\xbf",
-               .rlen   = 17,
+               .ptext  = "\x4f",
+               .plen   = 1,
+               .ctext  = "\x2c\xfb\xad\x7e\xbe\xa0\x9a\x5b"
+                         "\x7a\x3f\x81\xf7\xfc\x1b\x79\x83"
+                         "\xc7",
+               .clen   = 17,
        }, {
-               .key    = "\x4f\x01\x27\xb6\xe1\xc3\x3a\x85"
-                         "\x0c\xee\xbc\xf4\xab\xfd\xa5\x57",
-               .klen   = 16,
-               .iv     = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
-                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
-               .assoc  = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
+               .key    = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
+                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8"
+                         "\x1b\x50\x25\x5d\x89\x68\xfc\x6d"
+                         "\xc3\x89\x67\xcb\xa4\x49\x9d\x71",
+               .klen   = 32,
+               .iv     = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
                          "\x4d\x5b\x15\x3c\xa8\x8f\x06\x5a"
                          "\xe6\x01\xa8\x7e\xca\x10\xdc\x73"
-                         "\xf4\x94\x9f\xc1\x5a\x61\x85",
-               .alen   = 31,
-               .input  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37\xdb"
-                         "\xb0\xb2\x2b\x9f\x0b\xb8\xbd\x7a"
-                         "\x24\xa0\xd6\xb7\x11\x79\x6c",
-               .ilen   = 31,
-               .result = "\x78\x90\x52\xae\x0f\xf7\x2e\xef"
-                         "\x63\x09\x08\x58\xb5\x56\xbd\x72"
-                         "\x6e\x42\xcf\x27\x04\x7c\xdb\x92"
-                         "\x18\xe9\xa4\x33\x90\xba\x62\xb5"
-                         "\x70\xd3\x88\x9b\x4f\x05\xa7\x51"
-                         "\x85\x87\x17\x09\x42\xed\x4e",
-               .rlen   = 47,
+                         "\xf4\x94\x9f\xc1\x5a\x61\x85\x27",
+               .assoc  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
+                         "\x6d\x92\x42\x61\xa7\x58\x37",
+               .alen   = 15,
+               .ptext  = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
+                         "\x8d\xc8\x6e\x85\xa5\x21\x67",
+               .plen   = 15,
+               .ctext  = "\x1f\x7f\xca\x3c\x2b\xe7\x27\xba"
+                         "\x7e\x98\x83\x02\x34\x23\xf7\x94"
+                         "\xde\x35\xe6\x1d\x14\x18\xe5\x38"
+                         "\x14\x80\x6a\xa7\x1b\xae\x1d",
+               .clen   = 31,
        }, {
-               .key    = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
-                         "\x8d\xc8\x6e\x85\xa5\x21\x67\x5d",
-               .klen   = 16,
-               .iv     = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
-                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
-               .assoc  = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
+               .key    = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
+                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf"
+                         "\x46\x13\x31\xe1\x8e\x08\x7e\x87"
+                         "\x85\xb6\x46\xa3\x7e\xa8\x3c\x48",
+               .klen   = 32,
+               .iv     = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
                          "\xce\x36\xc7\xce\xa2\xb4\xc9\x60"
                          "\x10\xc3\xb3\x02\xcf\xb0\x5e\x8d"
                          "\xb5\xc2\x7e\x9a\x35\xc0\x24\xfd",
-               .alen   = 32,
-               .input  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2"
-                         "\xdb\x74\x36\x23\x11\x58\x3f\x93"
-                         "\xe5\xcd\xb5\x90\xeb\xd8\x0c\xb3",
-               .ilen   = 32,
-               .result = "\x1d\x2c\x57\xe0\x50\x38\x3d\x41"
-                         "\x2e\x71\xc8\x3b\x92\x43\x58\xaf"
-                         "\x5a\xfb\xad\x8f\xd9\xd5\x8a\x5e"
-                         "\xdb\xf3\xcd\x3a\x2b\xe1\x2c\x1a"
-                         "\xb0\xed\xe3\x0c\x6e\xf9\xf2\xd6"
-                         "\x90\xe6\xb1\x0e\xa5\x8a\xac\xb7",
-               .rlen   = 48,
-       }, {
-               .key    = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
+               .assoc  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
+                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
+               .alen   = 16,
+               .ptext  = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
                          "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
-               .klen   = 16,
-               .iv     = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
-                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
-               .assoc  = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
+               .plen   = 16,
+               .ctext  = "\x05\x86\x9e\xd7\x2b\xa3\x97\x01"
+                         "\xbe\x28\x98\x10\x6f\xe9\x61\x32"
+                         "\x96\xbb\xb1\x2e\x8f\x0c\x44\xb9"
+                         "\x46\x2d\x55\xe3\x42\x67\xf2\xaf",
+               .clen   = 32,
+       }, {
+               .key    = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
+                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5"
+                         "\x70\xd5\x3c\x65\x93\xa8\x00\xa0"
+                         "\x46\xe4\x25\x7c\x58\x08\xdb\x1e",
+               .klen   = 32,
+               .iv     = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
                          "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66"
                          "\x3b\x86\xbf\x86\xd4\x50\xe0\xa7"
-                         "\x76\xef\x5c\x72\x0f\x1f\xc3\xd4"
-                         "\xee",
-               .alen   = 33,
-               .input  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
+                         "\x76\xef\x5c\x72\x0f\x1f\xc3\xd4",
+               .assoc  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
                          "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05\x36\x42\xa7\x16\xf8\xc1\xad"
-                         "\xa7\xfb\x94\x68\xc5\x37\xab\x8a"
-                         "\x72",
-               .ilen   = 33,
-               .result = "\x59\x10\x84\x1c\x83\x4c\x8b\xfc"
-                         "\xfd\x2e\x4b\x46\x84\xff\x78\x4e"
-                         "\x50\xda\x5c\xb9\x61\x1d\xf5\xb9"
-                         "\xfe\xbb\x7f\xae\x8c\xc1\x24\xbd"
-                         "\x8c\x6f\x1f\x9b\xce\xc6\xc1\x37"
-                         "\x08\x06\x5a\xe5\x96\x10\x95\xc2"
-                         "\x5e",
-               .rlen   = 49,
+                         "\x05",
+               .alen   = 17,
+               .ptext  = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
+                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69"
+                         "\xd0",
+               .plen   = 17,
+               .ctext  = "\x9c\xe0\x06\x7b\x86\xcf\x2e\xd8"
+                         "\x45\x65\x1b\x72\x9b\xaa\xa3\x1e"
+                         "\x87\x9d\x26\xdf\xff\x81\x11\xd2"
+                         "\x47\x41\xb9\x24\xc1\x8a\xa3\x8b"
+                         "\x55",
+               .clen   = 33,
        }, {
-               .key    = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
-                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69",
-               .klen   = 16,
-               .iv     = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
-                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
-               .assoc  = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
+               .key    = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
+                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb"
+                         "\x9a\x97\x48\xe9\x98\x48\x82\xba"
+                         "\x07\x11\x04\x54\x32\x67\x7b\xf5",
+               .klen   = 32,
+               .iv     = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
                          "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d"
                          "\x65\x48\xcb\x0a\xda\xf0\x62\xc0"
-                         "\x38\x1d\x3b\x4a\xe9\x7e\x62\xaa"
-                         "\xfd\xc9\x4a\xa9\xa9\x39\x4b\x54"
-                         "\xc8\x0e\x24\x7f\x5e\x10\x7a\x45"
-                         "\x10\x0b\x56\x85\xad\x54\xaa\x66"
-                         "\xa8\x43\xcd\xd4\x9b\xb7\xfa",
-               .alen   = 63,
-               .input  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
+                         "\x38\x1d\x3b\x4a\xe9\x7e\x62\xaa",
+               .assoc  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
                          "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
                          "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
-                         "\x68\x28\x73\x40\x9f\x96\x4a\x60"
-                         "\x80\xf4\x4b\xf4\xc1\x3d\xd0\x93"
-                         "\xcf\x12\xc9\x59\x8f\x7a\x7f\xa8"
-                         "\x1b\xa5\x50\xed\x87\xa9\x72\x59"
-                         "\x9c\x44\xb2\xa4\x99\x98\x34",
-               .ilen   = 63,
-               .result = "\x9a\x12\xbc\xdf\x72\xa8\x56\x22"
-                         "\x49\x2d\x07\x92\xfc\x3d\x6d\x5f"
-                         "\xef\x36\x19\xae\x91\xfa\xd6\x63"
-                         "\x46\xea\x8a\x39\x14\x21\xa6\x37"
-                         "\x18\xfc\x97\x3e\x16\xa5\x4d\x39"
-                         "\x45\x2e\x69\xcc\x9c\x5f\xdf\x6d"
-                         "\x5e\xa2\xbf\xac\x83\x32\x72\x52"
-                         "\x58\x58\x23\x40\xfd\xa5\xc2\xe6"
-                         "\xe9\x5a\x50\x98\x00\x58\xc9\x86"
-                         "\x4f\x20\x37\xdb\x7b\x22\xa3",
-               .rlen   = 79,
+                         "\x68\x28\x73\x40\x9f\x96\x4a",
+               .alen   = 31,
+               .ptext  = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
+                         "\x10\x57\x85\x39\x93\x8f\xaf\x70"
+                         "\xfa\xa9\xd0\x4d\x5c\x40\x23\xcd"
+                         "\x98\x34\xab\x37\x56\xae\x32",
+               .plen   = 31,
+               .ctext  = "\xa0\xc8\xde\x83\x0d\xc3\x4e\xd5"
+                         "\x69\x7f\x7a\xdd\x8c\x46\xda\xba"
+                         "\x0a\x5c\x0e\x7f\xac\xee\x02\xd2"
+                         "\xe5\x4b\x0a\xba\xb8\xa4\x7b\x66"
+                         "\xde\xae\xdb\xc2\xc0\x0b\xf7\x2b"
+                         "\xdf\xb8\xea\xd8\xa9\x38\xed",
+               .clen   = 47,
        }, {
-               .key    = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
-                         "\x10\x57\x85\x39\x93\x8f\xaf\x70",
-               .klen   = 16,
-               .iv     = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
-                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
-               .assoc  = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
+               .key    = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
+                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1"
+                         "\xc5\x5a\x53\x6e\x9d\xe8\x04\xd4"
+                         "\xc9\x3f\xe2\x2d\x0c\xc6\x1a\xcb",
+               .klen   = 32,
+               .iv     = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
                          "\x50\xc4\xde\x82\x90\x21\x11\x73"
                          "\x8f\x0a\xd6\x8f\xdf\x90\xe4\xda"
-                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81"
-                         "\x0b\x76\x4f\xd7\x0a\x4b\x5e\x51"
-                         "\xe3\x1d\xb9\xe5\x21\xb9\x8f\xd4"
-                         "\x3d\x72\x3e\x26\x16\xa9\xca\x32"
-                         "\x77\x47\x63\x14\x95\x3d\xe4\x34",
-               .alen   = 64,
-               .input  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
+                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81",
+               .assoc  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
                          "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
                          "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37"
-                         "\x8f\xa1\x50\x23\x22\x4f\xe3\x91"
-                         "\xe9\x21\x5e\xbf\x52\x23\x95\x37"
-                         "\x48\x0c\x38\x8f\xf0\xff\x92\x24"
-                         "\x6b\x47\x49\xe3\x94\x1f\x1e\x01",
-               .ilen   = 64,
-               .result = "\xe6\xeb\x92\x5a\x5b\xf0\x2d\xbb"
-                         "\x23\xec\x35\xe3\xae\xc9\xfb\x0b"
-                         "\x90\x14\x46\xeb\xa8\x8d\xb0\x9b"
-                         "\x39\xda\x8b\x48\xec\xb2\x00\x4e"
-                         "\x80\x6f\x46\x4f\x9b\x1e\xbb\x35"
-                         "\xea\x5a\xbc\xa2\x36\xa5\x89\x45"
-                         "\xc2\xd6\xd7\x15\x0b\xf6\x6c\x56"
-                         "\xec\x99\x7d\x61\xb3\x15\x93\xed"
-                         "\x83\x1e\xd9\x48\x84\x0b\x37\xfe"
-                         "\x95\x74\x44\xd5\x54\xa6\x27\x06",
-               .rlen   = 80,
+                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
+               .alen   = 32,
+               .ptext  = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
+                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76"
+                         "\x24\x6b\xdc\xd1\x61\xe0\xa5\xe7"
+                         "\x5a\x61\x8a\x0f\x30\x0d\xd1\xec",
+               .plen   = 32,
+               .ctext  = "\xd3\x68\x14\x70\x3c\x01\x43\x86"
+                         "\x02\xab\xbe\x75\xaa\xe7\xf5\x53"
+                         "\x5c\x05\xbd\x9b\x19\xbb\x2a\x61"
+                         "\x8f\x69\x05\x75\x8e\xca\x60\x0c"
+                         "\x5b\xa2\x48\x61\x32\x74\x11\x2b"
+                         "\xf6\xcf\x06\x78\x6f\x78\x1a\x4a",
+               .clen   = 48,
        }, {
-               .key    = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
-                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76",
-               .klen   = 16,
-               .iv     = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
-                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
-               .assoc  = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
+               .key    = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
+                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7"
+                         "\xef\x1c\x5f\xf2\xa3\x88\x86\xed"
+                         "\x8a\x6d\xc1\x05\xe7\x25\xb9\xa2",
+               .klen   = 32,
+               .iv     = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
                          "\xd1\x9e\x90\x13\x8a\x45\xd3\x79"
                          "\xba\xcd\xe2\x13\xe4\x30\x66\xf4"
-                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58"
-                         "\x1a\x22\x53\x05\x6b\x5c\x71\x4f"
-                         "\xfd\x2d\x4d\x4c\xe5\x62\xa5\x63"
-                         "\x6a\xda\x26\xc8\x7f\xff\xea\xfd"
-                         "\x46\x4a\xfa\x53\x8f\xc4\xcd\x68"
-                         "\x58",
-               .alen   = 65,
-               .input  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
+                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58",
+               .assoc  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
                          "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
                          "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
                          "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d\x4d\x54\x51\x84\x61\xf6\x8e"
-                         "\x03\x31\xf2\x25\x16\xcc\xaa\xc6"
-                         "\x75\x73\x20\x30\x59\x54\xb2\xf0"
-                         "\x3a\x4b\xe0\x23\x8e\xa6\x08\x35"
-                         "\x8a\xdf\x27\xa0\xe4\x60\x99\xae"
-                         "\x8e\x43\xd9\x39\x7b\x10\x40\x67"
-                         "\x5c\x7e\xc9\x70\x63\x34\xca\x59"
-                         "\xfe\x86\xbc\xb7\x9c\x39\xf3\x6d"
-                         "\x6a\x41\x64\x6f\x16\x7f\x65\x7e"
-                         "\x89\x84\x68\xeb\xb0\x51\xbe\x55"
-                         "\x33\x16\x59\x6c\x3b\xef\x88\xad"
-                         "\x2f\xab\xbc\x25\x76\x87\x41\x2f"
-                         "\x36",
-               .ilen   = 129,
-               .result = "\x89\x24\x27\x86\xdc\xd7\x6b\xd9"
-                         "\xd1\xcd\xdc\x16\xdd\x2c\xc1\xfb"
-                         "\x52\xb5\xb3\xab\x50\x99\x3f\xa0"
-                         "\x38\xa4\x74\xa5\x04\x15\x63\x05"
-                         "\x8f\x54\x81\x06\x5a\x6b\xa4\x63"
-                         "\x6d\xa7\x21\xcb\xff\x42\x30\x8e"
-                         "\x3b\xd1\xca\x3f\x4b\x1a\xb8\xc3"
-                         "\x42\x01\xe6\xbc\x75\x15\x87\xee"
-                         "\xc9\x8e\x65\x01\xd9\xd8\xb5\x9f"
-                         "\x48\x86\xa6\x5f\x2c\xc7\xb5\xb0"
-                         "\xed\x5d\x14\x7c\x3f\x40\xb1\x0b"
-                         "\x72\xef\x94\x8d\x7a\x85\x56\xe5"
-                         "\x56\x08\x15\x56\xba\xaf\xbd\xf0"
-                         "\x20\xef\xa0\xf6\xa9\xad\xa2\xc9"
-                         "\x1c\x3b\x28\x51\x7e\x77\xb2\x18"
-                         "\x4f\x61\x64\x37\x22\x36\x6d\x78"
-                         "\xed\xed\x35\xe8\x83\xa5\xec\x25"
-                         "\x6b\xff\x5f\x1a\x09\x96\x3d\xdc"
-                         "\x20",
-               .rlen   = 145,
+                         "\x9d",
+               .alen   = 33,
+               .ptext  = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
+                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c"
+                         "\x4f\x2e\xe8\x55\x66\x80\x27\x00"
+                         "\x1b\x8f\x68\xe7\x0a\x6c\x71\xc3"
+                         "\x21\x78\x55\x9d\x9c\x65\x7b\xcd"
+                         "\x0a\x34\x97\xff\x47\x37\xb0\x2a"
+                         "\x80\x0d\x19\x98\x33\xa9\x7a\xe3"
+                         "\x2e\x4c\xc6\xf3\x8c\x88\x42\x01"
+                         "\xbd",
+               .plen   = 65,
+               .ctext  = "\x07\x0a\x35\xb0\x82\x03\x5a\xd2"
+                         "\x15\x3a\x6c\x72\x83\x9b\xb1\x75"
+                         "\xea\xf2\xfc\xff\xc6\xf1\x13\xa4"
+                         "\x1a\x93\x33\x79\x97\x82\x81\xc0"
+                         "\x96\xc2\x00\xab\x39\xae\xa1\x62"
+                         "\x53\xa3\x86\xc9\x07\x8c\xaf\x22"
+                         "\x47\x31\x29\xca\x4a\x95\xf5\xd5"
+                         "\x20\x63\x5a\x54\x80\x2c\x4a\x63"
+                         "\xfb\x18\x73\x31\x4f\x08\x21\x5d"
+                         "\x20\xe9\xc3\x7e\xea\x25\x77\x3a"
+                         "\x65",
+               .clen   = 81,
        }, {
-               .key    = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
-                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c",
-               .klen   = 16,
-               .iv     = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
-                         "\x32\x42\x15\x80\x85\xa1\x65\xfe",
-               .assoc  = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
+               .key    = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
+                         "\x32\x42\x15\x80\x85\xa1\x65\xfe"
+                         "\x19\xde\x6b\x76\xa8\x28\x08\x07"
+                         "\x4b\x9a\xa0\xdd\xc1\x84\x58\x79",
+               .klen   = 32,
+               .iv     = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
                          "\x52\x79\x42\xa5\x84\x6a\x96\x7f"
                          "\xe4\x8f\xed\x97\xe9\xd0\xe8\x0d"
-                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e"
-                         "\x28\xce\x57\x34\xcd\x6e\x84\x4c"
-                         "\x17\x3c\xe1\xb2\xa8\x0b\xbb\xf1"
-                         "\x96\x41\x0d\x69\xe8\x54\x0a\xc8"
-                         "\x15\x4e\x91\x92\x89\x4b\xb7\x9b"
-                         "\x21\xf7\x42\x89\xac\x12\x2a\x54"
-                         "\x69\xee\x18\xc7\x8d\xed\xe8\xfd"
-                         "\xbb\x04\x28\xe6\x8a\x3c\x98\xc1"
-                         "\x04\x2d\xa9\xa1\x24\x83\xff\xe9"
-                         "\x55\x7a\xf0\xd1\xf6\x63\x05\xe1"
-                         "\xd9\x1e\x75\x72\xc1\x9f\xae\x32"
-                         "\xe1\x6b\xcd\x9e\x61\x19\x23\x86"
-                         "\xd9\xd2\xaf\x8e\xd5\xd3\xa8\xa9"
-                         "\x51",
-               .alen   = 129,
-               .input  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
+                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e",
+               .assoc  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
                          "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
                          "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
                          "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
@@ -25273,756 +20277,554 @@ static const struct aead_testvec morus1280_enc_tv_template[] = {
                          "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
                          "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
                          "\x54",
-               .ilen   = 65,
-               .result = "\x36\x78\xb9\x22\xde\x62\x35\x55"
-                         "\x1a\x7a\xf5\x45\xbc\xd7\x15\x82"
-                         "\x01\xe9\x5a\x07\xea\x46\xaf\x91"
-                         "\xcb\x73\xa5\xee\xe1\xb4\xbf\xc2"
-                         "\xdb\xd2\x9d\x59\xde\xfc\x83\x00"
-                         "\xf5\x46\xac\x97\xd5\x57\xa9\xb9"
-                         "\x1f\x8c\xe8\xca\x68\x8b\x91\x0c"
-                         "\x01\xbe\x0a\xaf\x7c\xf6\x67\xa4"
-                         "\xbf\xbc\x88\x3f\x5d\xd1\xf9\x19"
-                         "\x0f\x9d\xb2\xaf\xb9\x6e\x17\xdf"
-                         "\xa2",
-               .rlen   = 81,
+               .alen   = 65,
+               .ptext  = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
+                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82"
+                         "\x79\xf0\xf3\xd9\x6c\x20\xa9\x1a"
+                         "\xdc\xbc\x47\xc0\xe4\xcb\x10\x99"
+                         "\x2f",
+               .plen   = 33,
+               .ctext  = "\x33\xc1\xda\xfa\x15\x21\x07\x8e"
+                         "\x93\x68\xea\x64\x7b\x3d\x4b\x6b"
+                         "\x71\x5e\x5e\x6b\x92\xaa\x65\xc2"
+                         "\x7a\x2a\xc1\xa9\x0a\xa1\x24\x81"
+                         "\x26\x3a\x5a\x09\xe8\xce\x73\x72"
+                         "\xde\x7b\x58\x9e\x85\xb9\xa4\x28"
+                         "\xda",
+               .clen   = 49,
        }, {
-               .key    = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
-                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82",
-               .klen   = 16,
-               .iv     = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
-                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
-               .assoc  = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
+               .key    = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
+                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04"
+                         "\x44\xa1\x76\xfb\xad\xc8\x8a\x21"
+                         "\x0d\xc8\x7f\xb6\x9b\xe3\xf8\x4f",
+               .klen   = 32,
+               .iv     = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
                          "\xd3\x53\xf4\x36\x7e\x8e\x59\x85"
                          "\x0e\x51\xf9\x1c\xee\x70\x6a\x27"
                          "\x3d\xd3\xb7\xac\x51\xfa\xdf\x05",
-               .alen   = 32,
-               .input  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07"
-                         "\xd9\x02\x7c\x3d\x2f\x18\x4b\x2d"
-                         "\x6e\xde\xee\xa2\x08\x12\xc7\xba",
-               .ilen   = 32,
-               .result = "\x08\x1b\x95\x0e\x41\x95\x02\x4b"
-                         "\x9c\xbb\xa8\xd0\x7c\xd3\x44\x6e"
-                         "\x89\x14\x33\x70\x0a\xbc\xea\x39"
-                         "\x88\xaa\x2b\xd5\x73\x11\x55\xf5"
-                         "\x33\x33\x9c\xd7\x42\x34\x49\x8e"
-                         "\x2f\x03\x30\x05\x47\xaf\x34",
-               .rlen   = 47,
-       }, {
-               .key    = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
+               .assoc  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
+                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
+               .alen   = 16,
+               .ptext  = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
                          "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
-               .klen   = 16,
-               .iv     = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
-                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
-               .assoc  = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
+               .plen   = 16,
+               .ctext  = "\x3e\xf8\x86\x3d\x39\xf8\x96\x02"
+                         "\x0f\xdf\xc9\x6e\x37\x1e\x57\x99"
+                         "\x07\x2a\x1a\xac\xd1\xda\xfd\x3b"
+                         "\xc7\xff\xbd\xbc\x85\x09\x0b",
+               .clen   = 31,
+       }, {
+               .key    = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
+                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a"
+                         "\x6e\x63\x82\x7f\xb2\x68\x0c\x3a"
+                         "\xce\xf5\x5e\x8e\x75\x42\x97\x26",
+               .klen   = 32,
+               .iv     = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
                          "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c"
                          "\x39\x14\x05\xa0\xf3\x10\xec\x41"
                          "\xff\x01\x95\x84\x2b\x59\x7f\xdb",
-               .alen   = 32,
-               .input  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d"
-                         "\x03\xc4\x88\xc1\x35\xb8\xcd\x47"
-                         "\x2f\x0c\xcd\x7a\xe2\x71\x66\x91",
-               .ilen   = 32,
-               .result = "\x97\xca\xf4\xe0\x8d\x89\xbf\x68"
-                         "\x0c\x60\xb9\x27\xdf\xaa\x41\xc6"
-                         "\x25\xd8\xf7\x1f\x10\x15\x48\x61"
-                         "\x4c\x95\x00\xdf\x51\x9b\x7f\xe6"
-                         "\x24\x40\x9e\xbe\x3b\xeb\x1b\x98"
-                         "\xb9\x9c\xe5\xef\xf2\x05",
-               .rlen   = 46,
-       }, {
-               .key    = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
+               .assoc  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
+                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
+               .alen   = 16,
+               .ptext  = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
                          "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
-               .klen   = 16,
-               .iv     = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
-                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
-               .assoc  = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
+               .plen   = 16,
+               .ctext  = "\x2f\xc4\xd8\x0d\xa6\x07\xef\x2e"
+                         "\x6c\xd9\x84\x63\x70\x97\x61\x37"
+                         "\x08\x2f\x16\x90\x9e\x62\x30\x0d"
+                         "\x62\xd5\xc8\xf0\x46\x1a",
+               .clen   = 30,
+       }, {
+               .key    = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
+                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10"
+                         "\x98\x25\x8d\x03\xb7\x08\x8e\x54"
+                         "\x90\x23\x3d\x67\x4f\xa1\x36\xfc",
+               .klen   = 32,
+               .iv     = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
                          "\xd5\x07\x58\x59\x72\xd7\xde\x92"
                          "\x63\xd6\x10\x24\xf8\xb0\x6e\x5a"
                          "\xc0\x2e\x74\x5d\x06\xb8\x1e\xb2",
-               .alen   = 32,
-               .input  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13"
-                         "\x2e\x86\x93\x45\x3a\x58\x4f\x61"
-                         "\xf0\x3a\xac\x53\xbc\xd0\x06\x68",
-               .ilen   = 32,
-               .result = "\x63\x4c\x2a\x8e\xb4\x6b\x63\x0d"
-                         "\xb5\xec\x9b\x4e\x12\x23\xa3\xcf"
-                         "\x1a\x5a\x70\x15\x5a\x10\x40\x51"
-                         "\xca\x47\x4c\x9d\xc9\x97\xf4\x77"
-                         "\xdb\xc8\x10\x2d\xdc\x65\x20\x3f",
-               .rlen   = 40,
-       }, {
-               .key    = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
+               .assoc  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
+                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
+               .alen   = 16,
+               .ptext  = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
                          "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
+               .plen   = 16,
+               .ctext  = "\xce\xf3\x17\x87\x49\xc2\x00\x46"
+                         "\xc6\x12\x5c\x8f\x81\x38\xaa\x55"
+                         "\xf8\x67\x75\xf1\x75\xe3\x2a\x24",
+               .clen   = 24,
+       },
+};
+
+/*
+ * MORUS-640 test vectors - generated via reference implementation from
+ * SUPERCOP (https://bench.cr.yp.to/supercop.html):
+ *
+ *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
+ *   (see crypto_aead/morus640128v2/)
+ */
+static const struct aead_testvec morus640_tv_template[] = {
+       {
+               .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00",
                .klen   = 16,
-               .iv     = "\xbb\x3a\xf7\x57\xc6\x36\x7c\x22"
-                         "\x36\xab\xde\xc6\x6d\x32\x70\x17",
-               .assoc  = "\xcb\x03\x85\xbf\x0a\xd5\x26\xa9"
-                         "\x56\xe1\x0a\xeb\x6c\xfb\xa1\x98"
-                         "\x8d\x98\x1c\xa8\xfe\x50\xf0\x74"
-                         "\x81\x5c\x53\x35\xe0\x17\xbd\x88",
-               .alen   = 32,
-               .input  = "\xda\xcc\x14\x27\x4e\x74\xd1\x30"
-                         "\x76\x18\x37\x0f\x6a\xc4\xd1\x1a"
-                         "\x58\x49\x9f\xc9\x3f\xf8\xd1\x7a"
-                         "\xb2\x67\x8b\x2b\x96\x2f\xa5\x3e",
-               .ilen   = 32,
-               .result = "\xf1\x62\x44\xc7\x5f\x19\xca\x43"
-                         "\x47\x2c\xaf\x68\x82\xbd\x51\xef"
-                         "\x3d\x65\xd8\x45\x2d\x06\x07\x78"
-                         "\x08\x2e\xb3\x23\xcd\x81\x12\x55"
-                         "\x1a",
-               .rlen   = 33,
-       }, {
-               .key    = "\xe9\x95\xa2\x8f\x93\x13\x7b\xb7"
-                         "\x96\x4e\x63\x33\x69\x8d\x02\x9b"
-                         "\x23\xf9\x22\xeb\x80\xa0\xb1\x81"
-                         "\xe2\x73\xc3\x21\x4d\x47\x8d\xf4",
-               .klen   = 32,
-               .iv     = "\xf8\x5e\x31\xf7\xd7\xb2\x25\x3e"
-                         "\xb7\x85\x90\x58\x67\x57\x33\x1d",
+               .iv     = "\x0f\xc9\x8e\x67\x44\x9e\xaa\x86"
+                         "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
                .assoc  = "",
                .alen   = 0,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xdf\x2f\x83\xc0\x45\x4a\x2c\xcf"
-                         "\xb9\xd2\x41\xf6\x80\xa1\x52\x70",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x89\x62\x7d\xf3\x07\x9d\x52\x05"
+                         "\x53\xc3\x04\x60\x93\xb4\x37\x9a",
+               .clen   = 16,
        }, {
-               .key    = "\x25\xba\xdc\x2e\xa3\x8f\x24\xd3"
-                         "\x17\x29\x15\xc5\x63\xb2\xc5\xa1"
-                         "\x4d\xbc\x2d\x6f\x85\x40\x33\x9a"
-                         "\xa3\xa0\xa1\xfa\x27\xa6\x2c\xca",
-               .klen   = 32,
-               .iv     = "\x34\x83\x6a\x96\xe7\x2d\xce\x5a"
-                         "\x38\x5f\x42\xe9\x61\x7b\xf5\x23",
+               .key    = "\x3c\x24\x39\x9f\x10\x7b\xa8\x1b"
+                         "\x80\xda\xb2\x91\xf9\x24\xc2\x06",
+               .klen   = 16,
+               .iv     = "\x4b\xed\xc8\x07\x54\x1a\x52\xa2"
+                         "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x53",
-               .ilen   = 1,
-               .result = "\x01\xd8\x55\x3c\xc0\x5a\x4b\xc7"
-                         "\x01\xf4\x08\xe3\x0d\xf7\xf0\x78"
-                         "\x53",
-               .rlen   = 17,
+               .ptext  = "\x69",
+               .plen   = 1,
+               .ctext  = "\xa8\x8d\xe4\x90\xb5\x50\x8f\x78"
+                         "\xb6\x10\x9a\x59\x5f\x61\x37\x70"
+                         "\x09",
+               .clen   = 17,
        }, {
-               .key    = "\x62\xdf\x16\xcd\xb3\x0a\xcc\xef"
-                         "\x98\x03\xc7\x56\x5d\xd6\x87\xa8"
-                         "\x77\x7e\x39\xf3\x8a\xe0\xb5\xb4"
-                         "\x65\xce\x80\xd2\x01\x05\xcb\xa1",
-               .klen   = 32,
-               .iv     = "\x71\xa8\xa4\x35\xf7\xa9\x76\x75"
-                         "\xb8\x39\xf4\x7a\x5b\x9f\xb8\x29",
+               .key    = "\x79\x49\x73\x3e\x20\xf7\x51\x37"
+                         "\x01\xb4\x64\x22\xf3\x48\x85\x0c",
+               .klen   = 16,
+               .iv     = "\x88\x12\x01\xa6\x64\x96\xfb\xbe"
+                         "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x8f\x3a\xc1\x05\x7f\xe7\xcb\x83"
-                         "\xf9\xa6\x4d\xc3\x58\x31\x19\x2c"
-                         "\xd7\x90\xc2\x56\x4e\xd8\x57\xc7"
-                         "\xf6\xf0\x27\xb4\x25\x4c\x83",
-               .ilen   = 31,
-               .result = "\xc2\x4b\x41\x0f\x2d\xb9\x62\x07"
-                         "\xff\x8e\x74\xf8\xa1\xa6\xd5\x37"
-                         "\xa5\x64\x31\x5c\xca\x73\x9b\x43"
-                         "\xe6\x70\x63\x46\x95\xcb\xf7\xb5"
-                         "\x20\x8c\x75\x7a\x2a\x17\x2f\xa9"
-                         "\xb8\x4d\x11\x42\xd1\xf8\xf1",
-               .rlen   = 47,
+               .ptext  = "\xa6\xa4\x1e\x76\xec\xd4\x50\xcc"
+                         "\x62\x58\xe9\x8f\xef\xa4\x17",
+               .plen   = 15,
+               .ctext  = "\x76\xdd\xb9\x05\x3d\xce\x61\x38"
+                         "\xf3\xef\xf7\xe5\xd7\xfd\x70\xa5"
+                         "\xcf\x9d\x64\xb8\x0a\x9f\xfd\x8b"
+                         "\xd4\x6e\xfe\xd9\xc8\x63\x4b",
+               .clen   = 31,
        }, {
-               .key    = "\x9e\x03\x4f\x6d\xc3\x86\x75\x0a"
-                         "\x19\xdd\x79\xe8\x57\xfb\x4a\xae"
-                         "\xa2\x40\x45\x77\x90\x80\x37\xce"
-                         "\x26\xfb\x5f\xaa\xdb\x64\x6b\x77",
-               .klen   = 32,
-               .iv     = "\xae\xcc\xde\xd5\x07\x25\x1f\x91"
-                         "\x39\x14\xa6\x0c\x55\xc4\x7b\x30",
+               .key    = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
+                         "\x82\x8e\x16\xb4\xed\x6d\x47\x12",
+               .klen   = 16,
+               .iv     = "\xc4\x37\x3b\x45\x74\x11\xa4\xda"
+                         "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xcc\x5f\xfb\xa4\x8f\x63\x74\x9f"
-                         "\x7a\x81\xff\x55\x52\x56\xdc\x33"
-                         "\x01\x52\xcd\xdb\x53\x78\xd9\xe1"
-                         "\xb7\x1d\x06\x8d\xff\xab\x22\x98",
-               .ilen   = 32,
-               .result = "\xbb\x01\x7c\xd1\x2c\x33\x7b\x37"
-                         "\x0a\xee\xc4\x30\x19\xd7\x3a\x6f"
-                         "\xf8\x2b\x67\xf5\x3b\x84\x87\x2a"
-                         "\xfb\x07\x7a\x82\xb5\xe4\x85\x26"
-                         "\x1e\xa8\xe5\x04\x54\xce\xe5\x5f"
-                         "\xb5\x3f\xc1\xd5\x7f\xbd\xd2\xa6",
-               .rlen   = 48,
+               .ptext  = "\xe2\xc9\x58\x15\xfc\x4f\xf8\xe8"
+                         "\xe3\x32\x9b\x21\xe9\xc8\xd9\x97",
+               .plen   = 16,
+               .ctext  = "\xdc\x72\xe8\x14\xfb\x63\xad\x72"
+                         "\x1f\x57\x9a\x1f\x88\x81\xdb\xd6"
+                         "\xc1\x91\x9d\xb9\x25\xc4\x99\x4c"
+                         "\x97\xcd\x8a\x0c\x9d\x68\x00\x1c",
+               .clen   = 32,
        }, {
-               .key    = "\xdb\x28\x89\x0c\xd3\x01\x1e\x26"
-                         "\x9a\xb7\x2b\x79\x51\x1f\x0d\xb4"
-                         "\xcc\x03\x50\xfc\x95\x20\xb9\xe7"
-                         "\xe8\x29\x3e\x83\xb5\xc3\x0a\x4e",
-               .klen   = 32,
-               .iv     = "\xea\xf1\x18\x74\x17\xa0\xc8\xad"
-                         "\xba\xee\x58\x9d\x4f\xe8\x3d\x36",
+               .key    = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
+                         "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
+               .klen   = 16,
+               .iv     = "\x01\x5c\x75\xe5\x84\x8d\x4d\xf6"
+                         "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x08\x84\x34\x44\x9f\xde\x1c\xbb"
-                         "\xfb\x5b\xb1\xe6\x4c\x7a\x9f\x39"
-                         "\x2c\x14\xd9\x5f\x59\x18\x5b\xfb"
-                         "\x79\x4b\xe5\x65\xd9\x0a\xc1\x6f"
-                         "\x2e",
-               .ilen   = 33,
-               .result = "\xc2\xf4\x40\x55\xf9\x59\xff\x73"
-                         "\x08\xf5\x98\x92\x0c\x7b\x35\x9a"
-                         "\xa8\xf4\x42\x7e\x6f\x93\xca\x22"
-                         "\x23\x06\x1e\xf8\x89\x22\xf4\x46"
-                         "\x7c\x7c\x67\x75\xab\xe5\x75\xaa"
-                         "\x15\xd7\x83\x19\xfd\x31\x59\x5b"
-                         "\x32",
-               .rlen   = 49,
+               .ptext  = "\x1f\xee\x92\xb4\x0c\xcb\xa1\x04"
+                         "\x64\x0c\x4d\xb2\xe3\xec\x9c\x9d"
+                         "\x09",
+               .plen   = 17,
+               .ctext  = "\x6b\x4f\x3b\x90\x9a\xa2\xb3\x82"
+                         "\x0a\xb8\x55\xee\xeb\x73\x4d\x7f"
+                         "\x54\x11\x3a\x8a\x31\xa3\xb5\xf2"
+                         "\xcd\x49\xdb\xf3\xee\x26\xbd\xa2"
+                         "\x0d",
+               .clen   = 33,
        }, {
-               .key    = "\x17\x4d\xc3\xab\xe3\x7d\xc7\x42"
-                         "\x1b\x91\xdd\x0a\x4b\x43\xcf\xba"
-                         "\xf6\xc5\x5c\x80\x9a\xc0\x3b\x01"
-                         "\xa9\x56\x1d\x5b\x8f\x22\xa9\x25",
-               .klen   = 32,
-               .iv     = "\x27\x16\x51\x13\x27\x1c\x71\xc9"
-                         "\x3b\xc8\x0a\x2f\x49\x0c\x00\x3c",
+               .key    = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
+                         "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f",
+               .klen   = 16,
+               .iv     = "\x3d\x80\xae\x84\x94\x09\xf6\x12"
+                         "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x45\xa8\x6e\xe3\xaf\x5a\xc5\xd7"
-                         "\x7c\x35\x63\x77\x46\x9f\x61\x3f"
-                         "\x56\xd7\xe4\xe3\x5e\xb8\xdc\x14"
-                         "\x3a\x79\xc4\x3e\xb3\x69\x61\x46"
-                         "\x3c\xb6\x83\x4e\xb4\x26\xc7\x73"
-                         "\x22\xda\x52\x8b\x7d\x11\x98\xea"
-                         "\x62\xe1\x14\x1e\xdc\xfe\x0f\xad"
-                         "\x20\x76\x5a\xdc\x4e\x71\x13",
-               .ilen   = 63,
-               .result = "\xc9\x82\x3b\x4b\x87\x84\xa5\xdb"
-                         "\xa0\x8c\xd3\x3e\x7f\x8d\xe8\x28"
-                         "\x2a\xdc\xfa\x01\x84\x87\x9a\x70"
-                         "\x81\x75\x37\x0a\xd2\x75\xa9\xb6"
-                         "\x21\x72\xee\x7e\x65\x95\xe5\xcc"
-                         "\x01\xb7\x39\xa6\x51\x15\xca\xff"
-                         "\x61\xdc\x97\x38\xcc\xf4\xca\xc7"
-                         "\x83\x9b\x05\x11\x72\x60\xf0\xb4"
-                         "\x7e\x06\xab\x0a\xc0\xbb\x59\x23"
-                         "\xaa\x2d\xfc\x4e\x35\x05\x59",
-               .rlen   = 79,
+               .ptext  = "\x5c\x13\xcb\x54\x1c\x47\x4a\x1f"
+                         "\xe5\xe6\xff\x44\xdd\x11\x5f\xa3"
+                         "\x33\xdd\xc2\xf8\xdd\x18\x2b\x93"
+                         "\x57\x05\x01\x1c\x66\x22\xd3",
+               .plen   = 31,
+               .ctext  = "\x59\xd1\x0f\x6b\xee\x27\x84\x92"
+                         "\xb7\xa9\xb5\xdd\x02\xa4\x12\xa5"
+                         "\x50\x32\xb4\x9a\x2e\x35\x83\x55"
+                         "\x36\x12\x12\xed\xa3\x31\xc5\x30"
+                         "\xa7\xe2\x4a\x6d\x05\x59\x43\x91"
+                         "\x75\xfa\x6c\x17\xc6\x73\xca",
+               .clen   = 47,
        }, {
-               .key    = "\x54\x71\xfd\x4b\xf3\xf9\x6f\x5e"
-                         "\x9c\x6c\x8f\x9c\x45\x68\x92\xc1"
-                         "\x21\x87\x67\x04\x9f\x60\xbd\x1b"
-                         "\x6a\x84\xfc\x34\x6a\x81\x48\xfb",
-               .klen   = 32,
-               .iv     = "\x63\x3b\x8b\xb3\x37\x98\x1a\xe5"
-                         "\xbc\xa2\xbc\xc0\x43\x31\xc2\x42",
+               .key    = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
+                         "\x05\x1d\x2c\x68\xdb\xda\x8f\x25",
+               .klen   = 16,
+               .iv     = "\x7a\xa5\xe8\x23\xa4\x84\x9e\x2d"
+                         "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x81\xcd\xa8\x82\xbf\xd6\x6e\xf3"
-                         "\xfd\x0f\x15\x09\x40\xc3\x24\x45"
-                         "\x81\x99\xf0\x67\x63\x58\x5e\x2e"
-                         "\xfb\xa6\xa3\x16\x8d\xc8\x00\x1c"
-                         "\x4b\x62\x87\x7c\x15\x38\xda\x70"
-                         "\x3d\xea\xe7\xf2\x40\xba\xae\x79"
-                         "\x8f\x48\xfc\xbf\x45\x53\x2e\x78"
-                         "\xef\x79\xf0\x1b\x49\xf7\xfd\x9c",
-               .ilen   = 64,
-               .result = "\x11\x7c\x7d\xef\xce\x29\x95\xec"
-                         "\x7e\x9f\x42\xa6\x26\x07\xa1\x75"
-                         "\x2f\x4e\x09\x9a\xf6\x6b\xc2\xfa"
-                         "\x0d\xd0\x17\xdc\x25\x1e\x9b\xdc"
-                         "\x5f\x8c\x1c\x60\x15\x4f\x9b\x20"
-                         "\x7b\xff\xcd\x82\x60\x84\xf4\xa5"
-                         "\x20\x9a\x05\x19\x5b\x02\x0a\x72"
-                         "\x43\x11\x26\x58\xcf\xc5\x41\xcf"
-                         "\x13\xcc\xde\x32\x92\xfa\x86\xf2"
-                         "\xaf\x16\xe8\x8f\xca\xb6\xfd\x54",
-               .rlen   = 80,
+               .ptext  = "\x98\x37\x05\xf3\x2c\xc2\xf3\x3b"
+                         "\x66\xc0\xb1\xd5\xd7\x35\x21\xaa"
+                         "\x5d\x9f\xce\x7c\xe2\xb8\xad\xad"
+                         "\x19\x33\xe0\xf4\x40\x81\x72\x28",
+               .plen   = 32,
+               .ctext  = "\xdb\x49\x68\x0f\x91\x5b\x21\xb1"
+                         "\xcf\x50\xb2\x4c\x32\xe1\xa6\x69"
+                         "\xc0\xfb\x44\x1f\xa0\x9a\xeb\x39"
+                         "\x1b\xde\x68\x38\xcc\x27\x52\xc5"
+                         "\xf6\x3e\x74\xea\x66\x5b\x5f\x0c"
+                         "\x65\x9e\x58\xe6\x52\xa2\xfe\x59",
+               .clen   = 48,
        }, {
-               .key    = "\x90\x96\x36\xea\x03\x74\x18\x7a"
-                         "\x1d\x46\x42\x2d\x3f\x8c\x54\xc7"
-                         "\x4b\x4a\x73\x89\xa4\x00\x3f\x34"
-                         "\x2c\xb1\xdb\x0c\x44\xe0\xe8\xd2",
-               .klen   = 32,
-               .iv     = "\xa0\x5f\xc5\x52\x47\x13\xc2\x01"
-                         "\x3d\x7c\x6e\x52\x3d\x55\x85\x48",
-               .assoc  = "\xaf",
+               .key    = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
+                         "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b",
+               .klen   = 16,
+               .iv     = "\xb6\xca\x22\xc3\xb4\x00\x47\x49"
+                         "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
+               .assoc  = "\xc5",
                .alen   = 1,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x9b\xc5\x3b\x20\x0a\x88\x56\xbe"
-                         "\x69\xdf\xc4\xc4\x02\x46\x3a\xf0",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x56\xe7\x24\x52\xdd\x95\x60\x5b"
+                         "\x09\x48\x39\x69\x9c\xb3\x62\x46",
+               .clen   = 16,
        }, {
-               .key    = "\xcd\xbb\x70\x89\x13\xf0\xc1\x95"
-                         "\x9e\x20\xf4\xbf\x39\xb1\x17\xcd"
-                         "\x76\x0c\x7f\x0d\xa9\xa0\xc1\x4e"
-                         "\xed\xdf\xb9\xe4\x1e\x3f\x87\xa8",
-               .klen   = 32,
-               .iv     = "\xdc\x84\xfe\xf1\x58\x8f\x6b\x1c"
-                         "\xbe\x57\x20\xe3\x37\x7a\x48\x4f",
-               .assoc  = "\xeb\x4d\x8d\x59\x9c\x2e\x15\xa3"
-                         "\xde\x8d\x4d\x07\x36\x43\x78\xd0"
-                         "\x0b\x6d\x84\x4f\x2c\xf0\x82\x5b"
-                         "\x4e\xf6\x29\xd1\x8b\x6f\x56",
+               .key    = "\xe4\x25\xcd\xfa\x80\xdd\x46\xde"
+                         "\x07\xd1\x90\x8b\xcf\x23\x15\x31",
+               .klen   = 16,
+               .iv     = "\xf3\xee\x5c\x62\xc4\x7c\xf0\x65"
+                         "\x27\x08\xbd\xaf\xce\xec\x45\xb3",
+               .assoc  = "\x02\xb8\xea\xca\x09\x1b\x9a\xec"
+                         "\x47\x3e\xe9\xd4\xcc\xb5\x76",
+               .alen   = 15,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xdd\xfa\x6c\x1f\x5d\x86\x87\x01"
+                         "\x13\xe5\x73\x46\x46\xf2\x5c\xe1",
+               .clen   = 16,
+       }, {
+               .key    = "\x20\x4a\x07\x99\x91\x58\xee\xfa"
+                         "\x88\xab\x42\x1c\xc9\x47\xd7\x38",
+               .klen   = 16,
+               .iv     = "\x2f\x13\x95\x01\xd5\xf7\x99\x81"
+                         "\xa8\xe2\x6f\x41\xc8\x10\x08\xb9",
+               .assoc  = "\x3f\xdc\x24\x69\x19\x96\x43\x08"
+                         "\xc8\x18\x9b\x65\xc6\xd9\x39\x3b",
+               .alen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xa6\x1b\xb9\xd7\x5e\x3c\xcf\xac"
+                         "\xa9\x21\x45\x0b\x16\x52\xf7\xe1",
+               .clen   = 16,
+       }, {
+               .key    = "\x5d\x6f\x41\x39\xa1\xd4\x97\x16"
+                         "\x09\x85\xf4\xae\xc3\x6b\x9a\x3e",
+               .klen   = 16,
+               .iv     = "\x6c\x38\xcf\xa1\xe5\x73\x41\x9d"
+                         "\x29\xbc\x21\xd2\xc2\x35\xcb\xbf",
+               .assoc  = "\x7b\x01\x5d\x08\x29\x12\xec\x24"
+                         "\x49\xf3\x4d\xf7\xc0\xfe\xfb\x41"
+                         "\x3c",
+               .alen   = 17,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x15\xff\xde\x3b\x34\xfc\xf6\xf9"
+                         "\xbb\xa8\x62\xad\x0a\xf5\x48\x60",
+               .clen   = 16,
+       }, {
+               .key    = "\x99\x93\x7a\xd8\xb1\x50\x40\x31"
+                         "\x8a\x60\xa6\x3f\xbd\x90\x5d\x44",
+               .klen   = 16,
+               .iv     = "\xa8\x5c\x09\x40\xf5\xef\xea\xb8"
+                         "\xaa\x96\xd3\x64\xbc\x59\x8d\xc6",
+               .assoc  = "\xb8\x26\x97\xa8\x39\x8e\x94\x3f"
+                         "\xca\xcd\xff\x88\xba\x22\xbe\x47"
+                         "\x67\xba\x85\xf1\xbb\x30\x56\x26"
+                         "\xaf\x0b\x02\x38\xcc\x44\xa7",
                .alen   = 31,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xe0\x6d\xa1\x07\x98\x2f\x40\x2d"
-                         "\x2e\x9a\xd6\x61\x43\xc0\x74\x69",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xd2\x9d\xf8\x3b\xd7\x84\xe9\x2d"
+                         "\x4b\xef\x75\x16\x0a\x99\xae\x6b",
+               .clen   = 16,
        }, {
-               .key    = "\x0a\xe0\xaa\x29\x24\x6c\x6a\xb1"
-                         "\x1f\xfa\xa6\x50\x33\xd5\xda\xd3"
-                         "\xa0\xce\x8a\x91\xae\x40\x43\x68"
-                         "\xae\x0d\x98\xbd\xf8\x9e\x26\x7f",
-               .klen   = 32,
-               .iv     = "\x19\xa9\x38\x91\x68\x0b\x14\x38"
-                         "\x3f\x31\xd2\x74\x31\x9e\x0a\x55",
-               .assoc  = "\x28\x72\xc7\xf8\xac\xaa\xbe\xbf"
-                         "\x5f\x67\xff\x99\x30\x67\x3b\xd6"
-                         "\x35\x2f\x90\xd3\x31\x90\x04\x74"
-                         "\x0f\x23\x08\xa9\x65\xce\xf6\xea",
+               .key    = "\xd6\xb8\xb4\x77\xc1\xcb\xe9\x4d"
+                         "\x0a\x3a\x58\xd1\xb7\xb4\x1f\x4a",
+               .klen   = 16,
+               .iv     = "\xe5\x81\x42\xdf\x05\x6a\x93\xd4"
+                         "\x2b\x70\x85\xf5\xb6\x7d\x50\xcc",
+               .assoc  = "\xf4\x4a\xd1\x47\x49\x09\x3d\x5b"
+                         "\x4b\xa7\xb1\x19\xb4\x46\x81\x4d"
+                         "\x91\x7c\x91\x75\xc0\xd0\xd8\x40"
+                         "\x71\x39\xe1\x10\xa6\xa3\x46\x7a",
                .alen   = 32,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\xb9\x57\x13\x3e\x82\x31\x61\x65"
-                         "\x0d\x7f\x6c\x96\x93\x5c\x50\xe2",
-               .rlen   = 16,
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xe4\x8d\xa7\xa7\x45\xc1\x31\x4f"
+                         "\xce\xfb\xaf\xd6\xc2\xe6\xee\xc0",
+               .clen   = 16,
        }, {
-               .key    = "\x46\x04\xe3\xc8\x34\xe7\x12\xcd"
-                         "\xa0\xd4\x58\xe2\x2d\xf9\x9c\xda"
-                         "\xca\x91\x96\x15\xb4\xe0\xc5\x81"
-                         "\x70\x3a\x77\x95\xd2\xfd\xc5\x55",
-               .klen   = 32,
-               .iv     = "\x55\xcd\x72\x30\x78\x86\xbd\x54"
-                         "\xc0\x0b\x84\x06\x2b\xc2\xcd\x5b",
-               .assoc  = "\x64\x97\x00\x98\xbc\x25\x67\xdb"
-                         "\xe0\x41\xb1\x2a\x2a\x8c\xfe\xdd"
-                         "\x5f\xf2\x9c\x58\x36\x30\x86\x8e"
-                         "\xd1\x51\xe6\x81\x3f\x2d\x95\xc1"
-                         "\x01",
-               .alen   = 33,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x81\x96\x34\xde\xbb\x36\xdd\x3e"
-                         "\x4e\x5e\xcb\x44\x21\xb8\x3f\xf1",
-               .rlen   = 16,
+               .key    = "\x12\xdd\xee\x17\xd1\x47\x92\x69"
+                         "\x8b\x14\x0a\x62\xb1\xd9\xe2\x50",
+               .klen   = 16,
+               .iv     = "\x22\xa6\x7c\x7f\x15\xe6\x3c\xf0"
+                         "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
+               .assoc  = "\x31",
+               .alen   = 1,
+               .ptext  = "\x40",
+               .plen   = 1,
+               .ctext  = "\xe2\x67\x38\x4f\xb9\xad\x7d\x38"
+                         "\x01\xfe\x84\x14\x85\xf8\xd1\xe3"
+                         "\x22",
+               .clen   = 17,
        }, {
-               .key    = "\x83\x29\x1d\x67\x44\x63\xbb\xe9"
-                         "\x20\xaf\x0a\x73\x27\x1e\x5f\xe0"
-                         "\xf5\x53\xa1\x9a\xb9\x80\x47\x9b"
-                         "\x31\x68\x56\x6e\xac\x5c\x65\x2c",
-               .klen   = 32,
-               .iv     = "\x92\xf2\xac\xcf\x88\x02\x65\x70"
-                         "\x41\xe5\x36\x97\x25\xe7\x90\x61",
-               .assoc  = "\xa1\xbb\x3a\x37\xcc\xa1\x10\xf7"
-                         "\x61\x1c\x63\xbc\x24\xb0\xc0\xe3"
-                         "\x8a\xb4\xa7\xdc\x3b\xd0\x08\xa8"
-                         "\x92\x7f\xc5\x5a\x19\x8c\x34\x97"
-                         "\x0f\x95\x9b\x18\xe4\x8d\xb4\x24"
-                         "\xb9\x33\x28\x18\xe1\x9d\x14\xe0"
-                         "\x64\xb2\x89\x7d\x78\xa8\x05\x7e"
-                         "\x07\x8c\xfc\x88\x2d\xb8\x53",
-               .alen   = 63,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x2e\x99\xb6\x79\x57\x56\x80\x36"
-                         "\x8e\xc4\x1c\x12\x7d\x71\x36\x0c",
-               .rlen   = 16,
+               .key    = "\x4f\x01\x27\xb6\xe1\xc3\x3a\x85"
+                         "\x0c\xee\xbc\xf4\xab\xfd\xa5\x57",
+               .klen   = 16,
+               .iv     = "\x5e\xcb\xb6\x1e\x25\x62\xe4\x0c"
+                         "\x2d\x25\xe9\x18\xaa\xc6\xd5\xd8",
+               .assoc  = "\x6d\x94\x44\x86\x69\x00\x8f\x93"
+                         "\x4d\x5b\x15\x3c\xa8\x8f\x06",
+               .alen   = 15,
+               .ptext  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
+                         "\x6d\x92\x42\x61\xa7\x58\x37",
+               .plen   = 15,
+               .ctext  = "\x77\x32\x61\xeb\xb4\x33\x29\x92"
+                         "\x29\x95\xc5\x8e\x85\x76\xab\xfc"
+                         "\x07\x95\xa7\x44\x74\xf7\x22\xff"
+                         "\xd8\xd8\x36\x3d\x8a\x7f\x9e",
+               .clen   = 31,
        }, {
-               .key    = "\xbf\x4e\x57\x07\x54\xdf\x64\x05"
-                         "\xa1\x89\xbc\x04\x21\x42\x22\xe6"
-                         "\x1f\x15\xad\x1e\xbe\x20\xc9\xb4"
-                         "\xf3\x95\x35\x46\x86\xbb\x04\x03",
-               .klen   = 32,
-               .iv     = "\xce\x17\xe5\x6f\x98\x7e\x0e\x8c"
-                         "\xc2\xbf\xe8\x29\x1f\x0b\x52\x68",
-               .assoc  = "\xdd\xe0\x74\xd6\xdc\x1d\xb8\x13"
-                         "\xe2\xf6\x15\x4d\x1e\xd4\x83\xe9"
-                         "\xb4\x76\xb3\x60\x40\x70\x8a\xc1"
-                         "\x53\xac\xa4\x32\xf3\xeb\xd3\x6e"
-                         "\x1e\x42\xa0\x46\x45\x9f\xc7\x22"
-                         "\xd3\x43\xbc\x7e\xa5\x47\x2a\x6f"
-                         "\x91\x19\x70\x1e\xe1\xfe\x25\x49"
-                         "\xd6\x8f\x93\xc7\x28\x3f\x3d\x03",
-               .alen   = 64,
-               .input  = "",
-               .ilen   = 0,
-               .result = "\x7b\x25\x3d\x47\xd4\xa7\x08\xce"
-                         "\x3b\x89\x40\x36\xba\x6d\x0e\xa2",
-               .rlen   = 16,
+               .key    = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
+                         "\x8d\xc8\x6e\x85\xa5\x21\x67\x5d",
+               .klen   = 16,
+               .iv     = "\x9b\xef\xf0\xbd\x35\xdd\x8d\x28"
+                         "\xad\xff\x9b\xa9\xa4\xeb\x98\xdf",
+               .assoc  = "\xaa\xb8\x7e\x25\x79\x7c\x37\xaf"
+                         "\xce\x36\xc7\xce\xa2\xb4\xc9\x60",
+               .alen   = 16,
+               .ptext  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
+                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2",
+               .plen   = 16,
+               .ctext  = "\xd8\xfd\x44\x45\xf6\x42\x12\x38"
+                         "\xf2\x0b\xea\x4f\x9e\x11\x61\x07"
+                         "\x48\x67\x98\x18\x9b\xd0\x0c\x59"
+                         "\x67\xa4\x11\xb3\x2b\xd6\xc1\x70",
+               .clen   = 32,
        }, {
-               .key    = "\xfc\x72\x90\xa6\x64\x5a\x0d\x21"
-                         "\x22\x63\x6e\x96\x1b\x67\xe4\xec"
-                         "\x49\xd7\xb9\xa2\xc3\xc0\x4b\xce"
-                         "\xb4\xc3\x14\x1e\x61\x1a\xa3\xd9",
-               .klen   = 32,
-               .iv     = "\x0b\x3c\x1f\x0e\xa8\xf9\xb7\xa7"
-                         "\x42\x9a\x9a\xba\x19\x30\x15\x6e",
-               .assoc  = "\x1a",
-               .alen   = 1,
-               .input  = "\x29",
-               .ilen   = 1,
-               .result = "\xe6\x09\x6f\x95\x9a\x18\xc8\xf6"
-                         "\x17\x75\x81\x16\xdf\x26\xff\x67"
-                         "\x92",
-               .rlen   = 17,
+               .key    = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
+                         "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
+               .klen   = 16,
+               .iv     = "\xd7\x14\x29\x5d\x45\x59\x36\x44"
+                         "\x2e\xd9\x4d\x3b\x9e\x0f\x5b\xe5",
+               .assoc  = "\xe6\xdd\xb8\xc4\x89\xf8\xe0\xca"
+                         "\x4f\x10\x7a\x5f\x9c\xd8\x8b\x66"
+                         "\x3b",
+               .alen   = 17,
+               .ptext  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
+                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
+                         "\x05",
+               .plen   = 17,
+               .ctext  = "\xb1\xab\x53\x4e\xc7\x40\x16\xb6"
+                         "\x71\x3a\x00\x9f\x41\x88\xb0\xb2"
+                         "\x71\x83\x85\x5f\xc8\x79\x0a\x99"
+                         "\x99\xdc\x89\x1c\x88\xd2\x3e\xf9"
+                         "\x83",
+               .clen   = 33,
        }, {
-               .key    = "\x38\x97\xca\x45\x74\xd6\xb6\x3c"
-                         "\xa3\x3d\x20\x27\x15\x8b\xa7\xf2"
-                         "\x74\x9a\xc4\x27\xc8\x60\xcd\xe8"
-                         "\x75\xf0\xf2\xf7\x3b\x79\x42\xb0",
-               .klen   = 32,
-               .iv     = "\x47\x60\x59\xad\xb8\x75\x60\xc3"
-                         "\xc3\x74\x4c\x4c\x13\x54\xd8\x74",
-               .assoc  = "\x56\x29\xe7\x15\xfc\x14\x0a\x4a"
-                         "\xe4\xaa\x79\x70\x12\x1d\x08\xf6"
-                         "\x09\xfb\xca\x69\x4b\xb0\x8e\xf5"
-                         "\xd6\x07\x62\xe3\xa8\xa9\x12",
+               .key    = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
+                         "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69",
+               .klen   = 16,
+               .iv     = "\x14\x39\x63\xfc\x56\xd5\xdf\x5f"
+                         "\xaf\xb3\xff\xcc\x98\x33\x1d\xeb",
+               .assoc  = "\x23\x02\xf1\x64\x9a\x73\x89\xe6"
+                         "\xd0\xea\x2c\xf1\x96\xfc\x4e\x6d"
+                         "\x65\x48\xcb\x0a\xda\xf0\x62\xc0"
+                         "\x38\x1d\x3b\x4a\xe9\x7e\x62",
                .alen   = 31,
-               .input  = "\x66\xf3\x75\x7d\x40\xb3\xb4\xd1"
-                         "\x04\xe1\xa6\x94\x10\xe6\x39\x77"
-                         "\xd3\xac\x4d\x8a\x8c\x58\x6e\xfb"
-                         "\x06\x13\x9a\xd9\x5e\xc0\xfa",
-               .ilen   = 31,
-               .result = "\x82\xc0\x56\xf0\xd7\xc4\xc9\xfd"
-                         "\x3c\xd1\x2a\xd4\x15\x86\x9d\xda"
-                         "\xea\x6c\x6f\xa1\x33\xb0\x7a\x01"
-                         "\x57\xe7\xf3\x7b\x73\xe7\x54\x10"
-                         "\xc6\x91\xe2\xc6\xa0\x69\xe7\xe6"
-                         "\x76\xc3\xf5\x3a\x76\xfd\x4a",
-               .rlen   = 47,
+               .ptext  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
+                         "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
+                         "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
+                         "\x68\x28\x73\x40\x9f\x96\x4a",
+               .plen   = 31,
+               .ctext  = "\x29\xc4\xf0\x03\xc1\x86\xdf\x06"
+                         "\x5c\x7b\xef\x64\x87\x00\xd1\x37"
+                         "\xa7\x08\xbc\x7f\x8f\x41\x54\xd0"
+                         "\x3e\xf1\xc3\xa2\x96\x84\xdd\x2a"
+                         "\x2d\x21\x30\xf9\x02\xdb\x06\x0c"
+                         "\xf1\x5a\x66\x69\xe0\xca\x83",
+               .clen   = 47,
        }, {
-               .key    = "\x75\xbc\x04\xe5\x84\x52\x5e\x58"
-                         "\x24\x17\xd2\xb9\x0e\xaf\x6a\xf9"
-                         "\x9e\x5c\xd0\xab\xcd\x00\x4f\x01"
-                         "\x37\x1e\xd1\xcf\x15\xd8\xe2\x86",
-               .klen   = 32,
-               .iv     = "\x84\x85\x92\x4d\xc8\xf1\x08\xdf"
-                         "\x44\x4e\xff\xdd\x0d\x78\x9a\x7a",
-               .assoc  = "\x93\x4e\x21\xb4\x0c\x90\xb3\x66"
-                         "\x65\x84\x2b\x01\x0b\x42\xcb\xfc"
-                         "\x33\xbd\xd6\xed\x50\x50\x10\x0e"
-                         "\x97\x35\x41\xbb\x82\x08\xb1\xf2",
+               .key    = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
+                         "\x10\x57\x85\x39\x93\x8f\xaf\x70",
+               .klen   = 16,
+               .iv     = "\x50\x5d\x9d\x9b\x66\x50\x88\x7b"
+                         "\x30\x8e\xb1\x5e\x92\x58\xe0\xf1",
+               .assoc  = "\x5f\x27\x2b\x03\xaa\xef\x32\x02"
+                         "\x50\xc4\xde\x82\x90\x21\x11\x73"
+                         "\x8f\x0a\xd6\x8f\xdf\x90\xe4\xda"
+                         "\xf9\x4a\x1a\x23\xc3\xdd\x02\x81",
                .alen   = 32,
-               .input  = "\xa2\x17\xaf\x1c\x50\x2e\x5d\xed"
-                         "\x85\xbb\x58\x26\x0a\x0b\xfc\x7d"
-                         "\xfe\x6e\x59\x0e\x91\xf8\xf0\x15"
-                         "\xc8\x40\x78\xb1\x38\x1f\x99\xa7",
-               .ilen   = 32,
-               .result = "\x01\x47\x8e\x6c\xf6\x64\x89\x3a"
-                         "\x71\xce\xe4\xaa\x45\x70\xe6\x84"
-                         "\x62\x48\x08\x64\x86\x6a\xdf\xec"
-                         "\xb4\xa0\xfb\x34\x03\x0c\x19\xf4"
-                         "\x2b\x7b\x36\x73\xec\x54\xa9\x1e"
-                         "\x30\x85\xdb\xe4\xac\xe9\x2c\xca",
-               .rlen   = 48,
+               .ptext  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
+                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
+                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
+                         "\x29\x56\x52\x19\x79\xf5\xe9\x37",
+               .plen   = 32,
+               .ctext  = "\xe2\x2e\x44\xdf\xd3\x60\x6d\xb2"
+                         "\x70\x57\x37\xc5\xc2\x4f\x8d\x14"
+                         "\xc6\xbf\x8b\xec\xf5\x62\x67\xf2"
+                         "\x2f\xa1\xe6\xd6\xa7\xb1\x8c\x54"
+                         "\xe5\x6b\x49\xf9\x6e\x90\xc3\xaa"
+                         "\x7a\x00\x2e\x4d\x7f\x31\x2e\x81",
+               .clen   = 48,
        }, {
-               .key    = "\xb1\xe1\x3e\x84\x94\xcd\x07\x74"
-                         "\xa5\xf2\x84\x4a\x08\xd4\x2c\xff"
-                         "\xc8\x1e\xdb\x2f\xd2\xa0\xd1\x1b"
-                         "\xf8\x4c\xb0\xa8\xef\x37\x81\x5d",
-               .klen   = 32,
-               .iv     = "\xc0\xaa\xcc\xec\xd8\x6c\xb1\xfb"
-                         "\xc5\x28\xb1\x6e\x07\x9d\x5d\x81",
-               .assoc  = "\xd0\x73\x5a\x54\x1d\x0b\x5b\x82"
-                         "\xe5\x5f\xdd\x93\x05\x66\x8e\x02"
-                         "\x5e\x80\xe1\x71\x55\xf0\x92\x28"
-                         "\x59\x62\x20\x94\x5c\x67\x50\xc8"
-                         "\x58",
+               .key    = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
+                         "\x91\x31\x37\xcb\x8d\xb3\x72\x76",
+               .klen   = 16,
+               .iv     = "\x8d\x82\xd6\x3b\x76\xcc\x30\x97"
+                         "\xb1\x68\x63\xef\x8c\x7c\xa3\xf7",
+               .assoc  = "\x9c\x4b\x65\xa2\xba\x6b\xdb\x1e"
+                         "\xd1\x9e\x90\x13\x8a\x45\xd3\x79"
+                         "\xba\xcd\xe2\x13\xe4\x30\x66\xf4"
+                         "\xba\x78\xf9\xfb\x9d\x3c\xa1\x58"
+                         "\x1a",
                .alen   = 33,
-               .input  = "\xdf\x3c\xe9\xbc\x61\xaa\x06\x09"
-                         "\x06\x95\x0a\xb7\x04\x2f\xbe\x84"
-                         "\x28\x30\x64\x92\x96\x98\x72\x2e"
-                         "\x89\x6e\x57\x8a\x13\x7e\x38\x7e"
-                         "\xdb",
-               .ilen   = 33,
-               .result = "\x85\xe0\xf8\x0f\x8e\x49\xe3\x60"
-                         "\xcb\x4a\x54\x94\xcf\xf5\x7e\x34"
-                         "\xe9\xf8\x80\x65\x53\xd0\x72\x70"
-                         "\x4f\x7d\x9d\xd1\x15\x6f\xb9\x2c"
-                         "\xfa\xe8\xdd\xac\x2e\xe1\x3f\x67"
-                         "\x63\x0f\x1a\x59\xb7\x89\xdb\xf4"
-                         "\xc3",
-               .rlen   = 49,
-       }, {
-               .key    = "\xee\x05\x77\x23\xa5\x49\xb0\x90"
-                         "\x26\xcc\x36\xdc\x02\xf8\xef\x05"
-                         "\xf3\xe1\xe7\xb3\xd8\x40\x53\x35"
-                         "\xb9\x79\x8f\x80\xc9\x96\x20\x33",
-               .klen   = 32,
-               .iv     = "\xfd\xce\x06\x8b\xe9\xe8\x5a\x17"
-                         "\x46\x02\x63\x00\x01\xc1\x20\x87",
-               .assoc  = "\x0c\x98\x94\xf3\x2d\x87\x04\x9e"
-                         "\x66\x39\x8f\x24\xff\x8a\x50\x08"
-                         "\x88\x42\xed\xf6\x5a\x90\x14\x42"
-                         "\x1a\x90\xfe\x6c\x36\xc6\xf0\x9f"
-                         "\x66\xa0\xb5\x2d\x2c\xf8\x25\x15"
-                         "\x55\x90\xa2\x7e\x77\x94\x96\x3a"
-                         "\x71\x1c\xf7\x44\xee\xa8\xc3\x42"
-                         "\xe2\xa3\x84\x04\x0b\xe1\xce",
-               .alen   = 63,
-               .input  = "\x1b\x61\x23\x5b\x71\x26\xae\x25"
-                         "\x87\x6f\xbc\x49\xfe\x53\x81\x8a"
-                         "\x53\xf2\x70\x17\x9b\x38\xf4\x48"
-                         "\x4b\x9b\x36\x62\xed\xdd\xd8\x54"
-                         "\xea\xcb\xb6\x79\x45\xfc\xaa\x54"
-                         "\x5c\x94\x47\x58\xa7\xff\x9c\x9e"
-                         "\x7c\xb6\xf1\xac\xc8\xfd\x8b\x35"
-                         "\xd5\xa4\x6a\xd4\x09\xc2\x08",
-               .ilen   = 63,
-               .result = "\x00\xe5\x5b\x87\x5c\x20\x22\x8a"
-                         "\xda\x1f\xd3\xff\xbb\xb2\xb0\xf8"
-                         "\xef\xe9\xeb\x9e\x7c\x80\xf4\x2b"
-                         "\x59\xc0\x79\xbc\x17\xa0\x15\x01"
-                         "\xf5\x72\xfb\x5a\xe7\xaf\x07\xe3"
-                         "\x1b\x49\x21\x34\x23\x63\x55\x5e"
-                         "\xee\x4f\x34\x17\xfa\xfe\xa5\x0c"
-                         "\xed\x0b\x23\xea\x9b\xda\x57\x2f"
-                         "\xf6\xa9\xae\x0d\x4e\x40\x96\x45"
-                         "\x7f\xfa\xf0\xbf\xc4\x98\x78",
-               .rlen   = 79,
-       }, {
-               .key    = "\x2a\x2a\xb1\xc3\xb5\xc5\x59\xac"
-                         "\xa7\xa6\xe8\x6d\xfc\x1d\xb2\x0b"
-                         "\x1d\xa3\xf3\x38\xdd\xe0\xd5\x4e"
-                         "\x7b\xa7\x6e\x58\xa3\xf5\xbf\x0a",
-               .klen   = 32,
-               .iv     = "\x39\xf3\x3f\x2b\xf9\x64\x03\x33"
-                         "\xc7\xdd\x15\x91\xfb\xe6\xe2\x8d",
-               .assoc  = "\x49\xbc\xce\x92\x3d\x02\xad\xba"
-                         "\xe7\x13\x41\xb6\xf9\xaf\x13\x0f"
-                         "\xb2\x04\xf8\x7a\x5f\x30\x96\x5b"
-                         "\xdc\xbd\xdd\x44\x10\x25\x8f\x75"
-                         "\x75\x4d\xb9\x5b\x8e\x0a\x38\x13"
-                         "\x6f\x9f\x36\xe4\x3a\x3e\xac\xc9"
-                         "\x9d\x83\xde\xe5\x57\xfd\xe3\x0e"
-                         "\xb1\xa7\x1b\x44\x05\x67\xb7\x37",
-               .alen   = 64,
-               .input  = "\x58\x85\x5c\xfa\x81\xa1\x57\x40"
-                         "\x08\x4a\x6e\xda\xf8\x78\x44\x90"
-                         "\x7d\xb5\x7b\x9b\xa1\xd8\x76\x62"
-                         "\x0c\xc9\x15\x3b\xc7\x3c\x77\x2b"
-                         "\xf8\x78\xba\xa7\xa6\x0e\xbd\x52"
-                         "\x76\xa3\xdc\xbe\x6b\xa8\xb1\x2d"
-                         "\xa9\x1d\xd8\x4e\x31\x53\xab\x00"
-                         "\xa5\xa7\x01\x13\x04\x49\xf2\x04",
-               .ilen   = 64,
-               .result = "\x28\xdd\xb9\x4a\x12\xc7\x0a\xe1"
-                         "\x58\x06\x1a\x9b\x8c\x67\xdf\xeb"
-                         "\x35\x35\x60\x9d\x06\x40\x65\xc1"
-                         "\x93\xe8\xb3\x82\x50\x29\xdd\xb5"
-                         "\x2b\xcb\xde\x18\x78\x6b\x42\xbe"
-                         "\x6d\x24\xd0\xb2\x7d\xd7\x08\x8f"
-                         "\x4a\x18\x98\xad\x8c\xf2\x97\xb4"
-                         "\xf4\x77\xe4\xbf\x41\x3b\xc4\x06"
-                         "\xce\x9e\x34\x81\xf0\x89\x11\x13"
-                         "\x02\x65\xa1\x7c\xdf\x07\x33\x06",
-               .rlen   = 80,
-       }, {
-               .key    = "\x67\x4f\xeb\x62\xc5\x40\x01\xc7"
-                         "\x28\x80\x9a\xfe\xf6\x41\x74\x12"
-                         "\x48\x65\xfe\xbc\xe2\x80\x57\x68"
-                         "\x3c\xd4\x4d\x31\x7d\x54\x5f\xe1",
-               .klen   = 32,
-               .iv     = "\x76\x18\x79\xca\x09\xdf\xac\x4e"
-                         "\x48\xb7\xc7\x23\xf5\x0a\xa5\x93",
-               .assoc  = "\x85\xe1\x08\x32\x4d\x7e\x56\xd5"
-                         "\x68\xed\xf3\x47\xf3\xd3\xd6\x15"
-                         "\xdd\xc7\x04\xfe\x64\xd0\x18\x75"
-                         "\x9d\xeb\xbc\x1d\xea\x84\x2e\x4c"
-                         "\x83\xf9\xbe\x8a\xef\x1c\x4b\x10"
-                         "\x89\xaf\xcb\x4b\xfe\xe7\xc1\x58"
-                         "\xca\xea\xc6\x87\xc0\x53\x03\xd9"
-                         "\x80\xaa\xb2\x83\xff\xee\xa1\x6a"
-                         "\x04",
-               .alen   = 65,
-               .input  = "\x94\xaa\x96\x9a\x91\x1d\x00\x5c"
-                         "\x88\x24\x20\x6b\xf2\x9c\x06\x96"
-                         "\xa7\x77\x87\x1f\xa6\x78\xf8\x7b"
-                         "\xcd\xf6\xf4\x13\xa1\x9b\x16\x02"
-                         "\x07\x24\xbf\xd5\x08\x20\xd0\x4f"
-                         "\x90\xb3\x70\x24\x2f\x51\xc7\xbb"
-                         "\xd6\x84\xc0\xef\x9a\xa8\xca\xcc"
-                         "\x74\xab\x97\x53\xfe\xd0\xdb\x37"
-                         "\x37\x6a\x0e\x9f\x3f\xa3\x2a\xe3"
-                         "\x1b\x34\x6d\x51\x72\x2b\x17\xe7"
-                         "\x4d\xaa\x2c\x18\xda\xa3\x33\x89"
-                         "\x2a\x9f\xf4\xd2\xed\x76\x3d\x3f"
-                         "\x3c\x15\x9d\x8e\x4f\x3c\x27\xb0"
-                         "\x42\x3f\x2f\x8a\xd4\xc2\x10\xb2"
-                         "\x27\x7f\xe3\x34\x80\x02\x49\x4b"
-                         "\x07\x68\x22\x2a\x88\x25\x53\xb2"
-                         "\x2f",
-               .ilen   = 129,
-               .result = "\x85\x39\x69\x35\xfb\xf9\xb0\xa6"
-                         "\x85\x43\x88\xd0\xd7\x78\x60\x19"
-                         "\x3e\x1f\xb1\xa4\xd6\xc5\x96\xec"
-                         "\xf7\x84\x85\xc7\x27\x0f\x74\x57"
-                         "\x28\x9e\xdd\x90\x3c\x43\x12\xc5"
-                         "\x51\x3d\x39\x8f\xa5\xf4\xe0\x0b"
-                         "\x57\x04\xf1\x6d\xfe\x9b\x84\x27"
-                         "\xe8\xeb\x4d\xda\x02\x0a\xc5\x49"
-                         "\x1a\x55\x5e\x50\x56\x4d\x94\xda"
-                         "\x20\xf8\x12\x54\x50\xb3\x11\xda"
-                         "\xed\x44\x27\x67\xd5\xd1\x8b\x4b"
-                         "\x38\x67\x56\x65\x59\xda\xe6\x97"
-                         "\x81\xae\x2f\x92\x3b\xae\x22\x1c"
-                         "\x91\x59\x38\x18\x00\xe8\xba\x92"
-                         "\x04\x19\x56\xdf\xb0\x82\xeb\x6f"
-                         "\x2e\xdb\x54\x3c\x4b\xbb\x60\x90"
-                         "\x4c\x50\x10\x62\xba\x7a\xb1\x68"
-                         "\x37\xd7\x87\x4e\xe4\x66\x09\x1f"
-                         "\xa5",
-               .rlen   = 145,
-       }, {
-               .key    = "\xa3\x73\x24\x01\xd5\xbc\xaa\xe3"
-                         "\xa9\x5a\x4c\x90\xf0\x65\x37\x18"
-                         "\x72\x28\x0a\x40\xe7\x20\xd9\x82"
-                         "\xfe\x02\x2b\x09\x57\xb3\xfe\xb7",
-               .klen   = 32,
-               .iv     = "\xb3\x3d\xb3\x69\x19\x5b\x54\x6a"
-                         "\xc9\x91\x79\xb4\xef\x2e\x68\x99",
-               .assoc  = "\xc2\x06\x41\xd1\x5d\xfa\xff\xf1"
-                         "\xe9\xc7\xa5\xd9\xed\xf8\x98\x1b"
-                         "\x07\x89\x10\x82\x6a\x70\x9a\x8f"
-                         "\x5e\x19\x9b\xf5\xc5\xe3\xcd\x22"
-                         "\x92\xa5\xc2\xb8\x51\x2e\x5e\x0e"
-                         "\xa4\xbe\x5f\xb1\xc1\x90\xd7\xe7"
-                         "\xf7\x52\xae\x28\x29\xa8\x22\xa4"
-                         "\x4f\xae\x48\xc2\xfa\x75\x8b\x9e"
-                         "\xce\x83\x2a\x88\x07\x55\xbb\x89"
-                         "\xf6\xdf\xac\xdf\x83\x08\xbf\x7d"
-                         "\xac\x30\x8b\x8e\x02\xac\x00\xf1"
-                         "\x30\x46\xe1\xbc\x75\xbf\x49\xbb"
-                         "\x26\x4e\x29\xf0\x2f\x21\xc6\x13"
-                         "\x92\xd9\x3d\x11\xe4\x10\x00\x8e"
-                         "\xd4\xd4\x58\x65\xa6\x2b\xe3\x25"
-                         "\xb1\x8f\x15\x93\xe7\x71\xb9\x2c"
-                         "\x4b",
-               .alen   = 129,
-               .input  = "\xd1\xcf\xd0\x39\xa1\x99\xa9\x78"
-                         "\x09\xfe\xd2\xfd\xec\xc1\xc9\x9d"
-                         "\xd2\x39\x93\xa3\xab\x18\x7a\x95"
-                         "\x8f\x24\xd3\xeb\x7b\xfa\xb5\xd8"
-                         "\x15\xd1\xc3\x04\x69\x32\xe3\x4d"
-                         "\xaa\xc2\x04\x8b\xf2\xfa\xdc\x4a"
-                         "\x02\xeb\xa8\x90\x03\xfd\xea\x97"
-                         "\x43\xaf\x2e\x92\xf8\x57\xc5\x6a"
-                         "\x00",
-               .ilen   = 65,
-               .result = "\x7d\xde\x53\x22\xe4\x23\x3b\x30"
-                         "\x78\xde\x35\x90\x7a\xd9\x0b\x93"
-                         "\xf6\x0e\x0b\xed\x40\xee\x10\x9c"
-                         "\x96\x3a\xd3\x34\xb2\xd0\x67\xcf"
-                         "\x63\x7f\x2d\x0c\xcf\x96\xec\x64"
-                         "\x1a\x87\xcc\x7d\x2c\x5e\x81\x4b"
-                         "\xd2\x8f\x4c\x7c\x00\xb1\xb4\xe0"
-                         "\x87\x4d\xb1\xbc\xd8\x78\x2c\x17"
-                         "\xf2\x3b\xd8\x28\x40\xe2\x76\xf6"
-                         "\x20\x13\x83\x46\xaf\xff\xe3\x0f"
-                         "\x72",
-               .rlen   = 81,
+               .ptext  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
+                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
+                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
+                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
+                         "\x9d\x4d\x54\x51\x84\x61\xf6\x8e"
+                         "\x03\x31\xf2\x25\x16\xcc\xaa\xc6"
+                         "\x75\x73\x20\x30\x59\x54\xb2\xf0"
+                         "\x3a\x4b\xe0\x23\x8e\xa6\x08\x35"
+                         "\x8a",
+               .plen   = 65,
+               .ctext  = "\xc7\xca\x26\x61\x57\xee\xa2\xb9"
+                         "\xb1\x37\xde\x95\x06\x90\x11\x08"
+                         "\x4d\x30\x9f\x24\xc0\x56\xb7\xe1"
+                         "\x0b\x9f\xd2\x57\xe9\xd2\xb1\x76"
+                         "\x56\x9a\xb4\x58\xc5\x08\xfc\xb5"
+                         "\xf2\x31\x9b\xc9\xcd\xb3\x64\xdb"
+                         "\x6f\x50\xbf\xf4\x73\x9d\xfb\x6b"
+                         "\xef\x35\x25\x48\xed\xcf\x29\xa8"
+                         "\xac\xc3\xb9\xcb\x61\x8f\x73\x92"
+                         "\x2c\x7a\x6f\xda\xf9\x09\x6f\xe1"
+                         "\xc4",
+               .clen   = 81,
        }, {
-               .key    = "\xe0\x98\x5e\xa1\xe5\x38\x53\xff"
-                         "\x2a\x35\xfe\x21\xea\x8a\xfa\x1e"
-                         "\x9c\xea\x15\xc5\xec\xc0\x5b\x9b"
-                         "\xbf\x2f\x0a\xe1\x32\x12\x9d\x8e",
-               .klen   = 32,
-               .iv     = "\xef\x61\xed\x08\x29\xd7\xfd\x86"
-                         "\x4a\x6b\x2b\x46\xe9\x53\x2a\xa0",
-               .assoc  = "\xfe\x2a\x7b\x70\x6d\x75\xa7\x0d"
-                         "\x6a\xa2\x57\x6a\xe7\x1c\x5b\x21"
-                         "\x31\x4b\x1b\x07\x6f\x10\x1c\xa8"
-                         "\x20\x46\x7a\xce\x9f\x42\x6d\xf9",
-               .alen   = 32,
-               .input  = "\x0d\xf4\x09\xd8\xb1\x14\x51\x94"
-                         "\x8a\xd8\x84\x8e\xe6\xe5\x8c\xa3"
-                         "\xfc\xfc\x9e\x28\xb0\xb8\xfc\xaf"
-                         "\x50\x52\xb1\xc4\x55\x59\x55\xaf",
-               .ilen   = 32,
-               .result = "\x5a\xcd\x8c\x57\xf2\x6a\xb6\xbe"
-                         "\x53\xc7\xaa\x9a\x60\x74\x9c\xc4"
-                         "\xa2\xc2\xd0\x6d\xe1\x03\x63\xdc"
-                         "\xbb\x51\x7e\x9c\x89\x73\xde\x4e"
-                         "\x24\xf8\x52\x7c\x15\x41\x0e\xba"
-                         "\x69\x0e\x36\x5f\x2f\x22\x8c",
-               .rlen   = 47,
+               .key    = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
+                         "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c",
+               .klen   = 16,
+               .iv     = "\xc9\xa7\x10\xda\x86\x48\xd9\xb3"
+                         "\x32\x42\x15\x80\x85\xa1\x65\xfe",
+               .assoc  = "\xd8\x70\x9f\x42\xca\xe6\x83\x3a"
+                         "\x52\x79\x42\xa5\x84\x6a\x96\x7f"
+                         "\xe4\x8f\xed\x97\xe9\xd0\xe8\x0d"
+                         "\x7c\xa6\xd8\xd4\x77\x9b\x40\x2e"
+                         "\x28\xce\x57\x34\xcd\x6e\x84\x4c"
+                         "\x17\x3c\xe1\xb2\xa8\x0b\xbb\xf1"
+                         "\x96\x41\x0d\x69\xe8\x54\x0a\xc8"
+                         "\x15\x4e\x91\x92\x89\x4b\xb7\x9b"
+                         "\x21",
+               .alen   = 65,
+               .ptext  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
+                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
+                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
+                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
+                         "\xac",
+               .plen   = 33,
+               .ctext  = "\x57\xcd\x3d\x46\xc5\xf9\x68\x3b"
+                         "\x2c\x0f\xb4\x7e\x7b\x64\x3e\x40"
+                         "\xf3\x78\x63\x34\x89\x79\x39\x6b"
+                         "\x61\x64\x4a\x9a\xfa\x70\xa4\xd3"
+                         "\x54\x0b\xea\x05\xa6\x95\x64\xed"
+                         "\x3d\x69\xa2\x0c\x27\x56\x2f\x34"
+                         "\x66",
+               .clen   = 49,
        }, {
-               .key    = "\x1c\xbd\x98\x40\xf5\xb3\xfc\x1b"
-                         "\xaa\x0f\xb0\xb3\xe4\xae\xbc\x24"
-                         "\xc7\xac\x21\x49\xf1\x60\xdd\xb5"
-                         "\x80\x5d\xe9\xba\x0c\x71\x3c\x64",
-               .klen   = 32,
-               .iv     = "\x2c\x86\x26\xa8\x39\x52\xa6\xa2"
-                         "\xcb\x45\xdd\xd7\xe3\x77\xed\xa6",
-               .assoc  = "\x3b\x4f\xb5\x10\x7d\xf1\x50\x29"
-                         "\xeb\x7c\x0a\xfb\xe1\x40\x1e\x27"
-                         "\x5c\x0d\x27\x8b\x74\xb0\x9e\xc2"
-                         "\xe1\x74\x59\xa6\x79\xa1\x0c\xd0",
-               .alen   = 32,
-               .input  = "\x4a\x18\x43\x77\xc1\x90\xfa\xb0"
-                         "\x0b\xb2\x36\x20\xe0\x09\x4e\xa9"
-                         "\x26\xbe\xaa\xac\xb5\x58\x7e\xc8"
-                         "\x11\x7f\x90\x9c\x2f\xb8\xf4\x85",
-               .ilen   = 32,
-               .result = "\x47\xd6\xce\x78\xd6\xbf\x4a\x51"
-                         "\xb8\xda\x92\x3c\xfd\xda\xac\x8e"
-                         "\x8d\x88\xd7\x4d\x90\xe5\xeb\xa1"
-                         "\xab\xd6\x7c\x76\xad\xea\x7d\x76"
-                         "\x53\xee\xb0\xcd\xd0\x02\xbb\x70"
-                         "\x5b\x6f\x7b\xe2\x8c\xe8",
-               .rlen   = 46,
+               .key    = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
+                         "\x93\xe6\x9b\xee\x81\xfc\xf7\x82",
+               .klen   = 16,
+               .iv     = "\x06\xcc\x4a\x79\x96\xc3\x82\xcf"
+                         "\xb3\x1c\xc7\x12\x7f\xc5\x28\x04",
+               .assoc  = "\x15\x95\xd8\xe1\xda\x62\x2c\x56"
+                         "\xd3\x53\xf4\x36\x7e\x8e\x59\x85",
+               .alen   = 16,
+               .ptext  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
+                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07",
+               .plen   = 16,
+               .ctext  = "\xfc\x85\x06\x28\x8f\xe8\x23\x1f"
+                         "\x33\x98\x87\xde\x08\xb6\xb6\xae"
+                         "\x3e\xa4\xf8\x19\xf1\x92\x60\x39"
+                         "\xb9\x6b\x3f\xdf\xc8\xcb\x30",
+               .clen   = 31,
        }, {
-               .key    = "\x59\xe1\xd2\xdf\x05\x2f\xa4\x37"
-                         "\x2b\xe9\x63\x44\xde\xd3\x7f\x2b"
-                         "\xf1\x6f\x2d\xcd\xf6\x00\x5f\xcf"
-                         "\x42\x8a\xc8\x92\xe6\xd0\xdc\x3b",
-               .klen   = 32,
-               .iv     = "\x68\xab\x60\x47\x49\xce\x4f\xbe"
-                         "\x4c\x20\x8f\x68\xdd\x9c\xb0\xac",
-               .assoc  = "\x77\x74\xee\xaf\x8d\x6d\xf9\x45"
-                         "\x6c\x56\xbc\x8d\xdb\x65\xe0\x2e"
-                         "\x86\xd0\x32\x0f\x79\x50\x20\xdb"
-                         "\xa2\xa1\x37\x7e\x53\x00\xab\xa6",
-               .alen   = 32,
-               .input  = "\x86\x3d\x7d\x17\xd1\x0c\xa3\xcc"
-                         "\x8c\x8d\xe8\xb1\xda\x2e\x11\xaf"
-                         "\x51\x80\xb5\x30\xba\xf8\x00\xe2"
-                         "\xd3\xad\x6f\x75\x09\x18\x93\x5c",
-               .ilen   = 32,
-               .result = "\x9f\xa9\x2b\xa4\x8f\x00\x05\x2b"
-                         "\xe7\x68\x81\x51\xbb\xfb\xdf\x60"
-                         "\xbb\xac\xe8\xc1\xdc\x68\xae\x68"
-                         "\x3a\xcd\x7a\x06\x49\xfe\x80\x11"
-                         "\xe6\x61\x99\xe2\xdd\xbe\x2c\xbf",
-               .rlen   = 40,
+               .key    = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
+                         "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
+               .klen   = 16,
+               .iv     = "\x42\xf0\x84\x19\xa6\x3f\x2b\xea"
+                         "\x34\xf6\x79\xa3\x79\xe9\xeb\x0a",
+               .assoc  = "\x51\xb9\x12\x80\xea\xde\xd5\x71"
+                         "\x54\x2d\xa6\xc8\x78\xb2\x1b\x8c",
+               .alen   = 16,
+               .ptext  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
+                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d",
+               .plen   = 16,
+               .ctext  = "\x74\x7d\x70\x07\xe9\xba\x01\xee"
+                         "\x6c\xc6\x6f\x50\x25\x33\xbe\x50"
+                         "\x17\xb8\x17\x62\xed\x80\xa2\xf5"
+                         "\x03\xde\x85\x71\x5d\x34",
+               .clen   = 30,
        }, {
-               .key    = "\x96\x06\x0b\x7f\x15\xab\x4d\x53"
-                         "\xac\xc3\x15\xd6\xd8\xf7\x42\x31"
-                         "\x1b\x31\x38\x51\xfc\xa0\xe1\xe8"
-                         "\x03\xb8\xa7\x6b\xc0\x2f\x7b\x11",
-               .klen   = 32,
-               .iv     = "\xa5\xcf\x9a\xe6\x59\x4a\xf7\xd9"
-                         "\xcd\xfa\x41\xfa\xd7\xc0\x72\xb2",
-               .assoc  = "\xb4\x99\x28\x4e\x9d\xe8\xa2\x60"
-                         "\xed\x30\x6e\x1e\xd5\x89\xa3\x34"
-                         "\xb1\x92\x3e\x93\x7e\xf0\xa2\xf5"
-                         "\x64\xcf\x16\x57\x2d\x5f\x4a\x7d",
-               .alen   = 32,
-               .input  = "\xc3\x62\xb7\xb6\xe2\x87\x4c\xe7"
-                         "\x0d\x67\x9a\x43\xd4\x52\xd4\xb5"
-                         "\x7b\x43\xc1\xb5\xbf\x98\x82\xfc"
-                         "\x94\xda\x4e\x4d\xe4\x77\x32\x32",
-               .ilen   = 32,
-               .result = "\xe2\x34\xfa\x25\xfd\xfb\x89\x5e"
-                         "\x5b\x4e\x0b\x15\x6e\x39\xfb\x0c"
-                         "\x73\xc7\xd9\x6b\xbe\xce\x9b\x70"
-                         "\xc7\x4f\x96\x16\x03\xfc\xea\xfb"
-                         "\x56",
-               .rlen   = 33,
+               .key    = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
+                         "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
+               .klen   = 16,
+               .iv     = "\x7f\x15\xbd\xb8\xb6\xba\xd3\x06"
+                         "\xb5\xd1\x2b\x35\x73\x0e\xad\x10",
+               .assoc  = "\x8e\xde\x4c\x20\xfa\x59\x7e\x8d"
+                         "\xd5\x07\x58\x59\x72\xd7\xde\x92",
+               .alen   = 16,
+               .ptext  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
+                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13",
+               .plen   = 16,
+               .ctext  = "\xf4\xb3\x85\xf9\xac\xde\xb1\x38"
+                         "\x29\xfd\x6c\x7c\x49\xe5\x1d\xaf"
+                         "\xba\xea\xd4\xfa\x3f\x11\x33\x98",
+               .clen   = 24,
+       }, {
+               .key    = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
+                         "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
+               .klen   = 16,
+               .iv     = "\xbb\x3a\xf7\x57\xc6\x36\x7c\x22"
+                         "\x36\xab\xde\xc6\x6d\x32\x70\x17",
+               .assoc  = "\xcb\x03\x85\xbf\x0a\xd5\x26\xa9"
+                         "\x56\xe1\x0a\xeb\x6c\xfb\xa1\x98",
+               .alen   = 16,
+               .ptext  = "\xda\xcc\x14\x27\x4e\x74\xd1\x30"
+                         "\x76\x18\x37\x0f\x6a\xc4\xd1\x1a",
+               .plen   = 16,
+               .ctext  = "\xe6\x5c\x49\x4f\x78\xf3\x62\x86"
+                         "\xe1\xb7\xa5\xc3\x32\x88\x3c\x8c"
+                         "\x6e",
+               .clen   = 17,
        },
 };
 
-static const struct aead_testvec morus1280_dec_tv_template[] = {
+/*
+ * MORUS-1280 test vectors - generated via reference implementation from
+ * SUPERCOP (https://bench.cr.yp.to/supercop.html):
+ *
+ *   https://bench.cr.yp.to/supercop/supercop-20170228.tar.xz
+ *   (see crypto_aead/morus1280128v2/ and crypto_aead/morus1280256v2/ )
+ */
+static const struct aead_testvec morus1280_tv_template[] = {
        {
                .key    = "\x00\x00\x00\x00\x00\x00\x00\x00"
                          "\x00\x00\x00\x00\x00\x00\x00\x00",
@@ -26031,11 +20833,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x20\x36\x2c\x24\xfe\xc9\x30\x81",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x91\x85\x0f\xf5\x52\x9e\xce\xce"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x91\x85\x0f\xf5\x52\x9e\xce\xce"
                          "\x65\x99\xc7\xbf\xd3\x76\xe8\x98",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x3c\x24\x39\x9f\x10\x7b\xa8\x1b"
                          "\x80\xda\xb2\x91\xf9\x24\xc2\x06",
@@ -26044,12 +20846,12 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xa1\x10\xde\xb5\xf8\xed\xf3\x87",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x88\xc3\x4c\xf0\x2f\x43\x76\x13"
+               .ptext  = "\x69",
+               .plen   = 1,
+               .ctext  = "\x88\xc3\x4c\xf0\x2f\x43\x76\x13"
                          "\x96\xda\x76\x34\x33\x4e\xd5\x39"
                          "\x73",
-               .ilen   = 17,
-               .result = "\x69",
-               .rlen   = 1,
+               .clen   = 17,
        }, {
                .key    = "\x79\x49\x73\x3e\x20\xf7\x51\x37"
                          "\x01\xb4\x64\x22\xf3\x48\x85\x0c",
@@ -26058,18 +20860,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x22\xea\x90\x47\xf2\x11\xb5\x8e",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x3e\x5c\x3b\x58\x3b\x7d\x2a\x22"
+               .ptext  = "\xa6\xa4\x1e\x76\xec\xd4\x50\xcc"
+                         "\x62\x58\xe9\x8f\xef\xa4\x17\x91"
+                         "\xb4\x96\x9f\x6b\xce\x38\xa5\x46"
+                         "\x13\x7d\x64\x93\xd7\x05\xf5",
+               .plen   = 31,
+               .ctext  = "\x3e\x5c\x3b\x58\x3b\x7d\x2a\x22"
                          "\x75\x0b\x24\xa6\x0e\xc3\xde\x52"
                          "\x97\x0b\x64\xd4\xce\x90\x52\xf7"
                          "\xef\xdb\x6a\x38\xd2\xa8\xa1\x0d"
                          "\xe0\x61\x33\x24\xc6\x4d\x51\xbc"
                          "\xa4\x21\x74\xcf\x19\x16\x59",
-               .ilen   = 47,
-               .result = "\xa6\xa4\x1e\x76\xec\xd4\x50\xcc"
-                         "\x62\x58\xe9\x8f\xef\xa4\x17\x91"
-                         "\xb4\x96\x9f\x6b\xce\x38\xa5\x46"
-                         "\x13\x7d\x64\x93\xd7\x05\xf5",
-               .rlen   = 31,
+               .clen   = 47,
        }, {
                .key    = "\xb5\x6e\xad\xdd\x30\x72\xfa\x53"
                          "\x82\x8e\x16\xb4\xed\x6d\x47\x12",
@@ -26078,18 +20880,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xa2\xc5\x42\xd8\xec\x36\x78\x94",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x30\x82\x9c\x2b\x67\xcb\xf9\x1f"
+               .ptext  = "\xe2\xc9\x58\x15\xfc\x4f\xf8\xe8"
+                         "\xe3\x32\x9b\x21\xe9\xc8\xd9\x97"
+                         "\xde\x58\xab\xf0\xd3\xd8\x27\x60"
+                         "\xd5\xaa\x43\x6b\xb1\x64\x95\xa4",
+               .plen   = 32,
+               .ctext  = "\x30\x82\x9c\x2b\x67\xcb\xf9\x1f"
                          "\xde\x9f\x77\xb2\xda\x92\x61\x5c"
                          "\x09\x0b\x2d\x9a\x26\xaa\x1c\x06"
                          "\xab\x74\xb7\x2b\x95\x5f\x9f\xa1"
                          "\x9a\xff\x50\xa0\xa2\xff\xc5\xad"
                          "\x21\x8e\x84\x5c\x12\x61\xb2\xae",
-               .ilen   = 48,
-               .result = "\xe2\xc9\x58\x15\xfc\x4f\xf8\xe8"
-                         "\xe3\x32\x9b\x21\xe9\xc8\xd9\x97"
-                         "\xde\x58\xab\xf0\xd3\xd8\x27\x60"
-                         "\xd5\xaa\x43\x6b\xb1\x64\x95\xa4",
-               .rlen   = 32,
+               .clen   = 48,
        }, {
                .key    = "\xf2\x92\xe6\x7d\x40\xee\xa3\x6f"
                          "\x03\x68\xc8\x45\xe7\x91\x0a\x18",
@@ -26098,20 +20900,20 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x23\x9f\xf4\x6a\xe6\x5a\x3b\x9a",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x67\x5d\x8e\x45\xc8\x39\xf5\x17"
+               .ptext  = "\x1f\xee\x92\xb4\x0c\xcb\xa1\x04"
+                         "\x64\x0c\x4d\xb2\xe3\xec\x9c\x9d"
+                         "\x09\x1a\xb7\x74\xd8\x78\xa9\x79"
+                         "\x96\xd8\x22\x43\x8c\xc3\x34\x7b"
+                         "\xc4",
+               .plen   = 33,
+               .ctext  = "\x67\x5d\x8e\x45\xc8\x39\xf5\x17"
                          "\xc1\x1d\x2a\xdd\x88\x67\xda\x1f"
                          "\x6d\xe8\x37\x28\x5a\xc1\x5e\x9f"
                          "\xa6\xec\xc6\x92\x05\x4b\xc0\xa3"
                          "\x63\xef\x88\xa4\x9b\x0a\x5c\xed"
                          "\x2b\x6a\xac\x63\x52\xaa\x10\x94"
                          "\xd0",
-               .ilen   = 49,
-               .result = "\x1f\xee\x92\xb4\x0c\xcb\xa1\x04"
-                         "\x64\x0c\x4d\xb2\xe3\xec\x9c\x9d"
-                         "\x09\x1a\xb7\x74\xd8\x78\xa9\x79"
-                         "\x96\xd8\x22\x43\x8c\xc3\x34\x7b"
-                         "\xc4",
-               .rlen   = 33,
+               .clen   = 49,
        }, {
                .key    = "\x2e\xb7\x20\x1c\x50\x6a\x4b\x8b"
                          "\x84\x42\x7a\xd7\xe1\xb5\xcd\x1f",
@@ -26120,7 +20922,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xa4\x79\xa6\xfb\xe0\x7f\xfd\xa0",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x7d\x61\x1a\x35\x20\xcc\x07\x88"
+               .ptext  = "\x5c\x13\xcb\x54\x1c\x47\x4a\x1f"
+                         "\xe5\xe6\xff\x44\xdd\x11\x5f\xa3"
+                         "\x33\xdd\xc2\xf8\xdd\x18\x2b\x93"
+                         "\x57\x05\x01\x1c\x66\x22\xd3\x51"
+                         "\xd3\xdf\x18\xc9\x30\x66\xed\xb1"
+                         "\x96\x58\xd5\x8c\x64\x8c\x7c\xf5"
+                         "\x01\xd0\x74\x5f\x9b\xaa\xf6\xd1"
+                         "\xe6\x16\xa2\xac\xde\x47\x40",
+               .plen   = 63,
+               .ctext  = "\x7d\x61\x1a\x35\x20\xcc\x07\x88"
                          "\x03\x98\x87\xcf\xc0\x6e\x4d\x19"
                          "\xe3\xd4\x0b\xfb\x29\x8f\x49\x1a"
                          "\x3a\x06\x77\xce\x71\x2c\xcd\xdd"
@@ -26130,16 +20941,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xdf\x5b\x0f\xbd\x8a\x88\x78\xc9"
                          "\xe5\x81\x37\xde\x84\x7a\xf6\x84"
                          "\x99\x7a\x72\x9c\x54\x31\xa1",
-               .ilen   = 79,
-               .result = "\x5c\x13\xcb\x54\x1c\x47\x4a\x1f"
-                         "\xe5\xe6\xff\x44\xdd\x11\x5f\xa3"
-                         "\x33\xdd\xc2\xf8\xdd\x18\x2b\x93"
-                         "\x57\x05\x01\x1c\x66\x22\xd3\x51"
-                         "\xd3\xdf\x18\xc9\x30\x66\xed\xb1"
-                         "\x96\x58\xd5\x8c\x64\x8c\x7c\xf5"
-                         "\x01\xd0\x74\x5f\x9b\xaa\xf6\xd1"
-                         "\xe6\x16\xa2\xac\xde\x47\x40",
-               .rlen   = 63,
+               .clen   = 79,
        }, {
                .key    = "\x6b\xdc\x5a\xbb\x60\xe5\xf4\xa6"
                          "\x05\x1d\x2c\x68\xdb\xda\x8f\x25",
@@ -26148,7 +20950,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x25\x53\x58\x8c\xda\xa3\xc0\xa6",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x05\xc5\xb1\xf9\x1b\xb9\xab\x2c"
+               .ptext  = "\x98\x37\x05\xf3\x2c\xc2\xf3\x3b"
+                         "\x66\xc0\xb1\xd5\xd7\x35\x21\xaa"
+                         "\x5d\x9f\xce\x7c\xe2\xb8\xad\xad"
+                         "\x19\x33\xe0\xf4\x40\x81\x72\x28"
+                         "\xe1\x8b\x1c\xf8\x91\x78\xff\xaf"
+                         "\xb0\x68\x69\xf2\x27\x35\x91\x84"
+                         "\x2e\x37\x5b\x00\x04\xff\x16\x9c"
+                         "\xb5\x19\x39\xeb\xd9\xcd\x29\x9a",
+               .plen   = 64,
+               .ctext  = "\x05\xc5\xb1\xf9\x1b\xb9\xab\x2c"
                          "\xa5\x07\x12\xa7\x12\x39\x60\x66"
                          "\x30\x81\x4a\x03\x78\x28\x45\x52"
                          "\xd2\x2b\x24\xfd\x8b\xa5\xb7\x66"
@@ -26158,16 +20969,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xeb\x71\x40\xc9\x2c\x40\x45\x6d"
                          "\x73\x77\x01\xf3\x4f\xf3\x9d\x2a"
                          "\x5d\x57\xa8\xa1\x18\xa2\xad\xcb",
-               .ilen   = 80,
-               .result = "\x98\x37\x05\xf3\x2c\xc2\xf3\x3b"
-                         "\x66\xc0\xb1\xd5\xd7\x35\x21\xaa"
-                         "\x5d\x9f\xce\x7c\xe2\xb8\xad\xad"
-                         "\x19\x33\xe0\xf4\x40\x81\x72\x28"
-                         "\xe1\x8b\x1c\xf8\x91\x78\xff\xaf"
-                         "\xb0\x68\x69\xf2\x27\x35\x91\x84"
-                         "\x2e\x37\x5b\x00\x04\xff\x16\x9c"
-                         "\xb5\x19\x39\xeb\xd9\xcd\x29\x9a",
-               .rlen   = 64,
+               .clen   = 80,
        }, {
                .key    = "\xa7\x00\x93\x5b\x70\x61\x9d\xc2"
                          "\x86\xf7\xde\xfa\xd5\xfe\x52\x2b",
@@ -26176,11 +20978,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xa6\x2d\x0a\x1e\xd4\xc7\x83\xad",
                .assoc  = "\xc5",
                .alen   = 1,
-               .input  = "\x4d\xbf\x11\xac\x7f\x97\x0b\x2e"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x4d\xbf\x11\xac\x7f\x97\x0b\x2e"
                          "\x89\x3b\x9d\x0f\x83\x1c\x08\xc3",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\xe4\x25\xcd\xfa\x80\xdd\x46\xde"
                          "\x07\xd1\x90\x8b\xcf\x23\x15\x31",
@@ -26192,11 +20994,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xe8\x73\x62\x64\xab\x50\xd0\xda"
                          "\x6b\x83\x66\xaf\x3e\x27\xc9",
                .alen   = 31,
-               .input  = "\x5b\xc0\x8d\x54\xe4\xec\xbe\x38"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x5b\xc0\x8d\x54\xe4\xec\xbe\x38"
                          "\x03\x12\xf9\xcc\x9e\x46\x42\x92",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x20\x4a\x07\x99\x91\x58\xee\xfa"
                          "\x88\xab\x42\x1c\xc9\x47\xd7\x38",
@@ -26208,11 +21010,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x12\x35\x6e\xe8\xb0\xf0\x52\xf3"
                          "\x2d\xb0\x45\x87\x18\x86\x68\xf6",
                .alen   = 32,
-               .input  = "\x48\xc5\xc3\x4c\x40\x2e\x2f\xc2"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x48\xc5\xc3\x4c\x40\x2e\x2f\xc2"
                          "\x6d\x65\xe0\x67\x9c\x1d\xa0\xf0",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x5d\x6f\x41\x39\xa1\xd4\x97\x16"
                          "\x09\x85\xf4\xae\xc3\x6b\x9a\x3e",
@@ -26225,11 +21027,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xee\xde\x23\x60\xf2\xe5\x08\xcc"
                          "\x97",
                .alen   = 33,
-               .input  = "\x28\x64\x78\x51\x55\xd8\x56\x4a"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x28\x64\x78\x51\x55\xd8\x56\x4a"
                          "\x58\x3e\xf7\xbe\xee\x21\xfe\x94",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x99\x93\x7a\xd8\xb1\x50\x40\x31"
                          "\x8a\x60\xa6\x3f\xbd\x90\x5d\x44",
@@ -26245,11 +21047,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x03\xa1\xe8\xbe\x37\x54\xec\xa2"
                          "\xcd\x2c\x45\x58\xbd\x8e\x80",
                .alen   = 63,
-               .input  = "\xb3\xa6\x00\x4e\x09\x20\xac\x21"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xb3\xa6\x00\x4e\x09\x20\xac\x21"
                          "\x77\x72\x69\x76\x2d\x36\xe5\xc8",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\xd6\xb8\xb4\x77\xc1\xcb\xe9\x4d"
                          "\x0a\x3a\x58\xd1\xb7\xb4\x1f\x4a",
@@ -26265,11 +21067,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x30\x08\xd0\x5f\xa0\xaa\x0c\x6d"
                          "\x9c\x2f\xdb\x97\xb8\x15\x69\x01",
                .alen   = 64,
-               .input  = "\x65\x33\x7b\xa1\x63\xf4\x20\xdd"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x65\x33\x7b\xa1\x63\xf4\x20\xdd"
                          "\xe4\xb9\x4a\xaa\x9a\x21\xaa\x14",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x12\xdd\xee\x17\xd1\x47\x92\x69"
                          "\x8b\x14\x0a\x62\xb1\xd9\xe2\x50",
@@ -26278,12 +21080,12 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xac\x4b\x37\x86\xb0\xa2\x13\xd2",
                .assoc  = "\x31",
                .alen   = 1,
-               .input  = "\x1d\x47\x17\x34\x86\xf5\x54\x1a"
+               .ptext  = "\x40",
+               .plen   = 1,
+               .ctext  = "\x1d\x47\x17\x34\x86\xf5\x54\x1a"
                          "\x6d\x28\xb8\x5d\x6c\xcf\xa0\xb9"
                          "\xbf",
-               .ilen   = 17,
-               .result = "\x40",
-               .rlen   = 1,
+               .clen   = 17,
        }, {
                .key    = "\x4f\x01\x27\xb6\xe1\xc3\x3a\x85"
                          "\x0c\xee\xbc\xf4\xab\xfd\xa5\x57",
@@ -26295,18 +21097,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xe6\x01\xa8\x7e\xca\x10\xdc\x73"
                          "\xf4\x94\x9f\xc1\x5a\x61\x85",
                .alen   = 31,
-               .input  = "\x78\x90\x52\xae\x0f\xf7\x2e\xef"
+               .ptext  = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
+                         "\x6d\x92\x42\x61\xa7\x58\x37\xdb"
+                         "\xb0\xb2\x2b\x9f\x0b\xb8\xbd\x7a"
+                         "\x24\xa0\xd6\xb7\x11\x79\x6c",
+               .plen   = 31,
+               .ctext  = "\x78\x90\x52\xae\x0f\xf7\x2e\xef"
                          "\x63\x09\x08\x58\xb5\x56\xbd\x72"
                          "\x6e\x42\xcf\x27\x04\x7c\xdb\x92"
                          "\x18\xe9\xa4\x33\x90\xba\x62\xb5"
                          "\x70\xd3\x88\x9b\x4f\x05\xa7\x51"
                          "\x85\x87\x17\x09\x42\xed\x4e",
-               .ilen   = 47,
-               .result = "\x7c\x5d\xd3\xee\xad\x9f\x39\x1a"
-                         "\x6d\x92\x42\x61\xa7\x58\x37\xdb"
-                         "\xb0\xb2\x2b\x9f\x0b\xb8\xbd\x7a"
-                         "\x24\xa0\xd6\xb7\x11\x79\x6c",
-               .rlen   = 31,
+               .clen   = 47,
        }, {
                .key    = "\x8b\x26\x61\x55\xf1\x3e\xe3\xa1"
                          "\x8d\xc8\x6e\x85\xa5\x21\x67\x5d",
@@ -26318,18 +21120,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x10\xc3\xb3\x02\xcf\xb0\x5e\x8d"
                          "\xb5\xc2\x7e\x9a\x35\xc0\x24\xfd",
                .alen   = 32,
-               .input  = "\x1d\x2c\x57\xe0\x50\x38\x3d\x41"
+               .ptext  = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
+                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2"
+                         "\xdb\x74\x36\x23\x11\x58\x3f\x93"
+                         "\xe5\xcd\xb5\x90\xeb\xd8\x0c\xb3",
+               .plen   = 32,
+               .ctext  = "\x1d\x2c\x57\xe0\x50\x38\x3d\x41"
                          "\x2e\x71\xc8\x3b\x92\x43\x58\xaf"
                          "\x5a\xfb\xad\x8f\xd9\xd5\x8a\x5e"
                          "\xdb\xf3\xcd\x3a\x2b\xe1\x2c\x1a"
                          "\xb0\xed\xe3\x0c\x6e\xf9\xf2\xd6"
                          "\x90\xe6\xb1\x0e\xa5\x8a\xac\xb7",
-               .ilen   = 48,
-               .result = "\xb9\x82\x0c\x8d\xbd\x1b\xe2\x36"
-                         "\xee\x6c\xf4\xf2\xa1\x7d\xf9\xe2"
-                         "\xdb\x74\x36\x23\x11\x58\x3f\x93"
-                         "\xe5\xcd\xb5\x90\xeb\xd8\x0c\xb3",
-               .rlen   = 32,
+               .clen   = 48,
        }, {
                .key    = "\xc8\x4b\x9b\xf5\x01\xba\x8c\xbd"
                          "\x0e\xa3\x21\x16\x9f\x46\x2a\x63",
@@ -26342,20 +21144,20 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x76\xef\x5c\x72\x0f\x1f\xc3\xd4"
                          "\xee",
                .alen   = 33,
-               .input  = "\x59\x10\x84\x1c\x83\x4c\x8b\xfc"
+               .ptext  = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
+                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
+                         "\x05\x36\x42\xa7\x16\xf8\xc1\xad"
+                         "\xa7\xfb\x94\x68\xc5\x37\xab\x8a"
+                         "\x72",
+               .plen   = 33,
+               .ctext  = "\x59\x10\x84\x1c\x83\x4c\x8b\xfc"
                          "\xfd\x2e\x4b\x46\x84\xff\x78\x4e"
                          "\x50\xda\x5c\xb9\x61\x1d\xf5\xb9"
                          "\xfe\xbb\x7f\xae\x8c\xc1\x24\xbd"
                          "\x8c\x6f\x1f\x9b\xce\xc6\xc1\x37"
                          "\x08\x06\x5a\xe5\x96\x10\x95\xc2"
                          "\x5e",
-               .ilen   = 49,
-               .result = "\xf5\xa6\x46\x2c\xce\x97\x8a\x51"
-                         "\x6f\x46\xa6\x83\x9b\xa1\xbc\xe8"
-                         "\x05\x36\x42\xa7\x16\xf8\xc1\xad"
-                         "\xa7\xfb\x94\x68\xc5\x37\xab\x8a"
-                         "\x72",
-               .rlen   = 33,
+               .clen   = 49,
        }, {
                .key    = "\x05\x70\xd5\x94\x12\x36\x35\xd8"
                          "\x8f\x7d\xd3\xa8\x99\x6a\xed\x69",
@@ -26371,18 +21173,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x10\x0b\x56\x85\xad\x54\xaa\x66"
                          "\xa8\x43\xcd\xd4\x9b\xb7\xfa",
                .alen   = 63,
-               .input  = "\x9a\x12\xbc\xdf\x72\xa8\x56\x22"
-                         "\x49\x2d\x07\x92\xfc\x3d\x6d\x5f"
-                         "\xef\x36\x19\xae\x91\xfa\xd6\x63"
-                         "\x46\xea\x8a\x39\x14\x21\xa6\x37"
-                         "\x18\xfc\x97\x3e\x16\xa5\x4d\x39"
-                         "\x45\x2e\x69\xcc\x9c\x5f\xdf\x6d"
-                         "\x5e\xa2\xbf\xac\x83\x32\x72\x52"
-                         "\x58\x58\x23\x40\xfd\xa5\xc2\xe6"
-                         "\xe9\x5a\x50\x98\x00\x58\xc9\x86"
-                         "\x4f\x20\x37\xdb\x7b\x22\xa3",
-               .ilen   = 79,
-               .result = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
+               .ptext  = "\x32\xcb\x80\xcc\xde\x12\x33\x6d"
                          "\xf0\x20\x58\x15\x95\xc6\x7f\xee"
                          "\x2f\xf9\x4e\x2c\x1b\x98\x43\xc7"
                          "\x68\x28\x73\x40\x9f\x96\x4a\x60"
@@ -26390,7 +21181,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xcf\x12\xc9\x59\x8f\x7a\x7f\xa8"
                          "\x1b\xa5\x50\xed\x87\xa9\x72\x59"
                          "\x9c\x44\xb2\xa4\x99\x98\x34",
-               .rlen   = 63,
+               .plen   = 63,
+               .ctext  = "\x9a\x12\xbc\xdf\x72\xa8\x56\x22"
+                         "\x49\x2d\x07\x92\xfc\x3d\x6d\x5f"
+                         "\xef\x36\x19\xae\x91\xfa\xd6\x63"
+                         "\x46\xea\x8a\x39\x14\x21\xa6\x37"
+                         "\x18\xfc\x97\x3e\x16\xa5\x4d\x39"
+                         "\x45\x2e\x69\xcc\x9c\x5f\xdf\x6d"
+                         "\x5e\xa2\xbf\xac\x83\x32\x72\x52"
+                         "\x58\x58\x23\x40\xfd\xa5\xc2\xe6"
+                         "\xe9\x5a\x50\x98\x00\x58\xc9\x86"
+                         "\x4f\x20\x37\xdb\x7b\x22\xa3",
+               .clen   = 79,
        }, {
                .key    = "\x41\x94\x0e\x33\x22\xb1\xdd\xf4"
                          "\x10\x57\x85\x39\x93\x8f\xaf\x70",
@@ -26406,7 +21208,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x3d\x72\x3e\x26\x16\xa9\xca\x32"
                          "\x77\x47\x63\x14\x95\x3d\xe4\x34",
                .alen   = 64,
-               .input  = "\xe6\xeb\x92\x5a\x5b\xf0\x2d\xbb"
+               .ptext  = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
+                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
+                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
+                         "\x29\x56\x52\x19\x79\xf5\xe9\x37"
+                         "\x8f\xa1\x50\x23\x22\x4f\xe3\x91"
+                         "\xe9\x21\x5e\xbf\x52\x23\x95\x37"
+                         "\x48\x0c\x38\x8f\xf0\xff\x92\x24"
+                         "\x6b\x47\x49\xe3\x94\x1f\x1e\x01",
+               .plen   = 64,
+               .ctext  = "\xe6\xeb\x92\x5a\x5b\xf0\x2d\xbb"
                          "\x23\xec\x35\xe3\xae\xc9\xfb\x0b"
                          "\x90\x14\x46\xeb\xa8\x8d\xb0\x9b"
                          "\x39\xda\x8b\x48\xec\xb2\x00\x4e"
@@ -26416,16 +21227,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xec\x99\x7d\x61\xb3\x15\x93\xed"
                          "\x83\x1e\xd9\x48\x84\x0b\x37\xfe"
                          "\x95\x74\x44\xd5\x54\xa6\x27\x06",
-               .ilen   = 80,
-               .result = "\x6e\xf0\xba\x6b\xee\x8e\xdc\x89"
-                         "\x71\xfb\x0a\xa6\x8f\xea\x41\xf4"
-                         "\x5a\xbb\x59\xb0\x20\x38\xc5\xe0"
-                         "\x29\x56\x52\x19\x79\xf5\xe9\x37"
-                         "\x8f\xa1\x50\x23\x22\x4f\xe3\x91"
-                         "\xe9\x21\x5e\xbf\x52\x23\x95\x37"
-                         "\x48\x0c\x38\x8f\xf0\xff\x92\x24"
-                         "\x6b\x47\x49\xe3\x94\x1f\x1e\x01",
-               .rlen   = 64,
+               .clen   = 80,
        }, {
                .key    = "\x7e\xb9\x48\xd3\x32\x2d\x86\x10"
                          "\x91\x31\x37\xcb\x8d\xb3\x72\x76",
@@ -26442,7 +21244,25 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x46\x4a\xfa\x53\x8f\xc4\xcd\x68"
                          "\x58",
                .alen   = 65,
-               .input  = "\x89\x24\x27\x86\xdc\xd7\x6b\xd9"
+               .ptext  = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
+                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
+                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
+                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
+                         "\x9d\x4d\x54\x51\x84\x61\xf6\x8e"
+                         "\x03\x31\xf2\x25\x16\xcc\xaa\xc6"
+                         "\x75\x73\x20\x30\x59\x54\xb2\xf0"
+                         "\x3a\x4b\xe0\x23\x8e\xa6\x08\x35"
+                         "\x8a\xdf\x27\xa0\xe4\x60\x99\xae"
+                         "\x8e\x43\xd9\x39\x7b\x10\x40\x67"
+                         "\x5c\x7e\xc9\x70\x63\x34\xca\x59"
+                         "\xfe\x86\xbc\xb7\x9c\x39\xf3\x6d"
+                         "\x6a\x41\x64\x6f\x16\x7f\x65\x7e"
+                         "\x89\x84\x68\xeb\xb0\x51\xbe\x55"
+                         "\x33\x16\x59\x6c\x3b\xef\x88\xad"
+                         "\x2f\xab\xbc\x25\x76\x87\x41\x2f"
+                         "\x36",
+               .plen   = 129,
+               .ctext  = "\x89\x24\x27\x86\xdc\xd7\x6b\xd9"
                          "\xd1\xcd\xdc\x16\xdd\x2c\xc1\xfb"
                          "\x52\xb5\xb3\xab\x50\x99\x3f\xa0"
                          "\x38\xa4\x74\xa5\x04\x15\x63\x05"
@@ -26461,25 +21281,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xed\xed\x35\xe8\x83\xa5\xec\x25"
                          "\x6b\xff\x5f\x1a\x09\x96\x3d\xdc"
                          "\x20",
-               .ilen   = 145,
-               .result = "\xab\x14\xf3\x0a\xfe\x0a\x85\xa5"
-                         "\xf2\xd5\xbc\x38\x89\x0e\x04\xfb"
-                         "\x84\x7d\x65\x34\x25\xd8\x47\xfa"
-                         "\xeb\x83\x31\xf1\x54\x54\x89\x0d"
-                         "\x9d\x4d\x54\x51\x84\x61\xf6\x8e"
-                         "\x03\x31\xf2\x25\x16\xcc\xaa\xc6"
-                         "\x75\x73\x20\x30\x59\x54\xb2\xf0"
-                         "\x3a\x4b\xe0\x23\x8e\xa6\x08\x35"
-                         "\x8a\xdf\x27\xa0\xe4\x60\x99\xae"
-                         "\x8e\x43\xd9\x39\x7b\x10\x40\x67"
-                         "\x5c\x7e\xc9\x70\x63\x34\xca\x59"
-                         "\xfe\x86\xbc\xb7\x9c\x39\xf3\x6d"
-                         "\x6a\x41\x64\x6f\x16\x7f\x65\x7e"
-                         "\x89\x84\x68\xeb\xb0\x51\xbe\x55"
-                         "\x33\x16\x59\x6c\x3b\xef\x88\xad"
-                         "\x2f\xab\xbc\x25\x76\x87\x41\x2f"
-                         "\x36",
-               .rlen   = 129,
+               .clen   = 145,
        }, {
                .key    = "\xba\xde\x82\x72\x42\xa9\x2f\x2c"
                          "\x12\x0b\xe9\x5c\x87\xd7\x35\x7c",
@@ -26504,7 +21306,17 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xd9\xd2\xaf\x8e\xd5\xd3\xa8\xa9"
                          "\x51",
                .alen   = 129,
-               .input  = "\x36\x78\xb9\x22\xde\x62\x35\x55"
+               .ptext  = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
+                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
+                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
+                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
+                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
+                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
+                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
+                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
+                         "\x54",
+               .plen   = 65,
+               .ctext  = "\x36\x78\xb9\x22\xde\x62\x35\x55"
                          "\x1a\x7a\xf5\x45\xbc\xd7\x15\x82"
                          "\x01\xe9\x5a\x07\xea\x46\xaf\x91"
                          "\xcb\x73\xa5\xee\xe1\xb4\xbf\xc2"
@@ -26515,17 +21327,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xbf\xbc\x88\x3f\x5d\xd1\xf9\x19"
                          "\x0f\x9d\xb2\xaf\xb9\x6e\x17\xdf"
                          "\xa2",
-               .ilen   = 81,
-               .result = "\xe8\x39\x2d\xaa\x0e\x85\x2d\xc1"
-                         "\x72\xaf\x6e\xc9\x82\x33\xc7\x01"
-                         "\xaf\x40\x70\xb8\x2a\x78\xc9\x14"
-                         "\xac\xb1\x10\xca\x2e\xb3\x28\xe4"
-                         "\xac\xfa\x58\x7f\xe5\x73\x09\x8c"
-                         "\x1d\x40\x87\x8c\xd9\x75\xc0\x55"
-                         "\xa2\xda\x07\xd1\xc2\xa9\xd1\xbb"
-                         "\x09\x4f\x77\x62\x88\x2d\xf2\x68"
-                         "\x54",
-               .rlen   = 65,
+               .clen   = 81,
        }, {
                .key    = "\xf7\x02\xbb\x11\x52\x24\xd8\x48"
                          "\x93\xe6\x9b\xee\x81\xfc\xf7\x82",
@@ -26537,18 +21339,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x0e\x51\xf9\x1c\xee\x70\x6a\x27"
                          "\x3d\xd3\xb7\xac\x51\xfa\xdf\x05",
                .alen   = 32,
-               .input  = "\x08\x1b\x95\x0e\x41\x95\x02\x4b"
+               .ptext  = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
+                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07"
+                         "\xd9\x02\x7c\x3d\x2f\x18\x4b\x2d"
+                         "\x6e\xde\xee\xa2\x08\x12\xc7\xba",
+               .plen   = 32,
+               .ctext  = "\x08\x1b\x95\x0e\x41\x95\x02\x4b"
                          "\x9c\xbb\xa8\xd0\x7c\xd3\x44\x6e"
                          "\x89\x14\x33\x70\x0a\xbc\xea\x39"
                          "\x88\xaa\x2b\xd5\x73\x11\x55\xf5"
                          "\x33\x33\x9c\xd7\x42\x34\x49\x8e"
                          "\x2f\x03\x30\x05\x47\xaf\x34",
-               .ilen   = 47,
-               .result = "\x24\x5e\x67\x49\x1e\x01\xd6\xdd"
-                         "\xf3\x89\x20\x5b\x7c\x57\x89\x07"
-                         "\xd9\x02\x7c\x3d\x2f\x18\x4b\x2d"
-                         "\x6e\xde\xee\xa2\x08\x12\xc7\xba",
-               .rlen   = 32,
+               .clen   = 47,
        }, {
                .key    = "\x33\x27\xf5\xb1\x62\xa0\x80\x63"
                          "\x14\xc0\x4d\x7f\x7b\x20\xba\x89",
@@ -26560,18 +21362,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x39\x14\x05\xa0\xf3\x10\xec\x41"
                          "\xff\x01\x95\x84\x2b\x59\x7f\xdb",
                .alen   = 32,
-               .input  = "\x97\xca\xf4\xe0\x8d\x89\xbf\x68"
+               .ptext  = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
+                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d"
+                         "\x03\xc4\x88\xc1\x35\xb8\xcd\x47"
+                         "\x2f\x0c\xcd\x7a\xe2\x71\x66\x91",
+               .plen   = 32,
+               .ctext  = "\x97\xca\xf4\xe0\x8d\x89\xbf\x68"
                          "\x0c\x60\xb9\x27\xdf\xaa\x41\xc6"
                          "\x25\xd8\xf7\x1f\x10\x15\x48\x61"
                          "\x4c\x95\x00\xdf\x51\x9b\x7f\xe6"
                          "\x24\x40\x9e\xbe\x3b\xeb\x1b\x98"
                          "\xb9\x9c\xe5\xef\xf2\x05",
-               .ilen   = 46,
-               .result = "\x61\x83\xa0\xe8\x2e\x7d\x7f\xf8"
-                         "\x74\x63\xd2\xec\x76\x7c\x4c\x0d"
-                         "\x03\xc4\x88\xc1\x35\xb8\xcd\x47"
-                         "\x2f\x0c\xcd\x7a\xe2\x71\x66\x91",
-               .rlen   = 32,
+               .clen   = 46,
        }, {
                .key    = "\x70\x4c\x2f\x50\x72\x1c\x29\x7f"
                          "\x95\x9a\xff\x10\x75\x45\x7d\x8f",
@@ -26583,17 +21385,17 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x63\xd6\x10\x24\xf8\xb0\x6e\x5a"
                          "\xc0\x2e\x74\x5d\x06\xb8\x1e\xb2",
                .alen   = 32,
-               .input  = "\x63\x4c\x2a\x8e\xb4\x6b\x63\x0d"
+               .ptext  = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
+                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13"
+                         "\x2e\x86\x93\x45\x3a\x58\x4f\x61"
+                         "\xf0\x3a\xac\x53\xbc\xd0\x06\x68",
+               .plen   = 32,
+               .ctext  = "\x63\x4c\x2a\x8e\xb4\x6b\x63\x0d"
                          "\xb5\xec\x9b\x4e\x12\x23\xa3\xcf"
                          "\x1a\x5a\x70\x15\x5a\x10\x40\x51"
                          "\xca\x47\x4c\x9d\xc9\x97\xf4\x77"
                          "\xdb\xc8\x10\x2d\xdc\x65\x20\x3f",
-               .ilen   = 40,
-               .result = "\x9d\xa7\xda\x88\x3e\xf8\x28\x14"
-                         "\xf5\x3e\x85\x7d\x70\xa0\x0f\x13"
-                         "\x2e\x86\x93\x45\x3a\x58\x4f\x61"
-                         "\xf0\x3a\xac\x53\xbc\xd0\x06\x68",
-               .rlen   = 32,
+               .clen   = 40,
        }, {
                .key    = "\xac\x70\x69\xef\x82\x97\xd2\x9b"
                          "\x15\x74\xb1\xa2\x6f\x69\x3f\x95",
@@ -26605,17 +21407,17 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x8d\x98\x1c\xa8\xfe\x50\xf0\x74"
                          "\x81\x5c\x53\x35\xe0\x17\xbd\x88",
                .alen   = 32,
-               .input  = "\xf1\x62\x44\xc7\x5f\x19\xca\x43"
+               .ptext  = "\xda\xcc\x14\x27\x4e\x74\xd1\x30"
+                         "\x76\x18\x37\x0f\x6a\xc4\xd1\x1a"
+                         "\x58\x49\x9f\xc9\x3f\xf8\xd1\x7a"
+                         "\xb2\x67\x8b\x2b\x96\x2f\xa5\x3e",
+               .plen   = 32,
+               .ctext  = "\xf1\x62\x44\xc7\x5f\x19\xca\x43"
                          "\x47\x2c\xaf\x68\x82\xbd\x51\xef"
                          "\x3d\x65\xd8\x45\x2d\x06\x07\x78"
                          "\x08\x2e\xb3\x23\xcd\x81\x12\x55"
                          "\x1a",
-               .ilen   = 33,
-               .result = "\xda\xcc\x14\x27\x4e\x74\xd1\x30"
-                         "\x76\x18\x37\x0f\x6a\xc4\xd1\x1a"
-                         "\x58\x49\x9f\xc9\x3f\xf8\xd1\x7a"
-                         "\xb2\x67\x8b\x2b\x96\x2f\xa5\x3e",
-               .rlen   = 32,
+               .clen   = 33,
        }, {
                .key    = "\xe9\x95\xa2\x8f\x93\x13\x7b\xb7"
                          "\x96\x4e\x63\x33\x69\x8d\x02\x9b"
@@ -26626,11 +21428,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xb7\x85\x90\x58\x67\x57\x33\x1d",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xdf\x2f\x83\xc0\x45\x4a\x2c\xcf"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xdf\x2f\x83\xc0\x45\x4a\x2c\xcf"
                          "\xb9\xd2\x41\xf6\x80\xa1\x52\x70",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x25\xba\xdc\x2e\xa3\x8f\x24\xd3"
                          "\x17\x29\x15\xc5\x63\xb2\xc5\xa1"
@@ -26641,12 +21443,12 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x38\x5f\x42\xe9\x61\x7b\xf5\x23",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x01\xd8\x55\x3c\xc0\x5a\x4b\xc7"
+               .ptext  = "\x53",
+               .plen   = 1,
+               .ctext  = "\x01\xd8\x55\x3c\xc0\x5a\x4b\xc7"
                          "\x01\xf4\x08\xe3\x0d\xf7\xf0\x78"
                          "\x53",
-               .ilen   = 17,
-               .result = "\x53",
-               .rlen   = 1,
+               .clen   = 17,
        }, {
                .key    = "\x62\xdf\x16\xcd\xb3\x0a\xcc\xef"
                          "\x98\x03\xc7\x56\x5d\xd6\x87\xa8"
@@ -26657,18 +21459,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xb8\x39\xf4\x7a\x5b\x9f\xb8\x29",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xc2\x4b\x41\x0f\x2d\xb9\x62\x07"
+               .ptext  = "\x8f\x3a\xc1\x05\x7f\xe7\xcb\x83"
+                         "\xf9\xa6\x4d\xc3\x58\x31\x19\x2c"
+                         "\xd7\x90\xc2\x56\x4e\xd8\x57\xc7"
+                         "\xf6\xf0\x27\xb4\x25\x4c\x83",
+               .plen   = 31,
+               .ctext  = "\xc2\x4b\x41\x0f\x2d\xb9\x62\x07"
                          "\xff\x8e\x74\xf8\xa1\xa6\xd5\x37"
                          "\xa5\x64\x31\x5c\xca\x73\x9b\x43"
                          "\xe6\x70\x63\x46\x95\xcb\xf7\xb5"
                          "\x20\x8c\x75\x7a\x2a\x17\x2f\xa9"
                          "\xb8\x4d\x11\x42\xd1\xf8\xf1",
-               .ilen   = 47,
-               .result = "\x8f\x3a\xc1\x05\x7f\xe7\xcb\x83"
-                         "\xf9\xa6\x4d\xc3\x58\x31\x19\x2c"
-                         "\xd7\x90\xc2\x56\x4e\xd8\x57\xc7"
-                         "\xf6\xf0\x27\xb4\x25\x4c\x83",
-               .rlen   = 31,
+               .clen   = 47,
        }, {
                .key    = "\x9e\x03\x4f\x6d\xc3\x86\x75\x0a"
                          "\x19\xdd\x79\xe8\x57\xfb\x4a\xae"
@@ -26679,18 +21481,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x39\x14\xa6\x0c\x55\xc4\x7b\x30",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xbb\x01\x7c\xd1\x2c\x33\x7b\x37"
+               .ptext  = "\xcc\x5f\xfb\xa4\x8f\x63\x74\x9f"
+                         "\x7a\x81\xff\x55\x52\x56\xdc\x33"
+                         "\x01\x52\xcd\xdb\x53\x78\xd9\xe1"
+                         "\xb7\x1d\x06\x8d\xff\xab\x22\x98",
+               .plen   = 32,
+               .ctext  = "\xbb\x01\x7c\xd1\x2c\x33\x7b\x37"
                          "\x0a\xee\xc4\x30\x19\xd7\x3a\x6f"
                          "\xf8\x2b\x67\xf5\x3b\x84\x87\x2a"
                          "\xfb\x07\x7a\x82\xb5\xe4\x85\x26"
                          "\x1e\xa8\xe5\x04\x54\xce\xe5\x5f"
                          "\xb5\x3f\xc1\xd5\x7f\xbd\xd2\xa6",
-               .ilen   = 48,
-               .result = "\xcc\x5f\xfb\xa4\x8f\x63\x74\x9f"
-                         "\x7a\x81\xff\x55\x52\x56\xdc\x33"
-                         "\x01\x52\xcd\xdb\x53\x78\xd9\xe1"
-                         "\xb7\x1d\x06\x8d\xff\xab\x22\x98",
-               .rlen   = 32,
+               .clen   = 48,
        }, {
                .key    = "\xdb\x28\x89\x0c\xd3\x01\x1e\x26"
                          "\x9a\xb7\x2b\x79\x51\x1f\x0d\xb4"
@@ -26701,20 +21503,20 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xba\xee\x58\x9d\x4f\xe8\x3d\x36",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xc2\xf4\x40\x55\xf9\x59\xff\x73"
+               .ptext  = "\x08\x84\x34\x44\x9f\xde\x1c\xbb"
+                         "\xfb\x5b\xb1\xe6\x4c\x7a\x9f\x39"
+                         "\x2c\x14\xd9\x5f\x59\x18\x5b\xfb"
+                         "\x79\x4b\xe5\x65\xd9\x0a\xc1\x6f"
+                         "\x2e",
+               .plen   = 33,
+               .ctext  = "\xc2\xf4\x40\x55\xf9\x59\xff\x73"
                          "\x08\xf5\x98\x92\x0c\x7b\x35\x9a"
                          "\xa8\xf4\x42\x7e\x6f\x93\xca\x22"
                          "\x23\x06\x1e\xf8\x89\x22\xf4\x46"
                          "\x7c\x7c\x67\x75\xab\xe5\x75\xaa"
                          "\x15\xd7\x83\x19\xfd\x31\x59\x5b"
                          "\x32",
-               .ilen   = 49,
-               .result = "\x08\x84\x34\x44\x9f\xde\x1c\xbb"
-                         "\xfb\x5b\xb1\xe6\x4c\x7a\x9f\x39"
-                         "\x2c\x14\xd9\x5f\x59\x18\x5b\xfb"
-                         "\x79\x4b\xe5\x65\xd9\x0a\xc1\x6f"
-                         "\x2e",
-               .rlen   = 33,
+               .clen   = 49,
        }, {
                .key    = "\x17\x4d\xc3\xab\xe3\x7d\xc7\x42"
                          "\x1b\x91\xdd\x0a\x4b\x43\xcf\xba"
@@ -26725,7 +21527,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x3b\xc8\x0a\x2f\x49\x0c\x00\x3c",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\xc9\x82\x3b\x4b\x87\x84\xa5\xdb"
+               .ptext  = "\x45\xa8\x6e\xe3\xaf\x5a\xc5\xd7"
+                         "\x7c\x35\x63\x77\x46\x9f\x61\x3f"
+                         "\x56\xd7\xe4\xe3\x5e\xb8\xdc\x14"
+                         "\x3a\x79\xc4\x3e\xb3\x69\x61\x46"
+                         "\x3c\xb6\x83\x4e\xb4\x26\xc7\x73"
+                         "\x22\xda\x52\x8b\x7d\x11\x98\xea"
+                         "\x62\xe1\x14\x1e\xdc\xfe\x0f\xad"
+                         "\x20\x76\x5a\xdc\x4e\x71\x13",
+               .plen   = 63,
+               .ctext  = "\xc9\x82\x3b\x4b\x87\x84\xa5\xdb"
                          "\xa0\x8c\xd3\x3e\x7f\x8d\xe8\x28"
                          "\x2a\xdc\xfa\x01\x84\x87\x9a\x70"
                          "\x81\x75\x37\x0a\xd2\x75\xa9\xb6"
@@ -26735,16 +21546,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x83\x9b\x05\x11\x72\x60\xf0\xb4"
                          "\x7e\x06\xab\x0a\xc0\xbb\x59\x23"
                          "\xaa\x2d\xfc\x4e\x35\x05\x59",
-               .ilen   = 79,
-               .result = "\x45\xa8\x6e\xe3\xaf\x5a\xc5\xd7"
-                         "\x7c\x35\x63\x77\x46\x9f\x61\x3f"
-                         "\x56\xd7\xe4\xe3\x5e\xb8\xdc\x14"
-                         "\x3a\x79\xc4\x3e\xb3\x69\x61\x46"
-                         "\x3c\xb6\x83\x4e\xb4\x26\xc7\x73"
-                         "\x22\xda\x52\x8b\x7d\x11\x98\xea"
-                         "\x62\xe1\x14\x1e\xdc\xfe\x0f\xad"
-                         "\x20\x76\x5a\xdc\x4e\x71\x13",
-               .rlen   = 63,
+               .clen   = 79,
        }, {
                .key    = "\x54\x71\xfd\x4b\xf3\xf9\x6f\x5e"
                          "\x9c\x6c\x8f\x9c\x45\x68\x92\xc1"
@@ -26755,7 +21557,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xbc\xa2\xbc\xc0\x43\x31\xc2\x42",
                .assoc  = "",
                .alen   = 0,
-               .input  = "\x11\x7c\x7d\xef\xce\x29\x95\xec"
+               .ptext  = "\x81\xcd\xa8\x82\xbf\xd6\x6e\xf3"
+                         "\xfd\x0f\x15\x09\x40\xc3\x24\x45"
+                         "\x81\x99\xf0\x67\x63\x58\x5e\x2e"
+                         "\xfb\xa6\xa3\x16\x8d\xc8\x00\x1c"
+                         "\x4b\x62\x87\x7c\x15\x38\xda\x70"
+                         "\x3d\xea\xe7\xf2\x40\xba\xae\x79"
+                         "\x8f\x48\xfc\xbf\x45\x53\x2e\x78"
+                         "\xef\x79\xf0\x1b\x49\xf7\xfd\x9c",
+               .plen   = 64,
+               .ctext  = "\x11\x7c\x7d\xef\xce\x29\x95\xec"
                          "\x7e\x9f\x42\xa6\x26\x07\xa1\x75"
                          "\x2f\x4e\x09\x9a\xf6\x6b\xc2\xfa"
                          "\x0d\xd0\x17\xdc\x25\x1e\x9b\xdc"
@@ -26765,16 +21576,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x43\x11\x26\x58\xcf\xc5\x41\xcf"
                          "\x13\xcc\xde\x32\x92\xfa\x86\xf2"
                          "\xaf\x16\xe8\x8f\xca\xb6\xfd\x54",
-               .ilen   = 80,
-               .result = "\x81\xcd\xa8\x82\xbf\xd6\x6e\xf3"
-                         "\xfd\x0f\x15\x09\x40\xc3\x24\x45"
-                         "\x81\x99\xf0\x67\x63\x58\x5e\x2e"
-                         "\xfb\xa6\xa3\x16\x8d\xc8\x00\x1c"
-                         "\x4b\x62\x87\x7c\x15\x38\xda\x70"
-                         "\x3d\xea\xe7\xf2\x40\xba\xae\x79"
-                         "\x8f\x48\xfc\xbf\x45\x53\x2e\x78"
-                         "\xef\x79\xf0\x1b\x49\xf7\xfd\x9c",
-               .rlen   = 64,
+               .clen   = 80,
        }, {
                .key    = "\x90\x96\x36\xea\x03\x74\x18\x7a"
                          "\x1d\x46\x42\x2d\x3f\x8c\x54\xc7"
@@ -26785,11 +21587,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x3d\x7c\x6e\x52\x3d\x55\x85\x48",
                .assoc  = "\xaf",
                .alen   = 1,
-               .input  = "\x9b\xc5\x3b\x20\x0a\x88\x56\xbe"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x9b\xc5\x3b\x20\x0a\x88\x56\xbe"
                          "\x69\xdf\xc4\xc4\x02\x46\x3a\xf0",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\xcd\xbb\x70\x89\x13\xf0\xc1\x95"
                          "\x9e\x20\xf4\xbf\x39\xb1\x17\xcd"
@@ -26803,11 +21605,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x0b\x6d\x84\x4f\x2c\xf0\x82\x5b"
                          "\x4e\xf6\x29\xd1\x8b\x6f\x56",
                .alen   = 31,
-               .input  = "\xe0\x6d\xa1\x07\x98\x2f\x40\x2d"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xe0\x6d\xa1\x07\x98\x2f\x40\x2d"
                          "\x2e\x9a\xd6\x61\x43\xc0\x74\x69",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x0a\xe0\xaa\x29\x24\x6c\x6a\xb1"
                          "\x1f\xfa\xa6\x50\x33\xd5\xda\xd3"
@@ -26821,11 +21623,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x35\x2f\x90\xd3\x31\x90\x04\x74"
                          "\x0f\x23\x08\xa9\x65\xce\xf6\xea",
                .alen   = 32,
-               .input  = "\xb9\x57\x13\x3e\x82\x31\x61\x65"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\xb9\x57\x13\x3e\x82\x31\x61\x65"
                          "\x0d\x7f\x6c\x96\x93\x5c\x50\xe2",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x46\x04\xe3\xc8\x34\xe7\x12\xcd"
                          "\xa0\xd4\x58\xe2\x2d\xf9\x9c\xda"
@@ -26840,11 +21642,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xd1\x51\xe6\x81\x3f\x2d\x95\xc1"
                          "\x01",
                .alen   = 33,
-               .input  = "\x81\x96\x34\xde\xbb\x36\xdd\x3e"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x81\x96\x34\xde\xbb\x36\xdd\x3e"
                          "\x4e\x5e\xcb\x44\x21\xb8\x3f\xf1",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\x83\x29\x1d\x67\x44\x63\xbb\xe9"
                          "\x20\xaf\x0a\x73\x27\x1e\x5f\xe0"
@@ -26862,11 +21664,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x64\xb2\x89\x7d\x78\xa8\x05\x7e"
                          "\x07\x8c\xfc\x88\x2d\xb8\x53",
                .alen   = 63,
-               .input  = "\x2e\x99\xb6\x79\x57\x56\x80\x36"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x2e\x99\xb6\x79\x57\x56\x80\x36"
                          "\x8e\xc4\x1c\x12\x7d\x71\x36\x0c",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\xbf\x4e\x57\x07\x54\xdf\x64\x05"
                          "\xa1\x89\xbc\x04\x21\x42\x22\xe6"
@@ -26884,11 +21686,11 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x91\x19\x70\x1e\xe1\xfe\x25\x49"
                          "\xd6\x8f\x93\xc7\x28\x3f\x3d\x03",
                .alen   = 64,
-               .input  = "\x7b\x25\x3d\x47\xd4\xa7\x08\xce"
+               .ptext  = "",
+               .plen   = 0,
+               .ctext  = "\x7b\x25\x3d\x47\xd4\xa7\x08\xce"
                          "\x3b\x89\x40\x36\xba\x6d\x0e\xa2",
-               .ilen   = 16,
-               .result = "",
-               .rlen   = 0,
+               .clen   = 16,
        }, {
                .key    = "\xfc\x72\x90\xa6\x64\x5a\x0d\x21"
                          "\x22\x63\x6e\x96\x1b\x67\xe4\xec"
@@ -26899,12 +21701,12 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x42\x9a\x9a\xba\x19\x30\x15\x6e",
                .assoc  = "\x1a",
                .alen   = 1,
-               .input  = "\xe6\x09\x6f\x95\x9a\x18\xc8\xf6"
+               .ptext  = "\x29",
+               .plen   = 1,
+               .ctext  = "\xe6\x09\x6f\x95\x9a\x18\xc8\xf6"
                          "\x17\x75\x81\x16\xdf\x26\xff\x67"
                          "\x92",
-               .ilen   = 17,
-               .result = "\x29",
-               .rlen   = 1,
+               .clen   = 17,
        }, {
                .key    = "\x38\x97\xca\x45\x74\xd6\xb6\x3c"
                          "\xa3\x3d\x20\x27\x15\x8b\xa7\xf2"
@@ -26918,18 +21720,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x09\xfb\xca\x69\x4b\xb0\x8e\xf5"
                          "\xd6\x07\x62\xe3\xa8\xa9\x12",
                .alen   = 31,
-               .input  = "\x82\xc0\x56\xf0\xd7\xc4\xc9\xfd"
+               .ptext  = "\x66\xf3\x75\x7d\x40\xb3\xb4\xd1"
+                         "\x04\xe1\xa6\x94\x10\xe6\x39\x77"
+                         "\xd3\xac\x4d\x8a\x8c\x58\x6e\xfb"
+                         "\x06\x13\x9a\xd9\x5e\xc0\xfa",
+               .plen   = 31,
+               .ctext  = "\x82\xc0\x56\xf0\xd7\xc4\xc9\xfd"
                          "\x3c\xd1\x2a\xd4\x15\x86\x9d\xda"
                          "\xea\x6c\x6f\xa1\x33\xb0\x7a\x01"
                          "\x57\xe7\xf3\x7b\x73\xe7\x54\x10"
                          "\xc6\x91\xe2\xc6\xa0\x69\xe7\xe6"
                          "\x76\xc3\xf5\x3a\x76\xfd\x4a",
-               .ilen   = 47,
-               .result = "\x66\xf3\x75\x7d\x40\xb3\xb4\xd1"
-                         "\x04\xe1\xa6\x94\x10\xe6\x39\x77"
-                         "\xd3\xac\x4d\x8a\x8c\x58\x6e\xfb"
-                         "\x06\x13\x9a\xd9\x5e\xc0\xfa",
-               .rlen   = 31,
+               .clen   = 47,
        }, {
                .key    = "\x75\xbc\x04\xe5\x84\x52\x5e\x58"
                          "\x24\x17\xd2\xb9\x0e\xaf\x6a\xf9"
@@ -26943,18 +21745,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x33\xbd\xd6\xed\x50\x50\x10\x0e"
                          "\x97\x35\x41\xbb\x82\x08\xb1\xf2",
                .alen   = 32,
-               .input  = "\x01\x47\x8e\x6c\xf6\x64\x89\x3a"
+               .ptext  = "\xa2\x17\xaf\x1c\x50\x2e\x5d\xed"
+                         "\x85\xbb\x58\x26\x0a\x0b\xfc\x7d"
+                         "\xfe\x6e\x59\x0e\x91\xf8\xf0\x15"
+                         "\xc8\x40\x78\xb1\x38\x1f\x99\xa7",
+               .plen   = 32,
+               .ctext  = "\x01\x47\x8e\x6c\xf6\x64\x89\x3a"
                          "\x71\xce\xe4\xaa\x45\x70\xe6\x84"
                          "\x62\x48\x08\x64\x86\x6a\xdf\xec"
                          "\xb4\xa0\xfb\x34\x03\x0c\x19\xf4"
                          "\x2b\x7b\x36\x73\xec\x54\xa9\x1e"
                          "\x30\x85\xdb\xe4\xac\xe9\x2c\xca",
-               .ilen   = 48,
-               .result = "\xa2\x17\xaf\x1c\x50\x2e\x5d\xed"
-                         "\x85\xbb\x58\x26\x0a\x0b\xfc\x7d"
-                         "\xfe\x6e\x59\x0e\x91\xf8\xf0\x15"
-                         "\xc8\x40\x78\xb1\x38\x1f\x99\xa7",
-               .rlen   = 32,
+               .clen   = 48,
        }, {
                .key    = "\xb1\xe1\x3e\x84\x94\xcd\x07\x74"
                          "\xa5\xf2\x84\x4a\x08\xd4\x2c\xff"
@@ -26969,20 +21771,20 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x59\x62\x20\x94\x5c\x67\x50\xc8"
                          "\x58",
                .alen   = 33,
-               .input  = "\x85\xe0\xf8\x0f\x8e\x49\xe3\x60"
+               .ptext  = "\xdf\x3c\xe9\xbc\x61\xaa\x06\x09"
+                         "\x06\x95\x0a\xb7\x04\x2f\xbe\x84"
+                         "\x28\x30\x64\x92\x96\x98\x72\x2e"
+                         "\x89\x6e\x57\x8a\x13\x7e\x38\x7e"
+                         "\xdb",
+               .plen   = 33,
+               .ctext  = "\x85\xe0\xf8\x0f\x8e\x49\xe3\x60"
                          "\xcb\x4a\x54\x94\xcf\xf5\x7e\x34"
                          "\xe9\xf8\x80\x65\x53\xd0\x72\x70"
                          "\x4f\x7d\x9d\xd1\x15\x6f\xb9\x2c"
                          "\xfa\xe8\xdd\xac\x2e\xe1\x3f\x67"
                          "\x63\x0f\x1a\x59\xb7\x89\xdb\xf4"
                          "\xc3",
-               .ilen   = 49,
-               .result = "\xdf\x3c\xe9\xbc\x61\xaa\x06\x09"
-                         "\x06\x95\x0a\xb7\x04\x2f\xbe\x84"
-                         "\x28\x30\x64\x92\x96\x98\x72\x2e"
-                         "\x89\x6e\x57\x8a\x13\x7e\x38\x7e"
-                         "\xdb",
-               .rlen   = 33,
+               .clen   = 49,
        }, {
                .key    = "\xee\x05\x77\x23\xa5\x49\xb0\x90"
                          "\x26\xcc\x36\xdc\x02\xf8\xef\x05"
@@ -27000,7 +21802,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x71\x1c\xf7\x44\xee\xa8\xc3\x42"
                          "\xe2\xa3\x84\x04\x0b\xe1\xce",
                .alen   = 63,
-               .input  = "\x00\xe5\x5b\x87\x5c\x20\x22\x8a"
+               .ptext  = "\x1b\x61\x23\x5b\x71\x26\xae\x25"
+                         "\x87\x6f\xbc\x49\xfe\x53\x81\x8a"
+                         "\x53\xf2\x70\x17\x9b\x38\xf4\x48"
+                         "\x4b\x9b\x36\x62\xed\xdd\xd8\x54"
+                         "\xea\xcb\xb6\x79\x45\xfc\xaa\x54"
+                         "\x5c\x94\x47\x58\xa7\xff\x9c\x9e"
+                         "\x7c\xb6\xf1\xac\xc8\xfd\x8b\x35"
+                         "\xd5\xa4\x6a\xd4\x09\xc2\x08",
+               .plen   = 63,
+               .ctext  = "\x00\xe5\x5b\x87\x5c\x20\x22\x8a"
                          "\xda\x1f\xd3\xff\xbb\xb2\xb0\xf8"
                          "\xef\xe9\xeb\x9e\x7c\x80\xf4\x2b"
                          "\x59\xc0\x79\xbc\x17\xa0\x15\x01"
@@ -27010,16 +21821,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xed\x0b\x23\xea\x9b\xda\x57\x2f"
                          "\xf6\xa9\xae\x0d\x4e\x40\x96\x45"
                          "\x7f\xfa\xf0\xbf\xc4\x98\x78",
-               .ilen   = 79,
-               .result = "\x1b\x61\x23\x5b\x71\x26\xae\x25"
-                         "\x87\x6f\xbc\x49\xfe\x53\x81\x8a"
-                         "\x53\xf2\x70\x17\x9b\x38\xf4\x48"
-                         "\x4b\x9b\x36\x62\xed\xdd\xd8\x54"
-                         "\xea\xcb\xb6\x79\x45\xfc\xaa\x54"
-                         "\x5c\x94\x47\x58\xa7\xff\x9c\x9e"
-                         "\x7c\xb6\xf1\xac\xc8\xfd\x8b\x35"
-                         "\xd5\xa4\x6a\xd4\x09\xc2\x08",
-               .rlen   = 63,
+               .clen   = 79,
        }, {
                .key    = "\x2a\x2a\xb1\xc3\xb5\xc5\x59\xac"
                          "\xa7\xa6\xe8\x6d\xfc\x1d\xb2\x0b"
@@ -27037,7 +21839,16 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x9d\x83\xde\xe5\x57\xfd\xe3\x0e"
                          "\xb1\xa7\x1b\x44\x05\x67\xb7\x37",
                .alen   = 64,
-               .input  = "\x28\xdd\xb9\x4a\x12\xc7\x0a\xe1"
+               .ptext  = "\x58\x85\x5c\xfa\x81\xa1\x57\x40"
+                         "\x08\x4a\x6e\xda\xf8\x78\x44\x90"
+                         "\x7d\xb5\x7b\x9b\xa1\xd8\x76\x62"
+                         "\x0c\xc9\x15\x3b\xc7\x3c\x77\x2b"
+                         "\xf8\x78\xba\xa7\xa6\x0e\xbd\x52"
+                         "\x76\xa3\xdc\xbe\x6b\xa8\xb1\x2d"
+                         "\xa9\x1d\xd8\x4e\x31\x53\xab\x00"
+                         "\xa5\xa7\x01\x13\x04\x49\xf2\x04",
+               .plen   = 64,
+               .ctext  = "\x28\xdd\xb9\x4a\x12\xc7\x0a\xe1"
                          "\x58\x06\x1a\x9b\x8c\x67\xdf\xeb"
                          "\x35\x35\x60\x9d\x06\x40\x65\xc1"
                          "\x93\xe8\xb3\x82\x50\x29\xdd\xb5"
@@ -27047,16 +21858,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xf4\x77\xe4\xbf\x41\x3b\xc4\x06"
                          "\xce\x9e\x34\x81\xf0\x89\x11\x13"
                          "\x02\x65\xa1\x7c\xdf\x07\x33\x06",
-               .ilen   = 80,
-               .result = "\x58\x85\x5c\xfa\x81\xa1\x57\x40"
-                         "\x08\x4a\x6e\xda\xf8\x78\x44\x90"
-                         "\x7d\xb5\x7b\x9b\xa1\xd8\x76\x62"
-                         "\x0c\xc9\x15\x3b\xc7\x3c\x77\x2b"
-                         "\xf8\x78\xba\xa7\xa6\x0e\xbd\x52"
-                         "\x76\xa3\xdc\xbe\x6b\xa8\xb1\x2d"
-                         "\xa9\x1d\xd8\x4e\x31\x53\xab\x00"
-                         "\xa5\xa7\x01\x13\x04\x49\xf2\x04",
-               .rlen   = 64,
+               .clen   = 80,
        }, {
                .key    = "\x67\x4f\xeb\x62\xc5\x40\x01\xc7"
                          "\x28\x80\x9a\xfe\xf6\x41\x74\x12"
@@ -27075,7 +21877,25 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x80\xaa\xb2\x83\xff\xee\xa1\x6a"
                          "\x04",
                .alen   = 65,
-               .input  = "\x85\x39\x69\x35\xfb\xf9\xb0\xa6"
+               .ptext  = "\x94\xaa\x96\x9a\x91\x1d\x00\x5c"
+                         "\x88\x24\x20\x6b\xf2\x9c\x06\x96"
+                         "\xa7\x77\x87\x1f\xa6\x78\xf8\x7b"
+                         "\xcd\xf6\xf4\x13\xa1\x9b\x16\x02"
+                         "\x07\x24\xbf\xd5\x08\x20\xd0\x4f"
+                         "\x90\xb3\x70\x24\x2f\x51\xc7\xbb"
+                         "\xd6\x84\xc0\xef\x9a\xa8\xca\xcc"
+                         "\x74\xab\x97\x53\xfe\xd0\xdb\x37"
+                         "\x37\x6a\x0e\x9f\x3f\xa3\x2a\xe3"
+                         "\x1b\x34\x6d\x51\x72\x2b\x17\xe7"
+                         "\x4d\xaa\x2c\x18\xda\xa3\x33\x89"
+                         "\x2a\x9f\xf4\xd2\xed\x76\x3d\x3f"
+                         "\x3c\x15\x9d\x8e\x4f\x3c\x27\xb0"
+                         "\x42\x3f\x2f\x8a\xd4\xc2\x10\xb2"
+                         "\x27\x7f\xe3\x34\x80\x02\x49\x4b"
+                         "\x07\x68\x22\x2a\x88\x25\x53\xb2"
+                         "\x2f",
+               .plen   = 129,
+               .ctext  = "\x85\x39\x69\x35\xfb\xf9\xb0\xa6"
                          "\x85\x43\x88\xd0\xd7\x78\x60\x19"
                          "\x3e\x1f\xb1\xa4\xd6\xc5\x96\xec"
                          "\xf7\x84\x85\xc7\x27\x0f\x74\x57"
@@ -27094,25 +21914,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x4c\x50\x10\x62\xba\x7a\xb1\x68"
                          "\x37\xd7\x87\x4e\xe4\x66\x09\x1f"
                          "\xa5",
-               .ilen   = 145,
-               .result = "\x94\xaa\x96\x9a\x91\x1d\x00\x5c"
-                         "\x88\x24\x20\x6b\xf2\x9c\x06\x96"
-                         "\xa7\x77\x87\x1f\xa6\x78\xf8\x7b"
-                         "\xcd\xf6\xf4\x13\xa1\x9b\x16\x02"
-                         "\x07\x24\xbf\xd5\x08\x20\xd0\x4f"
-                         "\x90\xb3\x70\x24\x2f\x51\xc7\xbb"
-                         "\xd6\x84\xc0\xef\x9a\xa8\xca\xcc"
-                         "\x74\xab\x97\x53\xfe\xd0\xdb\x37"
-                         "\x37\x6a\x0e\x9f\x3f\xa3\x2a\xe3"
-                         "\x1b\x34\x6d\x51\x72\x2b\x17\xe7"
-                         "\x4d\xaa\x2c\x18\xda\xa3\x33\x89"
-                         "\x2a\x9f\xf4\xd2\xed\x76\x3d\x3f"
-                         "\x3c\x15\x9d\x8e\x4f\x3c\x27\xb0"
-                         "\x42\x3f\x2f\x8a\xd4\xc2\x10\xb2"
-                         "\x27\x7f\xe3\x34\x80\x02\x49\x4b"
-                         "\x07\x68\x22\x2a\x88\x25\x53\xb2"
-                         "\x2f",
-               .rlen   = 129,
+               .clen   = 145,
        }, {
                .key    = "\xa3\x73\x24\x01\xd5\xbc\xaa\xe3"
                          "\xa9\x5a\x4c\x90\xf0\x65\x37\x18"
@@ -27139,7 +21941,17 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xb1\x8f\x15\x93\xe7\x71\xb9\x2c"
                          "\x4b",
                .alen   = 129,
-               .input  = "\x7d\xde\x53\x22\xe4\x23\x3b\x30"
+               .ptext  = "\xd1\xcf\xd0\x39\xa1\x99\xa9\x78"
+                         "\x09\xfe\xd2\xfd\xec\xc1\xc9\x9d"
+                         "\xd2\x39\x93\xa3\xab\x18\x7a\x95"
+                         "\x8f\x24\xd3\xeb\x7b\xfa\xb5\xd8"
+                         "\x15\xd1\xc3\x04\x69\x32\xe3\x4d"
+                         "\xaa\xc2\x04\x8b\xf2\xfa\xdc\x4a"
+                         "\x02\xeb\xa8\x90\x03\xfd\xea\x97"
+                         "\x43\xaf\x2e\x92\xf8\x57\xc5\x6a"
+                         "\x00",
+               .plen   = 65,
+               .ctext  = "\x7d\xde\x53\x22\xe4\x23\x3b\x30"
                          "\x78\xde\x35\x90\x7a\xd9\x0b\x93"
                          "\xf6\x0e\x0b\xed\x40\xee\x10\x9c"
                          "\x96\x3a\xd3\x34\xb2\xd0\x67\xcf"
@@ -27150,17 +21962,7 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xf2\x3b\xd8\x28\x40\xe2\x76\xf6"
                          "\x20\x13\x83\x46\xaf\xff\xe3\x0f"
                          "\x72",
-               .ilen   = 81,
-               .result = "\xd1\xcf\xd0\x39\xa1\x99\xa9\x78"
-                         "\x09\xfe\xd2\xfd\xec\xc1\xc9\x9d"
-                         "\xd2\x39\x93\xa3\xab\x18\x7a\x95"
-                         "\x8f\x24\xd3\xeb\x7b\xfa\xb5\xd8"
-                         "\x15\xd1\xc3\x04\x69\x32\xe3\x4d"
-                         "\xaa\xc2\x04\x8b\xf2\xfa\xdc\x4a"
-                         "\x02\xeb\xa8\x90\x03\xfd\xea\x97"
-                         "\x43\xaf\x2e\x92\xf8\x57\xc5\x6a"
-                         "\x00",
-               .rlen   = 65,
+               .clen   = 81,
        }, {
                .key    = "\xe0\x98\x5e\xa1\xe5\x38\x53\xff"
                          "\x2a\x35\xfe\x21\xea\x8a\xfa\x1e"
@@ -27174,18 +21976,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x31\x4b\x1b\x07\x6f\x10\x1c\xa8"
                          "\x20\x46\x7a\xce\x9f\x42\x6d\xf9",
                .alen   = 32,
-               .input  = "\x5a\xcd\x8c\x57\xf2\x6a\xb6\xbe"
+               .ptext  = "\x0d\xf4\x09\xd8\xb1\x14\x51\x94"
+                         "\x8a\xd8\x84\x8e\xe6\xe5\x8c\xa3"
+                         "\xfc\xfc\x9e\x28\xb0\xb8\xfc\xaf"
+                         "\x50\x52\xb1\xc4\x55\x59\x55\xaf",
+               .plen   = 32,
+               .ctext  = "\x5a\xcd\x8c\x57\xf2\x6a\xb6\xbe"
                          "\x53\xc7\xaa\x9a\x60\x74\x9c\xc4"
                          "\xa2\xc2\xd0\x6d\xe1\x03\x63\xdc"
                          "\xbb\x51\x7e\x9c\x89\x73\xde\x4e"
                          "\x24\xf8\x52\x7c\x15\x41\x0e\xba"
                          "\x69\x0e\x36\x5f\x2f\x22\x8c",
-               .ilen   = 47,
-               .result = "\x0d\xf4\x09\xd8\xb1\x14\x51\x94"
-                         "\x8a\xd8\x84\x8e\xe6\xe5\x8c\xa3"
-                         "\xfc\xfc\x9e\x28\xb0\xb8\xfc\xaf"
-                         "\x50\x52\xb1\xc4\x55\x59\x55\xaf",
-               .rlen   = 32,
+               .clen   = 47,
        }, {
                .key    = "\x1c\xbd\x98\x40\xf5\xb3\xfc\x1b"
                          "\xaa\x0f\xb0\xb3\xe4\xae\xbc\x24"
@@ -27199,18 +22001,18 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x5c\x0d\x27\x8b\x74\xb0\x9e\xc2"
                          "\xe1\x74\x59\xa6\x79\xa1\x0c\xd0",
                .alen   = 32,
-               .input  = "\x47\xd6\xce\x78\xd6\xbf\x4a\x51"
+               .ptext  = "\x4a\x18\x43\x77\xc1\x90\xfa\xb0"
+                         "\x0b\xb2\x36\x20\xe0\x09\x4e\xa9"
+                         "\x26\xbe\xaa\xac\xb5\x58\x7e\xc8"
+                         "\x11\x7f\x90\x9c\x2f\xb8\xf4\x85",
+               .plen   = 32,
+               .ctext  = "\x47\xd6\xce\x78\xd6\xbf\x4a\x51"
                          "\xb8\xda\x92\x3c\xfd\xda\xac\x8e"
                          "\x8d\x88\xd7\x4d\x90\xe5\xeb\xa1"
                          "\xab\xd6\x7c\x76\xad\xea\x7d\x76"
                          "\x53\xee\xb0\xcd\xd0\x02\xbb\x70"
                          "\x5b\x6f\x7b\xe2\x8c\xe8",
-               .ilen   = 46,
-               .result = "\x4a\x18\x43\x77\xc1\x90\xfa\xb0"
-                         "\x0b\xb2\x36\x20\xe0\x09\x4e\xa9"
-                         "\x26\xbe\xaa\xac\xb5\x58\x7e\xc8"
-                         "\x11\x7f\x90\x9c\x2f\xb8\xf4\x85",
-               .rlen   = 32,
+               .clen   = 46,
        }, {
                .key    = "\x59\xe1\xd2\xdf\x05\x2f\xa4\x37"
                          "\x2b\xe9\x63\x44\xde\xd3\x7f\x2b"
@@ -27224,17 +22026,17 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\x86\xd0\x32\x0f\x79\x50\x20\xdb"
                          "\xa2\xa1\x37\x7e\x53\x00\xab\xa6",
                .alen   = 32,
-               .input  = "\x9f\xa9\x2b\xa4\x8f\x00\x05\x2b"
+               .ptext  = "\x86\x3d\x7d\x17\xd1\x0c\xa3\xcc"
+                         "\x8c\x8d\xe8\xb1\xda\x2e\x11\xaf"
+                         "\x51\x80\xb5\x30\xba\xf8\x00\xe2"
+                         "\xd3\xad\x6f\x75\x09\x18\x93\x5c",
+               .plen   = 32,
+               .ctext  = "\x9f\xa9\x2b\xa4\x8f\x00\x05\x2b"
                          "\xe7\x68\x81\x51\xbb\xfb\xdf\x60"
                          "\xbb\xac\xe8\xc1\xdc\x68\xae\x68"
                          "\x3a\xcd\x7a\x06\x49\xfe\x80\x11"
                          "\xe6\x61\x99\xe2\xdd\xbe\x2c\xbf",
-               .ilen   = 40,
-               .result = "\x86\x3d\x7d\x17\xd1\x0c\xa3\xcc"
-                         "\x8c\x8d\xe8\xb1\xda\x2e\x11\xaf"
-                         "\x51\x80\xb5\x30\xba\xf8\x00\xe2"
-                         "\xd3\xad\x6f\x75\x09\x18\x93\x5c",
-               .rlen   = 32,
+               .clen   = 40,
        }, {
                .key    = "\x96\x06\x0b\x7f\x15\xab\x4d\x53"
                          "\xac\xc3\x15\xd6\xd8\xf7\x42\x31"
@@ -27248,17 +22050,17 @@ static const struct aead_testvec morus1280_dec_tv_template[] = {
                          "\xb1\x92\x3e\x93\x7e\xf0\xa2\xf5"
                          "\x64\xcf\x16\x57\x2d\x5f\x4a\x7d",
                .alen   = 32,
-               .input  = "\xe2\x34\xfa\x25\xfd\xfb\x89\x5e"
+               .ptext  = "\xc3\x62\xb7\xb6\xe2\x87\x4c\xe7"
+                         "\x0d\x67\x9a\x43\xd4\x52\xd4\xb5"
+                         "\x7b\x43\xc1\xb5\xbf\x98\x82\xfc"
+                         "\x94\xda\x4e\x4d\xe4\x77\x32\x32",
+               .plen   = 32,
+               .ctext  = "\xe2\x34\xfa\x25\xfd\xfb\x89\x5e"
                          "\x5b\x4e\x0b\x15\x6e\x39\xfb\x0c"
                          "\x73\xc7\xd9\x6b\xbe\xce\x9b\x70"
                          "\xc7\x4f\x96\x16\x03\xfc\xea\xfb"
                          "\x56",
-               .ilen   = 33,
-               .result = "\xc3\x62\xb7\xb6\xe2\x87\x4c\xe7"
-                         "\x0d\x67\x9a\x43\xd4\x52\xd4\xb5"
-                         "\x7b\x43\xc1\xb5\xbf\x98\x82\xfc"
-                         "\x94\xda\x4e\x4d\xe4\x77\x32\x32",
-               .rlen   = 32,
+               .clen   = 33,
        },
 };
 
John Crispins staging tree