crypto: testmgr - expand twofish test vectors
authorJohannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
Mon, 28 May 2012 13:55:38 +0000 (15:55 +0200)
committerHerbert Xu <herbert@gondor.apana.org.au>
Tue, 12 Jun 2012 08:46:07 +0000 (16:46 +0800)
The AVX implementation of the twofish cipher processes 8 blocks parallel, so we
need to make test vectors larger to check parallel code paths. Test vectors are
also large enough to deal with 16 block parallel implementations which may occur
in the future.

Signed-off-by: Johannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
crypto/testmgr.h

index 34a9d511deefd0e74967d8d7f9c62c4ebcd37a09..4d84fe48df08a7888dc3b7ddc33909bec780f886 100644 (file)
@@ -2765,8 +2765,62 @@ static struct cipher_testvec tf_enc_tv_template[] = {
                          "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
-                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C",
-               .ilen   = 64,
+                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
+               .ilen   = 496,
                .result = "\x88\xCB\x1E\xC2\xAF\x8A\x97\xFF"
                          "\xF6\x90\x46\x9C\x4A\x0F\x08\xDC"
                          "\xDE\xAB\xAD\xFA\xFC\xA8\xC2\x3D"
@@ -2774,8 +2828,62 @@ static struct cipher_testvec tf_enc_tv_template[] = {
                          "\x34\x9E\xB6\x08\xB2\xDD\xA8\xF5"
                          "\xDF\xFA\xC7\xE8\x09\x50\x76\x08"
                          "\xA2\xB6\x6A\x59\xC0\x2B\x6D\x05"
-                         "\x89\xF6\x82\xF0\xD3\xDB\x06\x02",
-               .rlen   = 64,
+                         "\x89\xF6\x82\xF0\xD3\xDB\x06\x02"
+                         "\xB5\x11\x5C\x5E\x79\x1A\xAC\x43"
+                         "\x5C\xC0\x30\x4B\x6B\x16\xA1\x40"
+                         "\x80\x27\x88\xBA\x2C\x74\x42\xE0"
+                         "\x1B\xA5\x85\x08\xB9\xE6\x22\x7A"
+                         "\x36\x3B\x0D\x9F\xA0\x22\x6C\x2A"
+                         "\x91\x75\x47\xBC\x67\x21\x4E\xF9"
+                         "\xEA\xFF\xD9\xD5\xC0\xFC\x9E\x2C"
+                         "\x3E\xAD\xC6\x61\x0E\x93\x7A\x22"
+                         "\x09\xC8\x8D\xC1\x8E\xB4\x8B\x5C"
+                         "\xC6\x24\x42\xB8\x23\x66\x80\xA9"
+                         "\x32\x0B\x7A\x29\xBF\xB3\x0B\x63"
+                         "\x43\x27\x13\xA9\xBE\xEB\xBD\xF3"
+                         "\x33\x62\x70\xE2\x1B\x86\x7A\xA1"
+                         "\x51\x4A\x16\xFE\x29\x63\x7E\xD0"
+                         "\x7A\xA4\x6E\x2C\xF8\xC1\xDB\xE8"
+                         "\xCB\x4D\xD2\x8C\x04\x14\xB4\x66"
+                         "\x41\xB7\x3A\x96\x16\x7C\x1D\x5B"
+                         "\xB6\x41\x42\x64\x43\xEE\x6E\x7C"
+                         "\x8B\xAF\x01\x9C\xA4\x6E\x75\x8F"
+                         "\xDE\x10\x9F\xA6\xE7\xD6\x44\x97"
+                         "\x66\xA3\x96\x0F\x1C\x25\x60\xF5"
+                         "\x3C\x2E\x32\x69\x0E\x82\xFF\x27"
+                         "\x0F\xB5\x06\xDA\xD8\x31\x15\x6C"
+                         "\xDF\x18\x6C\x87\xF5\x3B\x11\x9A"
+                         "\x1B\x42\x1F\x5B\x29\x19\x96\x13"
+                         "\x68\x2E\x5E\x08\x1C\x8F\x32\x4B"
+                         "\x81\x77\x6D\xF4\xA0\x01\x42\xEC"
+                         "\xDD\x5B\xFD\x3A\x8E\x6A\x14\xFB"
+                         "\x83\x54\xDF\x0F\x86\xB7\xEA\x40"
+                         "\x46\x39\xF7\x2A\x89\x8D\x4E\x96"
+                         "\x5F\x5F\x6D\x76\xC6\x13\x9D\x3D"
+                         "\x1D\x5F\x0C\x7D\xE2\xBC\xC2\x16"
+                         "\x16\xBE\x89\x3E\xB0\x61\xA2\x5D"
+                         "\xAF\xD1\x40\x5F\x1A\xB8\x26\x41"
+                         "\xC6\xBD\x36\xEF\xED\x29\x50\x6D"
+                         "\x10\xEF\x26\xE8\xA8\x93\x11\x3F"
+                         "\x2D\x1F\x88\x20\x77\x45\xF5\x66"
+                         "\x08\xB9\xF1\xEF\xB1\x93\xA8\x81"
+                         "\x65\xC5\xCD\x3E\x8C\x06\x60\x2C"
+                         "\xB2\x10\x7A\xCA\x05\x25\x59\xDB"
+                         "\xC7\x28\xF5\x20\x35\x52\x9E\x62"
+                         "\xF8\x88\x24\x1C\x4D\x84\x12\x39"
+                         "\x39\xE4\x2E\xF4\xD4\x9D\x2B\xBC"
+                         "\x87\x66\xE6\xC0\x6B\x31\x9A\x66"
+                         "\x03\xDC\x95\xD8\x6B\xD0\x30\x8F"
+                         "\xDF\x8F\x8D\xFA\xEC\x1F\x08\xBD"
+                         "\xA3\x63\xE2\x71\x4F\x03\x94\x87"
+                         "\x50\xDF\x15\x1F\xED\x3A\xA3\x7F"
+                         "\x1F\x2A\xB5\xA1\x69\xAC\x4B\x0D"
+                         "\x84\x9B\x2A\xE9\x55\xDD\x46\x91"
+                         "\x15\x33\xF3\x2B\x9B\x46\x97\x00"
+                         "\xF0\x29\xD8\x59\x5D\x33\x37\xF9"
+                         "\x58\x33\x9B\x78\xC7\x58\x48\x6B"
+                         "\x2C\x75\x64\xC4\xCA\xC1\x7E\xD5",
+               .rlen   = 496,
        },
 };
 
