Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[pandora-kernel.git] / crypto / testmgr.h
index 36e5a8e..f8179e0 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,
        },
 };
 
@@ -6111,6 +6975,9 @@ static struct cipher_testvec cast6_dec_tv_template[] = {
 #define AES_DEC_TEST_VECTORS 3
 #define AES_CBC_ENC_TEST_VECTORS 4
 #define AES_CBC_DEC_TEST_VECTORS 4
+#define HMAC_SHA1_AES_CBC_ENC_TEST_VECTORS 7
+#define HMAC_SHA256_AES_CBC_ENC_TEST_VECTORS 7
+#define HMAC_SHA512_AES_CBC_ENC_TEST_VECTORS 7
 #define AES_LRW_ENC_TEST_VECTORS 8
 #define AES_LRW_DEC_TEST_VECTORS 8
 #define AES_XTS_ENC_TEST_VECTORS 5
@@ -6368,6 +7235,837 @@ static struct cipher_testvec aes_cbc_dec_tv_template[] = {
        },
 };
 
+static struct aead_testvec hmac_sha1_aes_cbc_enc_tv_template[] = {
+       { /* RFC 3602 Case 1 */
+#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\x10"    /* enc key length */
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00"
+                         "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"
+                         "\x51\x2e\x03\xd5\x34\x12\x00\x06",
+               .klen   = 8 + 20 + 16,
+               .iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
+                         "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
+               .input  = "Single block msg",
+               .ilen   = 16,
+               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
+                         "\x27\x08\x94\x2d\xbe\x77\x18\x1a"
+                         "\x1b\x13\xcb\xaf\x89\x5e\xe1\x2c"
+                         "\x13\xc5\x2e\xa3\xcc\xed\xdc\xb5"
+                         "\x03\x71\xa2\x06",
+               .rlen   = 16 + 20,
+       }, { /* RFC 3602 Case 2 */
+#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\x10"    /* enc key length */
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33"
+                         "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"
+                         "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",
+               .klen   = 8 + 20 + 16,
+               .iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
+                         "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
+               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
+               .ilen   = 32,
+               .result = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"
+                         "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"
+                         "\x75\x86\x60\x2d\x25\x3c\xff\xf9"
+                         "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1"
+                         "\xad\x9b\x4c\x5c\x85\xe1\xda\xae"
+                         "\xee\x81\x4e\xd7\xdb\x74\xcf\x58"
+                         "\x65\x39\xf8\xde",
+               .rlen   = 32 + 20,
+       }, { /* RFC 3602 Case 3 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55"
+                         "\x6c\x3e\xa0\x47\x76\x30\xce\x21"
+                         "\xa2\xce\x33\x4a\xa7\x46\xc2\xcd",
+               .klen   = 8 + 20 + 16,
+               .iv     = "\xc7\x82\xdc\x4c\x09\x8c\x66\xcb"
+                         "\xd9\xcd\x27\xd8\x25\x68\x2c\x81",
+               .input  = "This is a 48-byte message (exactly 3 AES blocks)",
+               .ilen   = 48,
+               .result = "\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"
+                         "\x02\x1c\x19\x21\x6b\xad\x52\x5c"
+                         "\x85\x79\x69\x5d\x83\xba\x26\x84"
+                         "\xc2\xec\x0c\xf8\x7f\x05\xba\xca"
+                         "\xff\xee\x4c\xd0\x93\xe6\x36\x7f"
+                         "\x8d\x62\xf2\x1e",
+               .rlen   = 48 + 20,
+       }, { /* RFC 3602 Case 4 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55"
+                         "\x56\xe4\x7a\x38\xc5\x59\x89\x74"
+                         "\xbc\x46\x90\x3d\xba\x29\x03\x49",
+               .klen   = 8 + 20 + 16,
+               .iv     = "\x8c\xe8\x2e\xef\xbe\xa0\xda\x3c"
+                         "\x44\x69\x9e\xd7\xdb\x51\xb7\xd9",
+               .input  = "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
+               .ilen   = 64,
+               .result = "\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"
+                         "\x35\x90\x7a\xa6\x32\xc3\xff\xdf"
+                         "\x86\x8b\xb7\xb2\x9d\x3d\x46\xad"
+                         "\x83\xce\x9f\x9a\x10\x2e\xe9\x9d"
+                         "\x49\xa5\x3e\x87\xf4\xc3\xda\x55"
+                         "\x1c\x45\x57\xa9\x56\xcb\xa9\x2d"
+                         "\x18\xac\xf1\xc7\x5d\xd1\xcd\x0d"
+                         "\x1d\xbe\xc6\xe9",
+               .rlen   = 64 + 20,
+       }, { /* RFC 3602 Case 5 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55"
+                         "\x90\xd3\x82\xb4\x10\xee\xba\x7a"
+                         "\xd9\x38\xc4\x6c\xec\x1a\x82\xbf",
+               .klen   = 8 + 20 + 16,
+               .iv     = "\xe9\x6e\x8c\x08\xab\x46\x57\x63"
+                         "\xfd\x09\x8d\x45\xdd\x3f\xf8\x93",
+               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01",
+               .alen   = 8,
+               .input  = "\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"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\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"
+                         "\xa9\x45\x3e\x19\x4e\x12\x08\x49"
+                         "\xa4\x87\x0b\x66\xcc\x6b\x99\x65"
+                         "\x33\x00\x13\xb4\x89\x8d\xc8\x56"
+                         "\xa4\x69\x9e\x52\x3a\x55\xdb\x08"
+                         "\x0b\x59\xec\x3a\x8e\x4b\x7e\x52"
+                         "\x77\x5b\x07\xd1\xdb\x34\xed\x9c"
+                         "\x53\x8a\xb5\x0c\x55\x1b\x87\x4a"
+                         "\xa2\x69\xad\xd0\x47\xad\x2d\x59"
+                         "\x13\xac\x19\xb7\xcf\xba\xd4\xa6"
+                         "\x58\xc6\x84\x75\xe4\xe9\x6b\x0c"
+                         "\xe1\xc5\x0b\x73\x4d\x82\x55\xa8"
+                         "\x85\xe1\x59\xf7",
+               .rlen   = 80 + 20,
+       }, { /* NIST SP800-38A F.2.3 CBC-AES192.Encrypt */
+#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\x18"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55"
+                         "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"
+                         "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
+                         "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",
+               .klen   = 8 + 20 + 24,
+               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
+                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
+                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
+                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
+                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
+                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
+                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
+               .ilen   = 64,
+               .result = "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"
+                         "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"
+                         "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"
+                         "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"
+                         "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"
+                         "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"
+                         "\x08\xb0\xe2\x79\x88\x59\x88\x81"
+                         "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd"
+                         "\x73\xe3\x19\x3f\x8b\xc9\xc6\xf4"
+                         "\x5a\xf1\x5b\xa8\x98\x07\xc5\x36"
+                         "\x47\x4c\xfc\x36",
+               .rlen   = 64 + 20,
+       }, { /* NIST SP800-38A F.2.5 CBC-AES256.Encrypt */
+#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\x20"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55"
+                         "\x60\x3d\xeb\x10\x15\xca\x71\xbe"
+                         "\x2b\x73\xae\xf0\x85\x7d\x77\x81"
+                         "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"
+                         "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",
+               .klen   = 8 + 20 + 32,
+               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
+                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
+                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
+                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
+                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
+                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
+                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
+               .ilen   = 64,
+               .result = "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"
+                         "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"
+                         "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"
+                         "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"
+                         "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"
+                         "\xa5\x30\xe2\x63\x04\x23\x14\x61"
+                         "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"
+                         "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b"
+                         "\xa3\xe8\x9b\x17\xe3\xf4\x7f\xde"
+                         "\x1b\x9f\xc6\x81\x26\x43\x4a\x87"
+                         "\x51\xee\xd6\x4e",
+               .rlen   = 64 + 20,
+       },
+};
+
+static struct aead_testvec hmac_sha256_aes_cbc_enc_tv_template[] = {
+       { /* RFC 3602 Case 1 */
+#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\x10"    /* enc key length */
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"
+                         "\x51\x2e\x03\xd5\x34\x12\x00\x06",
+               .klen   = 8 + 32 + 16,
+               .iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
+                         "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
+               .input  = "Single block msg",
+               .ilen   = 16,
+               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
+                         "\x27\x08\x94\x2d\xbe\x77\x18\x1a"
+                         "\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,
+       }, { /* RFC 3602 Case 2 */
+#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\x10"    /* enc key length */
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"
+                         "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",
+               .klen   = 8 + 32 + 16,
+               .iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
+                         "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
+               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
+               .ilen   = 32,
+               .result = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"
+                         "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"
+                         "\x75\x86\x60\x2d\x25\x3c\xff\xf9"
+                         "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1"
+                         "\xf5\x33\x53\xf3\x68\x85\x2a\x99"
+                         "\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,
+       }, { /* RFC 3602 Case 3 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x6c\x3e\xa0\x47\x76\x30\xce\x21"
+                         "\xa2\xce\x33\x4a\xa7\x46\xc2\xcd",
+               .klen   = 8 + 32 + 16,
+               .iv     = "\xc7\x82\xdc\x4c\x09\x8c\x66\xcb"
+                         "\xd9\xcd\x27\xd8\x25\x68\x2c\x81",
+               .input  = "This is a 48-byte message (exactly 3 AES blocks)",
+               .ilen   = 48,
+               .result = "\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"
+                         "\x02\x1c\x19\x21\x6b\xad\x52\x5c"
+                         "\x85\x79\x69\x5d\x83\xba\x26\x84"
+                         "\x68\xb9\x3e\x90\x38\xa0\x88\x01"
+                         "\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,
+       }, { /* RFC 3602 Case 4 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x56\xe4\x7a\x38\xc5\x59\x89\x74"
+                         "\xbc\x46\x90\x3d\xba\x29\x03\x49",
+               .klen   = 8 + 32 + 16,
+               .iv     = "\x8c\xe8\x2e\xef\xbe\xa0\xda\x3c"
+                         "\x44\x69\x9e\xd7\xdb\x51\xb7\xd9",
+               .input  = "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
+               .ilen   = 64,
+               .result = "\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"
+                         "\x35\x90\x7a\xa6\x32\xc3\xff\xdf"
+                         "\x86\x8b\xb7\xb2\x9d\x3d\x46\xad"
+                         "\x83\xce\x9f\x9a\x10\x2e\xe9\x9d"
+                         "\x49\xa5\x3e\x87\xf4\xc3\xda\x55"
+                         "\x7a\x1b\xd4\x3c\xdb\x17\x95\xe2"
+                         "\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,
+       }, { /* RFC 3602 Case 5 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x90\xd3\x82\xb4\x10\xee\xba\x7a"
+                         "\xd9\x38\xc4\x6c\xec\x1a\x82\xbf",
+               .klen   = 8 + 32 + 16,
+               .iv     = "\xe9\x6e\x8c\x08\xab\x46\x57\x63"
+                         "\xfd\x09\x8d\x45\xdd\x3f\xf8\x93",
+               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01",
+               .alen   = 8,
+               .input  = "\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"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\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"
+                         "\xa9\x45\x3e\x19\x4e\x12\x08\x49"
+                         "\xa4\x87\x0b\x66\xcc\x6b\x99\x65"
+                         "\x33\x00\x13\xb4\x89\x8d\xc8\x56"
+                         "\xa4\x69\x9e\x52\x3a\x55\xdb\x08"
+                         "\x0b\x59\xec\x3a\x8e\x4b\x7e\x52"
+                         "\x77\x5b\x07\xd1\xdb\x34\xed\x9c"
+                         "\x53\x8a\xb5\x0c\x55\x1b\x87\x4a"
+                         "\xa2\x69\xad\xd0\x47\xad\x2d\x59"
+                         "\x13\xac\x19\xb7\xcf\xba\xd4\xa6"
+                         "\xbb\xd4\x0f\xbe\xa3\x3b\x4c\xb8"
+                         "\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,
+       }, { /* NIST SP800-38A F.2.3 CBC-AES192.Encrypt */
+#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\x18"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"
+                         "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
+                         "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",
+               .klen   = 8 + 32 + 24,
+               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
+                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
+                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
+                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
+                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
+                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
+                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
+               .ilen   = 64,
+               .result = "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"
+                         "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"
+                         "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"
+                         "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"
+                         "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"
+                         "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"
+                         "\x08\xb0\xe2\x79\x88\x59\x88\x81"
+                         "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd"
+                         "\x2f\xee\x5f\xdb\x66\xfe\x79\x09"
+                         "\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,
+       }, { /* NIST SP800-38A F.2.5 CBC-AES256.Encrypt */
+#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\x20"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x60\x3d\xeb\x10\x15\xca\x71\xbe"
+                         "\x2b\x73\xae\xf0\x85\x7d\x77\x81"
+                         "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"
+                         "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",
+               .klen   = 8 + 32 + 32,
+               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
+                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
+                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
+                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
+                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
+                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
+                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
+               .ilen   = 64,
+               .result = "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"
+                         "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"
+                         "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"
+                         "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"
+                         "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"
+                         "\xa5\x30\xe2\x63\x04\x23\x14\x61"
+                         "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"
+                         "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b"
+                         "\x24\x29\xed\xc2\x31\x49\xdb\xb1"
+                         "\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,
+       },
+};
+
+static struct aead_testvec hmac_sha512_aes_cbc_enc_tv_template[] = {
+       { /* RFC 3602 Case 1 */
+#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\x10"    /* enc key length */
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x00\x00\x00\x00\x00\x00\x00\x00"
+                         "\x06\xa9\x21\x40\x36\xb8\xa1\x5b"
+                         "\x51\x2e\x03\xd5\x34\x12\x00\x06",
+               .klen   = 8 + 64 + 16,
+               .iv     = "\x3d\xaf\xba\x42\x9d\x9e\xb4\x30"
+                         "\xb4\x22\xda\x80\x2c\x9f\xac\x41",
+               .input  = "Single block msg",
+               .ilen   = 16,
+               .result = "\xe3\x53\x77\x9c\x10\x79\xae\xb8"
+                         "\x27\x08\x94\x2d\xbe\x77\x18\x1a"
+                         "\x3f\xdc\xad\x90\x03\x63\x5e\x68"
+                         "\xc3\x13\xdd\xa4\x5c\x4d\x54\xa7"
+                         "\x19\x6e\x03\x75\x2b\xa1\x62\xce"
+                         "\xe0\xc6\x96\x75\xb2\x14\xca\x96"
+                         "\xec\xbd\x50\x08\x07\x64\x1a\x49"
+                         "\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,
+       }, { /* RFC 3602 Case 2 */
+#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\x10"    /* enc key length */
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f"
+                         "\x40\x41\x42\x43\x44\x45\x46\x47"
+                         "\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f"
+                         "\x50\x51\x52\x53\x54\x55\x56\x57"
+                         "\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f"
+                         "\xc2\x86\x69\x6d\x88\x7c\x9a\xa0"
+                         "\x61\x1b\xbb\x3e\x20\x25\xa4\x5a",
+               .klen   = 8 + 64 + 16,
+               .iv     = "\x56\x2e\x17\x99\x6d\x09\x3d\x28"
+                         "\xdd\xb3\xba\x69\x5a\x2e\x6f\x58",
+               .input  = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"
+                         "\x10\x11\x12\x13\x14\x15\x16\x17"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f",
+               .ilen   = 32,
+               .result = "\xd2\x96\xcd\x94\xc2\xcc\xcf\x8a"
+                         "\x3a\x86\x30\x28\xb5\xe1\xdc\x0a"
+                         "\x75\x86\x60\x2d\x25\x3c\xff\xf9"
+                         "\x1b\x82\x66\xbe\xa6\xd6\x1a\xb1"
+                         "\xda\xb2\x0c\xb2\x26\xc4\xd5\xef"
+                         "\x60\x38\xa4\x5e\x9a\x8c\x1b\x41"
+                         "\x03\x9f\xc4\x64\x7f\x01\x42\x9b"
+                         "\x0e\x1b\xea\xef\xbc\x88\x19\x5e"
+                         "\x31\x7e\xc2\x95\xfc\x09\x32\x0a"
+                         "\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,
+       }, { /* RFC 3602 Case 3 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x33\x44\x55\x66\x77\x88\x99\xaa"
+                         "\xbb\xcc\xdd\xee\xff\x11\x22\x33"
+                         "\x44\x55\x66\x77\x88\x99\xaa\xbb"
+                         "\xcc\xdd\xee\xff\x11\x22\x33\x44"
+                         "\x6c\x3e\xa0\x47\x76\x30\xce\x21"
+                         "\xa2\xce\x33\x4a\xa7\x46\xc2\xcd",
+               .klen   = 8 + 64 + 16,
+               .iv     = "\xc7\x82\xdc\x4c\x09\x8c\x66\xcb"
+                         "\xd9\xcd\x27\xd8\x25\x68\x2c\x81",
+               .input  = "This is a 48-byte message (exactly 3 AES blocks)",
+               .ilen   = 48,
+               .result = "\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"
+                         "\x02\x1c\x19\x21\x6b\xad\x52\x5c"
+                         "\x85\x79\x69\x5d\x83\xba\x26\x84"
+                         "\x64\x19\x17\x5b\x57\xe0\x21\x0f"
+                         "\xca\xdb\xa1\x26\x38\x14\xa2\x69"
+                         "\xdb\x54\x67\x80\xc0\x54\xe0\xfd"
+                         "\x3e\x91\xe7\x91\x7f\x13\x38\x44"
+                         "\xb7\xb1\xd6\xc8\x7d\x48\x8d\x41"
+                         "\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,
+       }, { /* RFC 3602 Case 4 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x33\x44\x55\x66\x77\x88\x99\xaa"
+                         "\xbb\xcc\xdd\xee\xff\x11\x22\x33"
+                         "\x44\x55\x66\x77\x88\x99\xaa\xbb"
+                         "\xcc\xdd\xee\xff\x11\x22\x33\x44"
+                         "\x56\xe4\x7a\x38\xc5\x59\x89\x74"
+                         "\xbc\x46\x90\x3d\xba\x29\x03\x49",
+               .klen   = 8 + 64 + 16,
+               .iv     = "\x8c\xe8\x2e\xef\xbe\xa0\xda\x3c"
+                         "\x44\x69\x9e\xd7\xdb\x51\xb7\xd9",
+               .input  = "\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7"
+                         "\xa8\xa9\xaa\xab\xac\xad\xae\xaf"
+                         "\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7"
+                         "\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf"
+                         "\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7"
+                         "\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf"
+                         "\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7"
+                         "\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf",
+               .ilen   = 64,
+               .result = "\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"
+                         "\x35\x90\x7a\xa6\x32\xc3\xff\xdf"
+                         "\x86\x8b\xb7\xb2\x9d\x3d\x46\xad"
+                         "\x83\xce\x9f\x9a\x10\x2e\xe9\x9d"
+                         "\x49\xa5\x3e\x87\xf4\xc3\xda\x55"
+                         "\x82\xcd\x42\x28\x21\x20\x15\xcc"
+                         "\xb7\xb2\x48\x40\xc7\x64\x41\x3a"
+                         "\x61\x32\x82\x85\xcf\x27\xed\xb4"
+                         "\xe4\x68\xa2\xf5\x79\x26\x27\xb2"
+                         "\x51\x67\x6a\xc4\xf0\x66\x55\x50"
+                         "\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,
+       }, { /* RFC 3602 Case 5 */
+#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\x10"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x33\x44\x55\x66\x77\x88\x99\xaa"
+                         "\xbb\xcc\xdd\xee\xff\x11\x22\x33"
+                         "\x44\x55\x66\x77\x88\x99\xaa\xbb"
+                         "\xcc\xdd\xee\xff\x11\x22\x33\x44"
+                         "\x90\xd3\x82\xb4\x10\xee\xba\x7a"
+                         "\xd9\x38\xc4\x6c\xec\x1a\x82\xbf",
+               .klen   = 8 + 64 + 16,
+               .iv     = "\xe9\x6e\x8c\x08\xab\x46\x57\x63"
+                         "\xfd\x09\x8d\x45\xdd\x3f\xf8\x93",
+               .assoc  = "\x00\x00\x43\x21\x00\x00\x00\x01",
+               .alen   = 8,
+               .input  = "\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"
+                         "\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f"
+                         "\x20\x21\x22\x23\x24\x25\x26\x27"
+                         "\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f"
+                         "\x30\x31\x32\x33\x34\x35\x36\x37"
+                         "\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"
+                         "\xa9\x45\x3e\x19\x4e\x12\x08\x49"
+                         "\xa4\x87\x0b\x66\xcc\x6b\x99\x65"
+                         "\x33\x00\x13\xb4\x89\x8d\xc8\x56"
+                         "\xa4\x69\x9e\x52\x3a\x55\xdb\x08"
+                         "\x0b\x59\xec\x3a\x8e\x4b\x7e\x52"
+                         "\x77\x5b\x07\xd1\xdb\x34\xed\x9c"
+                         "\x53\x8a\xb5\x0c\x55\x1b\x87\x4a"
+                         "\xa2\x69\xad\xd0\x47\xad\x2d\x59"
+                         "\x13\xac\x19\xb7\xcf\xba\xd4\xa6"
+                         "\x74\x84\x94\xe2\xd7\x7a\xf9\xbf"
+                         "\x00\x8a\xa2\xd5\xb7\xf3\x60\xcf"
+                         "\xa0\x47\xdf\x4e\x09\xf4\xb1\x7f"
+                         "\x14\xd9\x3d\x53\x8e\x12\xb3\x00"
+                         "\x4c\x0a\x4e\x32\x40\x43\x88\xce"
+                         "\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,
+       }, { /* NIST SP800-38A F.2.3 CBC-AES192.Encrypt */
+#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\x18"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x33\x44\x55\x66\x77\x88\x99\xaa"
+                         "\xbb\xcc\xdd\xee\xff\x11\x22\x33"
+                         "\x44\x55\x66\x77\x88\x99\xaa\xbb"
+                         "\xcc\xdd\xee\xff\x11\x22\x33\x44"
+                         "\x8e\x73\xb0\xf7\xda\x0e\x64\x52"
+                         "\xc8\x10\xf3\x2b\x80\x90\x79\xe5"
+                         "\x62\xf8\xea\xd2\x52\x2c\x6b\x7b",
+               .klen   = 8 + 64 + 24,
+               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
+                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
+                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
+                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
+                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
+                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
+                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
+               .ilen   = 64,
+               .result = "\x4f\x02\x1d\xb2\x43\xbc\x63\x3d"
+                         "\x71\x78\x18\x3a\x9f\xa0\x71\xe8"
+                         "\xb4\xd9\xad\xa9\xad\x7d\xed\xf4"
+                         "\xe5\xe7\x38\x76\x3f\x69\x14\x5a"
+                         "\x57\x1b\x24\x20\x12\xfb\x7a\xe0"
+                         "\x7f\xa9\xba\xac\x3d\xf1\x02\xe0"
+                         "\x08\xb0\xe2\x79\x88\x59\x88\x81"
+                         "\xd9\x20\xa9\xe6\x4f\x56\x15\xcd"
+                         "\x77\x4b\x69\x9d\x3a\x0d\xb4\x99"
+                         "\x8f\xc6\x8e\x0e\x72\x58\xe3\x56"
+                         "\xbb\x21\xd2\x7d\x93\x11\x17\x91"
+                         "\xc4\x83\xfd\x0a\xea\x71\xfe\x77"
+                         "\xae\x6f\x0a\xa5\xf0\xcf\xe1\x35"
+                         "\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,
+       }, { /* NIST SP800-38A F.2.5 CBC-AES256.Encrypt */
+#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\x20"    /* enc key length */
+                         "\x11\x22\x33\x44\x55\x66\x77\x88"
+                         "\x99\xaa\xbb\xcc\xdd\xee\xff\x11"
+                         "\x22\x33\x44\x55\x66\x77\x88\x99"
+                         "\xaa\xbb\xcc\xdd\xee\xff\x11\x22"
+                         "\x33\x44\x55\x66\x77\x88\x99\xaa"
+                         "\xbb\xcc\xdd\xee\xff\x11\x22\x33"
+                         "\x44\x55\x66\x77\x88\x99\xaa\xbb"
+                         "\xcc\xdd\xee\xff\x11\x22\x33\x44"
+                         "\x60\x3d\xeb\x10\x15\xca\x71\xbe"
+                         "\x2b\x73\xae\xf0\x85\x7d\x77\x81"
+                         "\x1f\x35\x2c\x07\x3b\x61\x08\xd7"
+                         "\x2d\x98\x10\xa3\x09\x14\xdf\xf4",
+               .klen   = 8 + 64 + 32,
+               .iv     = "\x00\x01\x02\x03\x04\x05\x06\x07"
+                         "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
+               .input  = "\x6b\xc1\xbe\xe2\x2e\x40\x9f\x96"
+                         "\xe9\x3d\x7e\x11\x73\x93\x17\x2a"
+                         "\xae\x2d\x8a\x57\x1e\x03\xac\x9c"
+                         "\x9e\xb7\x6f\xac\x45\xaf\x8e\x51"
+                         "\x30\xc8\x1c\x46\xa3\x5c\xe4\x11"
+                         "\xe5\xfb\xc1\x19\x1a\x0a\x52\xef"
+                         "\xf6\x9f\x24\x45\xdf\x4f\x9b\x17"
+                         "\xad\x2b\x41\x7b\xe6\x6c\x37\x10",
+               .ilen   = 64,
+               .result = "\xf5\x8c\x4c\x04\xd6\xe5\xf1\xba"
+                         "\x77\x9e\xab\xfb\x5f\x7b\xfb\xd6"
+                         "\x9c\xfc\x4e\x96\x7e\xdb\x80\x8d"
+                         "\x67\x9f\x77\x7b\xc6\x70\x2c\x7d"
+                         "\x39\xf2\x33\x69\xa9\xd9\xba\xcf"
+                         "\xa5\x30\xe2\x63\x04\x23\x14\x61"
+                         "\xb2\xeb\x05\xe2\xc3\x9b\xe9\xfc"
+                         "\xda\x6c\x19\x07\x8c\x6a\x9d\x1b"
+                         "\xb2\x27\x69\x7f\x45\x64\x79\x2b"
+                         "\xb7\xb8\x4c\xd4\x75\x94\x68\x40"
+                         "\x2a\xea\x91\xc7\x3f\x7c\xed\x7b"
+                         "\x95\x2c\x9b\xa8\xf5\xe5\x52\x8d"
+                         "\x6b\xe1\xae\xf1\x74\xfa\x0d\x0c"
+                         "\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,
+       },
+};
+
 static struct cipher_testvec aes_lrw_enc_tv_template[] = {
        /* from http://grouper.ieee.org/groups/1619/email/pdf00017.pdf */
        { /* LRW-32-AES 1 */
@@ -14858,4 +16556,94 @@ static struct hash_testvec crc32c_tv_template[] = {
        },
 };
 
+/*
+ * Blakcifn CRC test vectors
+ */
+#define BFIN_CRC_TEST_VECTORS 6
+
+static struct hash_testvec bfin_crc_tv_template[] = {
+       {
+               .psize = 0,
+               .digest = "\x00\x00\x00\x00",
+       },
+       {
+               .key = "\x87\xa9\xcb\xed",
+               .ksize = 4,
+               .psize = 0,
+               .digest = "\x87\xa9\xcb\xed",
+       },
+       {
+               .key = "\xff\xff\xff\xff",
+               .ksize = 4,
+               .plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"
+                            "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"
+                            "\x11\x12\x13\x14\x15\x16\x17\x18"
+                            "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"
+                            "\x21\x22\x23\x24\x25\x26\x27\x28",
+               .psize = 40,
+               .digest = "\x84\x0c\x8d\xa2",
+       },
+       {
+               .key = "\xff\xff\xff\xff",
+               .ksize = 4,
+               .plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"
+                            "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"
+                            "\x11\x12\x13\x14\x15\x16\x17\x18"
+                            "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"
+                            "\x21\x22\x23\x24\x25\x26",
+               .psize = 38,
+               .digest = "\x8c\x58\xec\xb7",
+       },
+       {
+               .key = "\xff\xff\xff\xff",
+               .ksize = 4,
+               .plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"
+                            "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"
+                            "\x11\x12\x13\x14\x15\x16\x17\x18"
+                            "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"
+                            "\x21\x22\x23\x24\x25\x26\x27",
+               .psize = 39,
+               .digest = "\xdc\x50\x28\x7b",
+       },
+       {
+               .key = "\xff\xff\xff\xff",
+               .ksize = 4,
+               .plaintext = "\x01\x02\x03\x04\x05\x06\x07\x08"
+                            "\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10"
+                            "\x11\x12\x13\x14\x15\x16\x17\x18"
+                            "\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20"
+                            "\x21\x22\x23\x24\x25\x26\x27\x28"
+                            "\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30"
+                            "\x31\x32\x33\x34\x35\x36\x37\x38"
+                            "\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40"
+                            "\x41\x42\x43\x44\x45\x46\x47\x48"
+                            "\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50"
+                            "\x51\x52\x53\x54\x55\x56\x57\x58"
+                            "\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60"
+                            "\x61\x62\x63\x64\x65\x66\x67\x68"
+                            "\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70"
+                            "\x71\x72\x73\x74\x75\x76\x77\x78"
+                            "\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80"
+                            "\x81\x82\x83\x84\x85\x86\x87\x88"
+                            "\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90"
+                            "\x91\x92\x93\x94\x95\x96\x97\x98"
+                            "\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0"
+                            "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8"
+                            "\xa9\xaa\xab\xac\xad\xae\xaf\xb0"
+                            "\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8"
+                            "\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0"
+                            "\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8"
+                            "\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0"
+                            "\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8"
+                            "\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0"
+                            "\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8"
+                            "\xe9\xea\xeb\xec\xed\xee\xef\xf0",
+               .psize = 240,
+               .digest = "\x10\x19\x4a\x5c",
+               .np = 2,
+               .tap = { 31, 209 }
+       },
+
+};
+
 #endif /* _CRYPTO_TESTMGR_H */