@@ -2822,8 +2930,62 @@ static struct cipher_testvec tf_dec_tv_template[] = {
                          "\x34\x9E\xB6\x08\xB2\xDD\xA8\xF5"
                          "\xDF\xFA\xC7\xE8\x09\x50\x76\x08"
                          "\xA2\xB6\x6A\x59\xC0\x2B\x6D\x05"
-                         "\x89\xF6\x82\xF0\xD3\xDB\x06\x02",
-               .ilen   = 64,
+                         "\x89\xF6\x82\xF0\xD3\xDB\x06\x02"
+                         "\xB5\x11\x5C\x5E\x79\x1A\xAC\x43"
+                         "\x5C\xC0\x30\x4B\x6B\x16\xA1\x40"
+                         "\x80\x27\x88\xBA\x2C\x74\x42\xE0"
+                         "\x1B\xA5\x85\x08\xB9\xE6\x22\x7A"
+                         "\x36\x3B\x0D\x9F\xA0\x22\x6C\x2A"
+                         "\x91\x75\x47\xBC\x67\x21\x4E\xF9"
+                         "\xEA\xFF\xD9\xD5\xC0\xFC\x9E\x2C"
+                         "\x3E\xAD\xC6\x61\x0E\x93\x7A\x22"
+                         "\x09\xC8\x8D\xC1\x8E\xB4\x8B\x5C"
+                         "\xC6\x24\x42\xB8\x23\x66\x80\xA9"
+                         "\x32\x0B\x7A\x29\xBF\xB3\x0B\x63"
+                         "\x43\x27\x13\xA9\xBE\xEB\xBD\xF3"
+                         "\x33\x62\x70\xE2\x1B\x86\x7A\xA1"
+                         "\x51\x4A\x16\xFE\x29\x63\x7E\xD0"
+                         "\x7A\xA4\x6E\x2C\xF8\xC1\xDB\xE8"
+                         "\xCB\x4D\xD2\x8C\x04\x14\xB4\x66"
+                         "\x41\xB7\x3A\x96\x16\x7C\x1D\x5B"
+                         "\xB6\x41\x42\x64\x43\xEE\x6E\x7C"
+                         "\x8B\xAF\x01\x9C\xA4\x6E\x75\x8F"
+                         "\xDE\x10\x9F\xA6\xE7\xD6\x44\x97"
+                         "\x66\xA3\x96\x0F\x1C\x25\x60\xF5"
+                         "\x3C\x2E\x32\x69\x0E\x82\xFF\x27"
+                         "\x0F\xB5\x06\xDA\xD8\x31\x15\x6C"
+                         "\xDF\x18\x6C\x87\xF5\x3B\x11\x9A"
+                         "\x1B\x42\x1F\x5B\x29\x19\x96\x13"
+                         "\x68\x2E\x5E\x08\x1C\x8F\x32\x4B"
+                         "\x81\x77\x6D\xF4\xA0\x01\x42\xEC"
+                         "\xDD\x5B\xFD\x3A\x8E\x6A\x14\xFB"
+                         "\x83\x54\xDF\x0F\x86\xB7\xEA\x40"
+                         "\x46\x39\xF7\x2A\x89\x8D\x4E\x96"
+                         "\x5F\x5F\x6D\x76\xC6\x13\x9D\x3D"
+                         "\x1D\x5F\x0C\x7D\xE2\xBC\xC2\x16"
+                         "\x16\xBE\x89\x3E\xB0\x61\xA2\x5D"
+                         "\xAF\xD1\x40\x5F\x1A\xB8\x26\x41"
+                         "\xC6\xBD\x36\xEF\xED\x29\x50\x6D"
+                         "\x10\xEF\x26\xE8\xA8\x93\x11\x3F"
+                         "\x2D\x1F\x88\x20\x77\x45\xF5\x66"
+                         "\x08\xB9\xF1\xEF\xB1\x93\xA8\x81"
+                         "\x65\xC5\xCD\x3E\x8C\x06\x60\x2C"
+                         "\xB2\x10\x7A\xCA\x05\x25\x59\xDB"
+                         "\xC7\x28\xF5\x20\x35\x52\x9E\x62"
+                         "\xF8\x88\x24\x1C\x4D\x84\x12\x39"
+                         "\x39\xE4\x2E\xF4\xD4\x9D\x2B\xBC"
+                         "\x87\x66\xE6\xC0\x6B\x31\x9A\x66"
+                         "\x03\xDC\x95\xD8\x6B\xD0\x30\x8F"
+                         "\xDF\x8F\x8D\xFA\xEC\x1F\x08\xBD"
+                         "\xA3\x63\xE2\x71\x4F\x03\x94\x87"
+                         "\x50\xDF\x15\x1F\xED\x3A\xA3\x7F"
+                         "\x1F\x2A\xB5\xA1\x69\xAC\x4B\x0D"
+                         "\x84\x9B\x2A\xE9\x55\xDD\x46\x91"
+                         "\x15\x33\xF3\x2B\x9B\x46\x97\x00"
+                         "\xF0\x29\xD8\x59\x5D\x33\x37\xF9"
+                         "\x58\x33\x9B\x78\xC7\x58\x48\x6B"
+                         "\x2C\x75\x64\xC4\xCA\xC1\x7E\xD5",
+               .ilen   = 496,
                .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
                          "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
                          "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
@@ -2831,8 +2993,62 @@ static struct cipher_testvec tf_dec_tv_template[] = {
                          "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
-                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C",
-               .rlen   = 64,
+                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
+               .rlen   = 496,
        },
 };
 
@@ -2894,8 +3110,62 @@ static struct cipher_testvec tf_cbc_enc_tv_template[] = {
                          "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
-                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C",
-               .ilen   = 64,
+                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
+               .ilen   = 496,
                .result = "\xC8\xFF\xF2\x53\xA6\x27\x09\xD1"
                          "\x33\x38\xC2\xC0\x0C\x14\x7E\xB5"
                          "\x26\x1B\x05\x0C\x05\x12\x3F\xC0"
@@ -2903,8 +3173,62 @@ static struct cipher_testvec tf_cbc_enc_tv_template[] = {
                          "\x3D\x32\xDF\xDA\x56\x00\x6E\xEE"
                          "\x5B\x2A\x72\x9D\xC2\x4D\x19\xBC"
                          "\x8C\x53\xFA\x87\x6F\xDD\x81\xA3"
-                         "\xB1\xD3\x44\x65\xDF\xE7\x63\x38",
-               .rlen   = 64,
+                         "\xB1\xD3\x44\x65\xDF\xE7\x63\x38"
+                         "\x4A\xFC\xDC\xEC\x3F\x26\x8E\xB8"
+                         "\x43\xFC\xFE\x18\xB5\x11\x6D\x31"
+                         "\x81\x8B\x0D\x75\xF6\x80\xEC\x84"
+                         "\x04\xB9\xE6\x09\x63\xED\x39\xDB"
+                         "\xC3\xF6\x14\xD6\x6E\x5E\x8B\xBD"
+                         "\x3E\xFA\xD7\x98\x50\x6F\xD9\x63"
+                         "\x02\xCD\x0D\x39\x4B\x0D\xEC\x80"
+                         "\xE3\x6A\x17\xF4\xCC\xAD\xFF\x68"
+                         "\x45\xDD\xC8\x83\x1D\x41\x96\x0D"
+                         "\x91\x2E\x05\xD3\x59\x82\xE0\x43"
+                         "\x90\x4F\xB9\xF7\xAD\x6B\x2E\xAF"
+                         "\xA7\x84\x00\x53\xCD\x6F\xD1\x0C"
+                         "\x4E\xF9\x5A\x23\xFB\xCA\xC7\xD3"
+                         "\xA9\xAA\x9D\xB2\x3F\x66\xF1\xAC"
+                         "\x25\x21\x8F\xF7\xEF\xF2\x6A\xDF"
+                         "\xE8\xDA\x75\x1A\x8A\xF1\xDD\x38"
+                         "\x1F\xF9\x3D\x68\x4A\xBB\x9E\x34"
+                         "\x1F\x66\x1F\x9C\x2B\x54\xFF\x60"
+                         "\x7F\x29\x4B\x55\x80\x8F\x4E\xA7"
+                         "\xA6\x9A\x0A\xD9\x0D\x19\x00\xF8"
+                         "\x1F\xBC\x0C\x40\x6B\xEC\x99\x25"
+                         "\x94\x70\x74\x0E\x1D\xC5\xBC\x12"
+                         "\xF3\x42\xBE\x95\xBF\xFB\x4E\x55"
+                         "\x9A\xB9\xCE\x14\x16\x5B\xDC\xD3"
+                         "\x75\x42\x62\x04\x31\x1F\x95\x7C"
+                         "\x66\x1A\x97\xDC\x2F\x40\x5C\x39"
+                         "\x78\xE6\x02\xDB\x49\xE1\xC6\x47"
+                         "\xC2\x78\x9A\xBB\xF3\xBE\xCB\x93"
+                         "\xD8\xB8\xE8\xBB\x8C\xB3\x9B\xA7"
+                         "\xC2\x89\xF3\x91\x88\x83\x3D\xF0"
+                         "\x29\xA2\xCD\xB5\x79\x16\xC2\x40"
+                         "\x11\x03\x8E\x9C\xFD\xC9\x43\xC4"
+                         "\xC2\x19\xF0\x4A\x32\xEF\x0C\x2B"
+                         "\xD3\x2B\xE9\xD4\x4C\xDE\x95\xCF"
+                         "\x04\x03\xD3\x2C\x7F\x82\xC8\xFA"
+                         "\x0F\xD8\x7A\x39\x7B\x01\x41\x9C"
+                         "\x78\xB6\xC9\xBF\xF9\x78\x57\x88"
+                         "\xB1\xA5\xE1\xE0\xD9\x16\xD4\xC8"
+                         "\xEE\xC4\xBE\x7B\x55\x59\x00\x48"
+                         "\x1B\xBC\x14\xFA\x2A\x9D\xC9\x1C"
+                         "\xFB\x28\x3F\x95\xDD\xB7\xD6\xCE"
+                         "\x3A\x7F\x09\x0C\x0E\x69\x30\x7D"
+                         "\xBC\x68\x9C\x91\x2A\x59\x57\x04"
+                         "\xED\x1A\x1E\x00\xB1\x85\x92\x04"
+                         "\x28\x8C\x0C\x3C\xC1\xD5\x12\xF7"
+                         "\x4C\x3E\xB0\xE7\x86\x62\x68\x91"
+                         "\xFC\xC4\xE2\xCE\xA6\xDC\x5E\x93"
+                         "\x5D\x8D\x8C\x68\xB3\xB2\xB9\x64"
+                         "\x16\xB8\xC8\x6F\xD8\xEE\x21\xBD"
+                         "\xAC\x18\x0C\x7D\x0D\x05\xAB\xF1"
+                         "\xFA\xDD\xE2\x48\xDF\x4C\x02\x39"
+                         "\x69\xA1\x62\xBD\x49\x3A\x9D\x91"
+                         "\x30\x70\x56\xA4\x37\xDD\x7C\xC0"
+                         "\x0A\xA3\x30\x10\x26\x25\x41\x2C",
+               .rlen   = 496,
        },
 };
 
@@ -2966,8 +3290,62 @@ static struct cipher_testvec tf_cbc_dec_tv_template[] = {
                          "\x3D\x32\xDF\xDA\x56\x00\x6E\xEE"
                          "\x5B\x2A\x72\x9D\xC2\x4D\x19\xBC"
                          "\x8C\x53\xFA\x87\x6F\xDD\x81\xA3"
-                         "\xB1\xD3\x44\x65\xDF\xE7\x63\x38",
-               .ilen   = 64,
+                         "\xB1\xD3\x44\x65\xDF\xE7\x63\x38"
+                         "\x4A\xFC\xDC\xEC\x3F\x26\x8E\xB8"
+                         "\x43\xFC\xFE\x18\xB5\x11\x6D\x31"
+                         "\x81\x8B\x0D\x75\xF6\x80\xEC\x84"
+                         "\x04\xB9\xE6\x09\x63\xED\x39\xDB"
+                         "\xC3\xF6\x14\xD6\x6E\x5E\x8B\xBD"
+                         "\x3E\xFA\xD7\x98\x50\x6F\xD9\x63"
+                         "\x02\xCD\x0D\x39\x4B\x0D\xEC\x80"
+                         "\xE3\x6A\x17\xF4\xCC\xAD\xFF\x68"
+                         "\x45\xDD\xC8\x83\x1D\x41\x96\x0D"
+                         "\x91\x2E\x05\xD3\x59\x82\xE0\x43"
+                         "\x90\x4F\xB9\xF7\xAD\x6B\x2E\xAF"
+                         "\xA7\x84\x00\x53\xCD\x6F\xD1\x0C"
+                         "\x4E\xF9\x5A\x23\xFB\xCA\xC7\xD3"
+                         "\xA9\xAA\x9D\xB2\x3F\x66\xF1\xAC"
+                         "\x25\x21\x8F\xF7\xEF\xF2\x6A\xDF"
+                         "\xE8\xDA\x75\x1A\x8A\xF1\xDD\x38"
+                         "\x1F\xF9\x3D\x68\x4A\xBB\x9E\x34"
+                         "\x1F\x66\x1F\x9C\x2B\x54\xFF\x60"
+                         "\x7F\x29\x4B\x55\x80\x8F\x4E\xA7"
+                         "\xA6\x9A\x0A\xD9\x0D\x19\x00\xF8"
+                         "\x1F\xBC\x0C\x40\x6B\xEC\x99\x25"
+                         "\x94\x70\x74\x0E\x1D\xC5\xBC\x12"
+                         "\xF3\x42\xBE\x95\xBF\xFB\x4E\x55"
+                         "\x9A\xB9\xCE\x14\x16\x5B\xDC\xD3"
+                         "\x75\x42\x62\x04\x31\x1F\x95\x7C"
+                         "\x66\x1A\x97\xDC\x2F\x40\x5C\x39"
+                         "\x78\xE6\x02\xDB\x49\xE1\xC6\x47"
+                         "\xC2\x78\x9A\xBB\xF3\xBE\xCB\x93"
+                         "\xD8\xB8\xE8\xBB\x8C\xB3\x9B\xA7"
+                         "\xC2\x89\xF3\x91\x88\x83\x3D\xF0"
+                         "\x29\xA2\xCD\xB5\x79\x16\xC2\x40"
+                         "\x11\x03\x8E\x9C\xFD\xC9\x43\xC4"
+                         "\xC2\x19\xF0\x4A\x32\xEF\x0C\x2B"
+                         "\xD3\x2B\xE9\xD4\x4C\xDE\x95\xCF"
+                         "\x04\x03\xD3\x2C\x7F\x82\xC8\xFA"
+                         "\x0F\xD8\x7A\x39\x7B\x01\x41\x9C"
+                         "\x78\xB6\xC9\xBF\xF9\x78\x57\x88"
+                         "\xB1\xA5\xE1\xE0\xD9\x16\xD4\xC8"
+                         "\xEE\xC4\xBE\x7B\x55\x59\x00\x48"
+                         "\x1B\xBC\x14\xFA\x2A\x9D\xC9\x1C"
+                         "\xFB\x28\x3F\x95\xDD\xB7\xD6\xCE"
+                         "\x3A\x7F\x09\x0C\x0E\x69\x30\x7D"
+                         "\xBC\x68\x9C\x91\x2A\x59\x57\x04"
+                         "\xED\x1A\x1E\x00\xB1\x85\x92\x04"
+                         "\x28\x8C\x0C\x3C\xC1\xD5\x12\xF7"
+                         "\x4C\x3E\xB0\xE7\x86\x62\x68\x91"
+                         "\xFC\xC4\xE2\xCE\xA6\xDC\x5E\x93"
+                         "\x5D\x8D\x8C\x68\xB3\xB2\xB9\x64"
+                         "\x16\xB8\xC8\x6F\xD8\xEE\x21\xBD"
+                         "\xAC\x18\x0C\x7D\x0D\x05\xAB\xF1"
+                         "\xFA\xDD\xE2\x48\xDF\x4C\x02\x39"
+                         "\x69\xA1\x62\xBD\x49\x3A\x9D\x91"
+                         "\x30\x70\x56\xA4\x37\xDD\x7C\xC0"
+                         "\x0A\xA3\x30\x10\x26\x25\x41\x2C",
+               .ilen   = 496,
                .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
                          "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
                          "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
@@ -2975,8 +3353,62 @@ static struct cipher_testvec tf_cbc_dec_tv_template[] = {
                          "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
-                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C",
-               .rlen   = 64,
+                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
+               .rlen   = 496,
        },
 };
 
@@ -2996,8 +3428,62 @@ static struct cipher_testvec tf_ctr_enc_tv_template[] = {
                          "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
-                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C",
-               .ilen   = 64,
+                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
+               .ilen   = 496,
                .result = "\xDF\xDD\x69\xFA\xB0\x2E\xFD\xFE"
                          "\x70\x9E\xC5\x4B\xC9\xD4\xA1\x30"
                          "\x26\x9B\x89\xA1\xEE\x43\xE0\x52"
@@ -3005,8 +3491,62 @@ static struct cipher_testvec tf_ctr_enc_tv_template[] = {
                          "\x9F\x8D\x40\x9F\x24\xFD\x92\xA0"
                          "\xBC\x8F\x35\xDD\x67\x38\xD8\xAA"
                          "\xCF\xF8\x48\xCA\xFB\xE4\x5C\x60"
-                         "\x01\x41\x21\x12\x38\xAB\x52\x4F",
-               .rlen   = 64,
+                         "\x01\x41\x21\x12\x38\xAB\x52\x4F"
+                         "\xA8\x57\x20\xE0\x21\x6A\x17\x0D"
+                         "\x0E\xF9\x8E\x49\x42\x00\x3C\x94"
+                         "\x14\xC0\xD0\x8D\x8A\x98\xEB\x29"
+                         "\xEC\xAE\x96\x44\xC0\x3C\x48\xDC"
+                         "\x29\x35\x25\x2F\xE7\x11\x6C\x68"
+                         "\xC8\x67\x0A\x2F\xF4\x07\xBE\xF9"
+                         "\x2C\x31\x87\x40\xAB\xB2\xB6\xFA"
+                         "\xD2\xC9\x6D\x5C\x50\xE9\xE6\x7E"
+                         "\xE3\x0A\xD2\xD5\x6D\x8D\x64\x9E"
+                         "\x70\xCE\x03\x76\xDD\xE0\xF0\x8C"
+                         "\x84\x86\x8B\x6A\xFE\xC7\xF9\x69"
+                         "\x2E\xFE\xFC\xC2\xC4\x1A\x55\x58"
+                         "\xB3\xBE\xE2\x7E\xED\x39\x42\x6C"
+                         "\xB4\x42\x97\x9A\xEC\xE1\x0A\x06"
+                         "\x02\xC5\x03\x9D\xC4\x48\x15\x66"
+                         "\x35\x6A\xC2\xC9\xA2\x26\x30\xBB"
+                         "\xDB\x2D\xC8\x08\x2B\xA0\x29\x1A"
+                         "\x23\x61\x48\xEA\x80\x04\x27\xAA"
+                         "\x69\x49\xE8\xE8\x4A\x83\x6B\x5A"
+                         "\xCA\x7C\xD3\xB1\xB5\x0B\xCC\x23"
+                         "\x74\x1F\xA9\x87\xCD\xED\xC0\x2D"
+                         "\xBF\xEB\xCF\x16\x2D\x2A\x2E\x1D"
+                         "\x96\xBA\x36\x11\x45\x41\xDA\xCE"
+                         "\xA4\x48\x80\x8B\x06\xF4\x98\x89"
+                         "\x8B\x23\x08\x53\xF4\xD4\x5A\x24"
+                         "\x8B\xF8\x43\x73\xD1\xEE\xC4\xB0"
+                         "\xF8\xFE\x09\x0C\x75\x05\x38\x0B"
+                         "\x7C\x81\xDE\x9D\xE4\x61\x37\x63"
+                         "\x63\xAD\x12\xD2\x04\xB9\xCE\x45"
+                         "\x5A\x1A\x6E\xB3\x78\x2A\xA4\x74"
+                         "\x86\xD0\xE3\xFF\xDA\x38\x9C\xB5"
+                         "\xB8\xB1\xDB\x38\x2F\xC5\x6A\xB4"
+                         "\xEB\x6E\x96\xE8\x43\x80\xB5\x51"
+                         "\x61\x2D\x48\xAA\x07\x65\x11\x8C"
+                         "\x48\xE3\x90\x7E\x78\x3A\xEC\x97"
+                         "\x05\x3D\x84\xE7\x90\x2B\xAA\xBD"
+                         "\x83\x29\x0E\x1A\x81\x73\x7B\xE0"
+                         "\x7A\x01\x4A\x37\x3B\x77\x7F\x8D"
+                         "\x49\xA4\x2F\x6E\xBE\x68\x99\x08"
+                         "\x99\xAA\x4C\x12\x04\xAE\x1F\x77"
+                         "\x35\x88\xF1\x65\x06\x0A\x0B\x4D"
+                         "\x47\xF9\x50\x38\x5D\x71\xF9\x6E"
+                         "\xDE\xEC\x61\x35\x2C\x4C\x96\x50"
+                         "\xE8\x28\x93\x9C\x7E\x01\xC6\x04"
+                         "\xB2\xD6\xBC\x6C\x17\xEB\xC1\x7D"
+                         "\x11\xE9\x43\x83\x76\xAA\x53\x37"
+                         "\x0C\x1D\x39\x89\x53\x72\x09\x7E"
+                         "\xD9\x85\x16\x04\xA5\x2C\x05\x6F"
+                         "\x17\x0C\x6E\x66\xAA\x84\xA7\xD9"
+                         "\xE2\xD9\xC4\xEB\x43\x3E\xB1\x8D"
+                         "\x7C\x36\xC7\x71\x70\x9C\x10\xD8"
+                         "\xE8\x47\x2A\x4D\xFD\xA1\xBC\xE3"
+                         "\xB9\x32\xE2\xC1\x82\xAC\xFE\xCC"
+                         "\xC5\xC9\x7F\x9E\xCF\x33\x7A\xDF",
+               .rlen   = 496,
        }, { /* Generated with Crypto++ */
                .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
                          "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
@@ -3023,8 +3563,62 @@ static struct cipher_testvec tf_ctr_enc_tv_template[] = {
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
                          "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
-                         "\xC3\x37\xCE",
-               .ilen   = 67,
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7"
+                         "\x2B\xC2\x59",
+               .ilen   = 499,
                .result = "\xDF\xDD\x69\xFA\xB0\x2E\xFD\xFE"
                          "\x70\x9E\xC5\x4B\xC9\xD4\xA1\x30"
                          "\x26\x9B\x89\xA1\xEE\x43\xE0\x52"
@@ -3033,8 +3627,62 @@ static struct cipher_testvec tf_ctr_enc_tv_template[] = {
                          "\xBC\x8F\x35\xDD\x67\x38\xD8\xAA"
                          "\xCF\xF8\x48\xCA\xFB\xE4\x5C\x60"
                          "\x01\x41\x21\x12\x38\xAB\x52\x4F"
-                         "\xA8\x57\x20",
-               .rlen   = 67,
+                         "\xA8\x57\x20\xE0\x21\x6A\x17\x0D"
+                         "\x0E\xF9\x8E\x49\x42\x00\x3C\x94"
+                         "\x14\xC0\xD0\x8D\x8A\x98\xEB\x29"
+                         "\xEC\xAE\x96\x44\xC0\x3C\x48\xDC"
+                         "\x29\x35\x25\x2F\xE7\x11\x6C\x68"
+                         "\xC8\x67\x0A\x2F\xF4\x07\xBE\xF9"
+                         "\x2C\x31\x87\x40\xAB\xB2\xB6\xFA"
+                         "\xD2\xC9\x6D\x5C\x50\xE9\xE6\x7E"
+                         "\xE3\x0A\xD2\xD5\x6D\x8D\x64\x9E"
+                         "\x70\xCE\x03\x76\xDD\xE0\xF0\x8C"
+                         "\x84\x86\x8B\x6A\xFE\xC7\xF9\x69"
+                         "\x2E\xFE\xFC\xC2\xC4\x1A\x55\x58"
+                         "\xB3\xBE\xE2\x7E\xED\x39\x42\x6C"
+                         "\xB4\x42\x97\x9A\xEC\xE1\x0A\x06"
+                         "\x02\xC5\x03\x9D\xC4\x48\x15\x66"
+                         "\x35\x6A\xC2\xC9\xA2\x26\x30\xBB"
+                         "\xDB\x2D\xC8\x08\x2B\xA0\x29\x1A"
+                         "\x23\x61\x48\xEA\x80\x04\x27\xAA"
+                         "\x69\x49\xE8\xE8\x4A\x83\x6B\x5A"
+                         "\xCA\x7C\xD3\xB1\xB5\x0B\xCC\x23"
+                         "\x74\x1F\xA9\x87\xCD\xED\xC0\x2D"
+                         "\xBF\xEB\xCF\x16\x2D\x2A\x2E\x1D"
+                         "\x96\xBA\x36\x11\x45\x41\xDA\xCE"
+                         "\xA4\x48\x80\x8B\x06\xF4\x98\x89"
+                         "\x8B\x23\x08\x53\xF4\xD4\x5A\x24"
+                         "\x8B\xF8\x43\x73\xD1\xEE\xC4\xB0"
+                         "\xF8\xFE\x09\x0C\x75\x05\x38\x0B"
+                         "\x7C\x81\xDE\x9D\xE4\x61\x37\x63"
+                         "\x63\xAD\x12\xD2\x04\xB9\xCE\x45"
+                         "\x5A\x1A\x6E\xB3\x78\x2A\xA4\x74"
+                         "\x86\xD0\xE3\xFF\xDA\x38\x9C\xB5"
+                         "\xB8\xB1\xDB\x38\x2F\xC5\x6A\xB4"
+                         "\xEB\x6E\x96\xE8\x43\x80\xB5\x51"
+                         "\x61\x2D\x48\xAA\x07\x65\x11\x8C"
+                         "\x48\xE3\x90\x7E\x78\x3A\xEC\x97"
+                         "\x05\x3D\x84\xE7\x90\x2B\xAA\xBD"
+                         "\x83\x29\x0E\x1A\x81\x73\x7B\xE0"
+                         "\x7A\x01\x4A\x37\x3B\x77\x7F\x8D"
+                         "\x49\xA4\x2F\x6E\xBE\x68\x99\x08"
+                         "\x99\xAA\x4C\x12\x04\xAE\x1F\x77"
+                         "\x35\x88\xF1\x65\x06\x0A\x0B\x4D"
+                         "\x47\xF9\x50\x38\x5D\x71\xF9\x6E"
+                         "\xDE\xEC\x61\x35\x2C\x4C\x96\x50"
+                         "\xE8\x28\x93\x9C\x7E\x01\xC6\x04"
+                         "\xB2\xD6\xBC\x6C\x17\xEB\xC1\x7D"
+                         "\x11\xE9\x43\x83\x76\xAA\x53\x37"
+                         "\x0C\x1D\x39\x89\x53\x72\x09\x7E"
+                         "\xD9\x85\x16\x04\xA5\x2C\x05\x6F"
+                         "\x17\x0C\x6E\x66\xAA\x84\xA7\xD9"
+                         "\xE2\xD9\xC4\xEB\x43\x3E\xB1\x8D"
+                         "\x7C\x36\xC7\x71\x70\x9C\x10\xD8"
+                         "\xE8\x47\x2A\x4D\xFD\xA1\xBC\xE3"
+                         "\xB9\x32\xE2\xC1\x82\xAC\xFE\xCC"
+                         "\xC5\xC9\x7F\x9E\xCF\x33\x7A\xDF"
+                         "\x6C\x82\x9D",
+               .rlen   = 499,
        },
 };
 
@@ -3054,8 +3702,62 @@ static struct cipher_testvec tf_ctr_dec_tv_template[] = {
                          "\x9F\x8D\x40\x9F\x24\xFD\x92\xA0"
                          "\xBC\x8F\x35\xDD\x67\x38\xD8\xAA"
                          "\xCF\xF8\x48\xCA\xFB\xE4\x5C\x60"
-                         "\x01\x41\x21\x12\x38\xAB\x52\x4F",
-               .ilen   = 64,
+                         "\x01\x41\x21\x12\x38\xAB\x52\x4F"
+                         "\xA8\x57\x20\xE0\x21\x6A\x17\x0D"
+                         "\x0E\xF9\x8E\x49\x42\x00\x3C\x94"
+                         "\x14\xC0\xD0\x8D\x8A\x98\xEB\x29"
+                         "\xEC\xAE\x96\x44\xC0\x3C\x48\xDC"
+                         "\x29\x35\x25\x2F\xE7\x11\x6C\x68"
+                         "\xC8\x67\x0A\x2F\xF4\x07\xBE\xF9"
+                         "\x2C\x31\x87\x40\xAB\xB2\xB6\xFA"
+                         "\xD2\xC9\x6D\x5C\x50\xE9\xE6\x7E"
+                         "\xE3\x0A\xD2\xD5\x6D\x8D\x64\x9E"
+                         "\x70\xCE\x03\x76\xDD\xE0\xF0\x8C"
+                         "\x84\x86\x8B\x6A\xFE\xC7\xF9\x69"
+                         "\x2E\xFE\xFC\xC2\xC4\x1A\x55\x58"
+                         "\xB3\xBE\xE2\x7E\xED\x39\x42\x6C"
+                         "\xB4\x42\x97\x9A\xEC\xE1\x0A\x06"
+                         "\x02\xC5\x03\x9D\xC4\x48\x15\x66"
+                         "\x35\x6A\xC2\xC9\xA2\x26\x30\xBB"
+                         "\xDB\x2D\xC8\x08\x2B\xA0\x29\x1A"
+                         "\x23\x61\x48\xEA\x80\x04\x27\xAA"
+                         "\x69\x49\xE8\xE8\x4A\x83\x6B\x5A"
+                         "\xCA\x7C\xD3\xB1\xB5\x0B\xCC\x23"
+                         "\x74\x1F\xA9\x87\xCD\xED\xC0\x2D"
+                         "\xBF\xEB\xCF\x16\x2D\x2A\x2E\x1D"
+                         "\x96\xBA\x36\x11\x45\x41\xDA\xCE"
+                         "\xA4\x48\x80\x8B\x06\xF4\x98\x89"
+                         "\x8B\x23\x08\x53\xF4\xD4\x5A\x24"
+                         "\x8B\xF8\x43\x73\xD1\xEE\xC4\xB0"
+                         "\xF8\xFE\x09\x0C\x75\x05\x38\x0B"
+                         "\x7C\x81\xDE\x9D\xE4\x61\x37\x63"
+                         "\x63\xAD\x12\xD2\x04\xB9\xCE\x45"
+                         "\x5A\x1A\x6E\xB3\x78\x2A\xA4\x74"
+                         "\x86\xD0\xE3\xFF\xDA\x38\x9C\xB5"
+                         "\xB8\xB1\xDB\x38\x2F\xC5\x6A\xB4"
+                         "\xEB\x6E\x96\xE8\x43\x80\xB5\x51"
+                         "\x61\x2D\x48\xAA\x07\x65\x11\x8C"
+                         "\x48\xE3\x90\x7E\x78\x3A\xEC\x97"
+                         "\x05\x3D\x84\xE7\x90\x2B\xAA\xBD"
+                         "\x83\x29\x0E\x1A\x81\x73\x7B\xE0"
+                         "\x7A\x01\x4A\x37\x3B\x77\x7F\x8D"
+                         "\x49\xA4\x2F\x6E\xBE\x68\x99\x08"
+                         "\x99\xAA\x4C\x12\x04\xAE\x1F\x77"
+                         "\x35\x88\xF1\x65\x06\x0A\x0B\x4D"
+                         "\x47\xF9\x50\x38\x5D\x71\xF9\x6E"
+                         "\xDE\xEC\x61\x35\x2C\x4C\x96\x50"
+                         "\xE8\x28\x93\x9C\x7E\x01\xC6\x04"
+                         "\xB2\xD6\xBC\x6C\x17\xEB\xC1\x7D"
+                         "\x11\xE9\x43\x83\x76\xAA\x53\x37"
+                         "\x0C\x1D\x39\x89\x53\x72\x09\x7E"
+                         "\xD9\x85\x16\x04\xA5\x2C\x05\x6F"
+                         "\x17\x0C\x6E\x66\xAA\x84\xA7\xD9"
+                         "\xE2\xD9\xC4\xEB\x43\x3E\xB1\x8D"
+                         "\x7C\x36\xC7\x71\x70\x9C\x10\xD8"
+                         "\xE8\x47\x2A\x4D\xFD\xA1\xBC\xE3"
+                         "\xB9\x32\xE2\xC1\x82\xAC\xFE\xCC"
+                         "\xC5\xC9\x7F\x9E\xCF\x33\x7A\xDF",
+               .ilen   = 496,
                .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
                          "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
                          "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
@@ -3063,8 +3765,62 @@ static struct cipher_testvec tf_ctr_dec_tv_template[] = {
                          "\x1E\x92\x29\xC0\x34\xCB\x62\xF9"
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
-                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C",
-               .rlen   = 64,
+                         "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
+               .rlen   = 496,
        }, { /* Generated with Crypto++ */
                .key    = "\x85\x62\x3F\x1C\xF9\xD6\x1C\xF9"
                          "\xD6\xB3\x90\x6D\x4A\x90\x6D\x4A"
@@ -3081,8 +3837,62 @@ static struct cipher_testvec tf_ctr_dec_tv_template[] = {
                          "\xBC\x8F\x35\xDD\x67\x38\xD8\xAA"
                          "\xCF\xF8\x48\xCA\xFB\xE4\x5C\x60"
                          "\x01\x41\x21\x12\x38\xAB\x52\x4F"
-                         "\xA8\x57\x20",
-               .ilen   = 67,
+                         "\xA8\x57\x20\xE0\x21\x6A\x17\x0D"
+                         "\x0E\xF9\x8E\x49\x42\x00\x3C\x94"
+                         "\x14\xC0\xD0\x8D\x8A\x98\xEB\x29"
+                         "\xEC\xAE\x96\x44\xC0\x3C\x48\xDC"
+                         "\x29\x35\x25\x2F\xE7\x11\x6C\x68"
+                         "\xC8\x67\x0A\x2F\xF4\x07\xBE\xF9"
+                         "\x2C\x31\x87\x40\xAB\xB2\xB6\xFA"
+                         "\xD2\xC9\x6D\x5C\x50\xE9\xE6\x7E"
+                         "\xE3\x0A\xD2\xD5\x6D\x8D\x64\x9E"
+                         "\x70\xCE\x03\x76\xDD\xE0\xF0\x8C"
+                         "\x84\x86\x8B\x6A\xFE\xC7\xF9\x69"
+                         "\x2E\xFE\xFC\xC2\xC4\x1A\x55\x58"
+                         "\xB3\xBE\xE2\x7E\xED\x39\x42\x6C"
+                         "\xB4\x42\x97\x9A\xEC\xE1\x0A\x06"
+                         "\x02\xC5\x03\x9D\xC4\x48\x15\x66"
+                         "\x35\x6A\xC2\xC9\xA2\x26\x30\xBB"
+                         "\xDB\x2D\xC8\x08\x2B\xA0\x29\x1A"
+                         "\x23\x61\x48\xEA\x80\x04\x27\xAA"
+                         "\x69\x49\xE8\xE8\x4A\x83\x6B\x5A"
+                         "\xCA\x7C\xD3\xB1\xB5\x0B\xCC\x23"
+                         "\x74\x1F\xA9\x87\xCD\xED\xC0\x2D"
+                         "\xBF\xEB\xCF\x16\x2D\x2A\x2E\x1D"
+                         "\x96\xBA\x36\x11\x45\x41\xDA\xCE"
+                         "\xA4\x48\x80\x8B\x06\xF4\x98\x89"
+                         "\x8B\x23\x08\x53\xF4\xD4\x5A\x24"
+                         "\x8B\xF8\x43\x73\xD1\xEE\xC4\xB0"
+                         "\xF8\xFE\x09\x0C\x75\x05\x38\x0B"
+                         "\x7C\x81\xDE\x9D\xE4\x61\x37\x63"
+                         "\x63\xAD\x12\xD2\x04\xB9\xCE\x45"
+                         "\x5A\x1A\x6E\xB3\x78\x2A\xA4\x74"
+                         "\x86\xD0\xE3\xFF\xDA\x38\x9C\xB5"
+                         "\xB8\xB1\xDB\x38\x2F\xC5\x6A\xB4"
+                         "\xEB\x6E\x96\xE8\x43\x80\xB5\x51"
+                         "\x61\x2D\x48\xAA\x07\x65\x11\x8C"
+                         "\x48\xE3\x90\x7E\x78\x3A\xEC\x97"
+                         "\x05\x3D\x84\xE7\x90\x2B\xAA\xBD"
+                         "\x83\x29\x0E\x1A\x81\x73\x7B\xE0"
+                         "\x7A\x01\x4A\x37\x3B\x77\x7F\x8D"
+                         "\x49\xA4\x2F\x6E\xBE\x68\x99\x08"
+                         "\x99\xAA\x4C\x12\x04\xAE\x1F\x77"
+                         "\x35\x88\xF1\x65\x06\x0A\x0B\x4D"
+                         "\x47\xF9\x50\x38\x5D\x71\xF9\x6E"
+                         "\xDE\xEC\x61\x35\x2C\x4C\x96\x50"
+                         "\xE8\x28\x93\x9C\x7E\x01\xC6\x04"
+                         "\xB2\xD6\xBC\x6C\x17\xEB\xC1\x7D"
+                         "\x11\xE9\x43\x83\x76\xAA\x53\x37"
+                         "\x0C\x1D\x39\x89\x53\x72\x09\x7E"
+                         "\xD9\x85\x16\x04\xA5\x2C\x05\x6F"
+                         "\x17\x0C\x6E\x66\xAA\x84\xA7\xD9"
+                         "\xE2\xD9\xC4\xEB\x43\x3E\xB1\x8D"
+                         "\x7C\x36\xC7\x71\x70\x9C\x10\xD8"
+                         "\xE8\x47\x2A\x4D\xFD\xA1\xBC\xE3"
+                         "\xB9\x32\xE2\xC1\x82\xAC\xFE\xCC"
+                         "\xC5\xC9\x7F\x9E\xCF\x33\x7A\xDF"
+                         "\x6C\x82\x9D",
+               .ilen   = 499,
                .result = "\x56\xED\x84\x1B\x8F\x26\xBD\x31"
                          "\xC8\x5F\xF6\x6A\x01\x98\x0C\xA3"
                          "\x3A\xD1\x45\xDC\x73\x0A\x7E\x15"
@@ -3091,8 +3901,62 @@ static struct cipher_testvec tf_ctr_dec_tv_template[] = {
                          "\x6D\x04\x9B\x0F\xA6\x3D\xD4\x48"
                          "\xDF\x76\x0D\x81\x18\xAF\x23\xBA"
                          "\x51\xE8\x5C\xF3\x8A\x21\x95\x2C"
-                         "\xC3\x37\xCE",
-               .rlen   = 67,
+                         "\xC3\x37\xCE\x65\xFC\x70\x07\x9E"
+                         "\x12\xA9\x40\xD7\x4B\xE2\x79\x10"
+                         "\x84\x1B\xB2\x26\xBD\x54\xEB\x5F"
+                         "\xF6\x8D\x01\x98\x2F\xC6\x3A\xD1"
+                         "\x68\xFF\x73\x0A\xA1\x15\xAC\x43"
+                         "\xDA\x4E\xE5\x7C\x13\x87\x1E\xB5"
+                         "\x29\xC0\x57\xEE\x62\xF9\x90\x04"
+                         "\x9B\x32\xC9\x3D\xD4\x6B\x02\x76"
+                         "\x0D\xA4\x18\xAF\x46\xDD\x51\xE8"
+                         "\x7F\x16\x8A\x21\xB8\x2C\xC3\x5A"
+                         "\xF1\x65\xFC\x93\x07\x9E\x35\xCC"
+                         "\x40\xD7\x6E\x05\x79\x10\xA7\x1B"
+                         "\xB2\x49\xE0\x54\xEB\x82\x19\x8D"
+                         "\x24\xBB\x2F\xC6\x5D\xF4\x68\xFF"
+                         "\x96\x0A\xA1\x38\xCF\x43\xDA\x71"
+                         "\x08\x7C\x13\xAA\x1E\xB5\x4C\xE3"
+                         "\x57\xEE\x85\x1C\x90\x27\xBE\x32"
+                         "\xC9\x60\xF7\x6B\x02\x99\x0D\xA4"
+                         "\x3B\xD2\x46\xDD\x74\x0B\x7F\x16"
+                         "\xAD\x21\xB8\x4F\xE6\x5A\xF1\x88"
+                         "\x1F\x93\x2A\xC1\x35\xCC\x63\xFA"
+                         "\x6E\x05\x9C\x10\xA7\x3E\xD5\x49"
+                         "\xE0\x77\x0E\x82\x19\xB0\x24\xBB"
+                         "\x52\xE9\x5D\xF4\x8B\x22\x96\x2D"
+                         "\xC4\x38\xCF\x66\xFD\x71\x08\x9F"
+                         "\x13\xAA\x41\xD8\x4C\xE3\x7A\x11"
+                         "\x85\x1C\xB3\x27\xBE\x55\xEC\x60"
+                         "\xF7\x8E\x02\x99\x30\xC7\x3B\xD2"
+                         "\x69\x00\x74\x0B\xA2\x16\xAD\x44"
+                         "\xDB\x4F\xE6\x7D\x14\x88\x1F\xB6"
+                         "\x2A\xC1\x58\xEF\x63\xFA\x91\x05"
+                         "\x9C\x33\xCA\x3E\xD5\x6C\x03\x77"
+                         "\x0E\xA5\x19\xB0\x47\xDE\x52\xE9"
+                         "\x80\x17\x8B\x22\xB9\x2D\xC4\x5B"
+                         "\xF2\x66\xFD\x94\x08\x9F\x36\xCD"
+                         "\x41\xD8\x6F\x06\x7A\x11\xA8\x1C"
+                         "\xB3\x4A\xE1\x55\xEC\x83\x1A\x8E"
+                         "\x25\xBC\x30\xC7\x5E\xF5\x69\x00"
+                         "\x97\x0B\xA2\x39\xD0\x44\xDB\x72"
+                         "\x09\x7D\x14\xAB\x1F\xB6\x4D\xE4"
+                         "\x58\xEF\x86\x1D\x91\x28\xBF\x33"
+                         "\xCA\x61\xF8\x6C\x03\x9A\x0E\xA5"
+                         "\x3C\xD3\x47\xDE\x75\x0C\x80\x17"
+                         "\xAE\x22\xB9\x50\xE7\x5B\xF2\x89"
+                         "\x20\x94\x2B\xC2\x36\xCD\x64\xFB"
+                         "\x6F\x06\x9D\x11\xA8\x3F\xD6\x4A"
+                         "\xE1\x78\x0F\x83\x1A\xB1\x25\xBC"
+                         "\x53\xEA\x5E\xF5\x8C\x00\x97\x2E"
+                         "\xC5\x39\xD0\x67\xFE\x72\x09\xA0"
+                         "\x14\xAB\x42\xD9\x4D\xE4\x7B\x12"
+                         "\x86\x1D\xB4\x28\xBF\x56\xED\x61"
+                         "\xF8\x8F\x03\x9A\x31\xC8\x3C\xD3"
+                         "\x6A\x01\x75\x0C\xA3\x17\xAE\x45"
+                         "\xDC\x50\xE7\x7E\x15\x89\x20\xB7"
+                         "\x2B\xC2\x59",
+               .rlen   = 499,
        },
 };