Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85375446 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: testmgr - Disable rfc4106 test and convert test vectors 



This patch disables the rfc4106 test while the conversion to the
new seqiv calling convention takes place.  It also converts the
rfc4106 test vectors to the new format.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e13f0f6d

crypto/testmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -3492,7 +3492,7 @@ static const struct alg_test_desc alg_test_descs[] = { 
			}

		}

	}, {

		.alg = "rfc4106(gcm(aes))",

		.alg = "rfc4106(gcm(aes))-disabled",

		.test = alg_test_aead,

		.fips_allowed = 1,

		.suite = {

crypto/testmgr.h

+318 −284
Original line number Diff line number Diff line
@@ -20142,7 +20142,7 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
		.input  = zeroed_string,

		.ilen   = 16,

		.assoc  = zeroed_string,

                .alen   = 8,

		.alen   = 16,

		.result	= "\x03\x88\xDA\xCE\x60\xB6\xA3\x92"

			  "\xF3\x28\xC2\xB9\x71\xB2\xFE\x78"

			  "\x97\xFE\x4C\x23\x37\x42\x01\xE0"
@@ -20153,12 +20153,12 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"

			  "\x00\x00\x00\x00",

		.klen	= 20,

                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01"

                          "\x00\x00\x00\x00",

		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",

		.input  = zeroed_string,

		.ilen   = 16,

                .assoc  = zeroed_string,

                .alen   = 8,

		.assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"

			  "\x00\x00\x00\x00\x00\x00\x00\x01",

		.alen   = 16,

		.result	= "\xC0\x0D\x8B\x42\x0F\x8F\x34\x18"

			  "\x88\xB1\xC5\xBC\xC5\xB6\xD6\x28"

			  "\x6A\x9D\xDF\x11\x5E\xFE\x5E\x9D"
@@ -20175,7 +20175,7 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x01\x01\x01\x01\x01\x01\x01\x01",

		.ilen   = 16,

		.assoc  = zeroed_string,

                .alen   = 8,

		.alen   = 16,

		.result	= "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"

			  "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"

			  "\x0B\x8F\x88\x69\x17\xE6\xB4\x3C"
@@ -20190,8 +20190,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
		.input  = "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x01\x01\x01\x01\x01\x01\x01\x01",

		.ilen   = 16,

                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01",

                .alen   = 8,

		.assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x00\x00\x00\x00\x00\x00\x00\x00",

		.alen   = 16,

		.result	= "\x4B\xB1\xB5\xE3\x25\x71\x70\xDE"

			  "\x7F\xC9\x9C\xA5\x14\x19\xF2\xAC"

			  "\x90\x92\xB7\xE3\x5F\xA3\x9A\x63"
@@ -20202,13 +20203,13 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"

			  "\x00\x00\x00\x00",

		.klen	= 20,

                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01"

                          "\x00\x00\x00\x00",

		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",

		.input  = "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x01\x01\x01\x01\x01\x01\x01\x01",

		.ilen   = 16,

                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01",

                .alen   = 8,

		.assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x00\x00\x00\x00\x00\x00\x00\x01",

		.alen   = 16,

		.result	= "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"

			  "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"

			  "\x64\x50\xF9\x32\x13\xFB\x74\x61"
@@ -20219,8 +20220,7 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"

			  "\x00\x00\x00\x00",

		.klen	= 20,

                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01"

                          "\x00\x00\x00\x00",

		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",

		.input  = "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x01\x01\x01\x01\x01\x01\x01\x01"
@@ -20230,8 +20230,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x01\x01\x01\x01\x01\x01\x01\x01",

		.ilen   = 64,

                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01",

                .alen   = 8,

		.assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"

			  "\x00\x00\x00\x00\x00\x00\x00\x01",

		.alen   = 16,

		.result	= "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"

			  "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"

			  "\x98\x14\xA1\x42\x37\x80\xFD\x90"
@@ -20248,8 +20249,7 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"

			  "\x00\x00\x00\x00",

		.klen	= 20,

                .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef"

                          "\x00\x00\x00\x00",

		.iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",

		.input  = "\xff\xff\xff\xff\xff\xff\xff\xff"

			  "\xff\xff\xff\xff\xff\xff\xff\xff"

			  "\xff\xff\xff\xff\xff\xff\xff\xff"
@@ -20276,8 +20276,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\xff\xff\xff\xff\xff\xff\xff\xff",

		.ilen   = 192,

		.assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"

                          "\xaa\xaa\xaa\xaa",

                .alen   = 12,

			  "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"

			  "\x89\xab\xcd\xef",

		.alen   = 20,

		.result	= "\xC1\x76\x33\x85\xE2\x9B\x5F\xDE"

			  "\xDE\x89\x3D\x42\xE7\xC9\x69\x8A"

			  "\x44\x6D\xC3\x88\x46\x2E\xC2\x01"
@@ -20322,8 +20323,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x00\x21\x00\x01\x01\x02\x02\x01",

		.ilen	= 72,

		.assoc	= "\x00\x00\x43\x21\x87\x65\x43\x21"

			  "\x00\x00\x00\x00",

		.alen	= 12,

			  "\x00\x00\x00\x00\x49\x56\xED\x7E"

			  "\x3B\x24\x4C\xFE",

		.alen	= 20,

		.result	= "\xFE\xCF\x53\x7E\x72\x9D\x5B\x07"

			  "\xDC\x30\xDF\x52\x8D\xD2\x2B\x76"

			  "\x8D\x1B\x98\x73\x66\x96\xA6\xFD"
@@ -20351,8 +20353,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x65\x72\x63\x69\x74\x79\x02\x64"

			  "\x6B\x00\x00\x01\x00\x01\x00\x01",

		.ilen	= 64,

		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A",

		.alen	= 8,

		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A"

			  "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",

		.alen	= 16,

		.result	= "\xDE\xB2\x2C\xD9\xB0\x7C\x72\xC1"

			  "\x6E\x3A\x65\xBE\xEB\x8D\xF3\x04"

			  "\xA5\xA5\x89\x7D\x33\xAE\x53\x0F"
@@ -20380,8 +20383,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x02\x04\x05\xB4\x01\x01\x04\x02"

			  "\x01\x02\x02\x01",

		.ilen	= 52,

		.assoc	= "\x4A\x2C\xBF\xE3\x00\x00\x00\x02",

		.alen	= 8,

		.assoc	= "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"

			  "\x01\x02\x03\x04\x05\x06\x07\x08",

		.alen	= 16,

		.result	= "\xFF\x42\x5C\x9B\x72\x45\x99\xDF"

			  "\x7A\x3B\xCD\x51\x01\x94\xE0\x0D"

			  "\x6A\x78\x10\x7F\x1B\x0B\x1C\xBF"
@@ -20407,8 +20411,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x75\x76\x77\x61\x62\x63\x64\x65"

			  "\x66\x67\x68\x69\x01\x02\x02\x01",

		.ilen	= 64,

		.assoc	= "\x00\x00\x00\x00\x00\x00\x00\x01",

		.alen	= 8,

		.assoc	= "\x00\x00\x00\x00\x00\x00\x00\x01"

			  "\x00\x00\x00\x00\x00\x00\x00\x00",

		.alen	= 16,

		.result	= "\x46\x88\xDA\xF2\xF9\x73\xA3\x92"

			  "\x73\x29\x09\xC3\x31\xD5\x6D\x60"

			  "\xF6\x94\xAB\xAA\x41\x4B\x5E\x7F"
@@ -20436,8 +20441,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x66\x67\x68\x69\x01\x02\x02\x01",

		.ilen	= 64,

		.assoc	= "\x42\xF6\x7E\x3F\x10\x10\x10\x10"

			  "\x10\x10\x10\x10",

		.alen	= 12,

			  "\x10\x10\x10\x10\x4E\x28\x00\x00"

			  "\xA2\xFC\xA1\xA3",

		.alen	= 20,

		.result	= "\xFB\xA2\xCA\xA4\x85\x3C\xF9\xF0"

			  "\xF2\x2C\xB1\x0D\x86\xDD\x83\xB0"

			  "\xFE\xC7\x56\x91\xCF\x1A\x04\xB0"
@@ -20461,8 +20467,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x01\x02\x02\x01",

		.ilen	= 28,

		.assoc	= "\x42\xF6\x7E\x3F\x10\x10\x10\x10"

			  "\x10\x10\x10\x10",

		.alen	= 12,

			  "\x10\x10\x10\x10\x4E\x28\x00\x00"

			  "\xA2\xFC\xA1\xA3",

		.alen	= 20,

		.result	= "\xFB\xA2\xCA\x84\x5E\x5D\xF9\xF0"

			  "\xF2\x2C\x3E\x6E\x86\xDD\x83\x1E"

			  "\x1F\xC6\x57\x92\xCD\x1A\xF9\x13"
@@ -20483,8 +20490,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"

			  "\x50\x10\x16\xD0\x75\x68\x00\x01",

		.ilen	= 40,

		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A",

		.alen	= 8,

		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A"

			  "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",

		.alen	= 16,

		.result	= "\xA5\xB1\xF8\x06\x60\x29\xAE\xA4"

			  "\x0E\x59\x8B\x81\x22\xDE\x02\x42"

			  "\x09\x38\xB3\xAB\x33\xF8\x28\xE6"
@@ -20511,8 +20519,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x23\x01\x01\x01",

		.ilen	= 76,

		.assoc	= "\x00\x00\x01\x00\x00\x00\x00\x00"

			  "\x00\x00\x00\x01",

		.alen	= 12,

			  "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"

			  "\xCE\xFA\xCE\x74",

		.alen	= 20,

		.result	= "\x18\xA6\xFD\x42\xF7\x2C\xBF\x4A"

			  "\xB2\xA2\xEA\x90\x1F\x73\xD8\x14"

			  "\xE3\xE7\xF2\x43\xD9\x54\x12\xE1"
@@ -20541,8 +20550,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x50\x10\x1F\x64\x6D\x54\x00\x01",

		.ilen	= 40,

		.assoc	= "\x17\x40\x5E\x67\x15\x6F\x31\x26"

			  "\xDD\x0D\xB9\x9B",

		.alen	= 12,

			  "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"

			  "\x69\x76\x65\x63",

		.alen	= 20,

		.result	= "\xF2\xD6\x9E\xCD\xBD\x5A\x0D\x5B"

			  "\x8D\x5E\xF3\x8B\xAD\x4D\xA5\x8D"

			  "\x1F\x27\x8F\xDE\x98\xEF\x67\x54"
@@ -20569,8 +20579,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x15\x01\x01\x01",

		.ilen	= 76,

		.assoc	= "\x42\xF6\x7E\x3F\x10\x10\x10\x10"

			  "\x10\x10\x10\x10",

		.alen	= 12,

			  "\x10\x10\x10\x10\x4E\x28\x00\x00"

			  "\xA2\xFC\xA1\xA3",

		.alen	= 20,

		.result	= "\xFB\xA2\xCA\xD1\x2F\xC1\xF9\xF0"

			  "\x0D\x3C\xEB\xF3\x05\x41\x0D\xB8"

			  "\x3D\x77\x84\xB6\x07\x32\x3D\x22"
@@ -20603,8 +20614,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x72\x72\x6F\x77\x01\x02\x02\x01",

		.ilen	= 72,

		.assoc	= "\x17\x40\x5E\x67\x15\x6F\x31\x26"

			  "\xDD\x0D\xB9\x9B",

		.alen	= 12,

			  "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"

			  "\x69\x76\x65\x63",

		.alen	= 20,

		.result	= "\xD4\xB7\xED\x86\xA1\x77\x7F\x2E"

			  "\xA1\x3D\x69\x73\xD3\x24\xC6\x9E"

			  "\x7B\x43\xF8\x26\xFB\x56\x83\x12"
@@ -20625,8 +20637,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
		.iv	= "\x43\x45\x7E\x91\x82\x44\x3B\xC6",

		.input	= "\x01\x02\x02\x01",

		.ilen	= 4,

		.assoc	= "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF",

		.alen	= 8,

		.assoc	= "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"

			  "\x43\x45\x7E\x91\x82\x44\x3B\xC6",

		.alen	= 16,

		.result	= "\x43\x7F\x86\x6B\xCB\x3F\x69\x9F"

			  "\xE9\xB0\x82\x2B\xAC\x96\x1C\x45"

			  "\x04\xBE\xF2\x70",
@@ -20642,8 +20655,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x62\x65\x00\x01",

		.ilen	= 20,

		.assoc	= "\x00\x00\x01\x00\x00\x00\x00\x00"

			  "\x00\x00\x00\x01",

		.alen	= 12,

			  "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"

			  "\xCE\xFA\xCE\x74",

		.alen	= 20,

		.result	= "\x29\xC9\xFC\x69\xA1\x97\xD0\x38"

			  "\xCC\xDD\x14\xE2\xDD\xFC\xAA\x05"

			  "\x43\x33\x21\x64\x41\x25\x03\x52"
@@ -20667,8 +20681,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x01\x02\x02\x01",

		.ilen	= 52,

		.assoc	= "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"

			  "\xFF\xFF\xFF\xFF",

		.alen	= 12,

			  "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"

			  "\x67\x65\x74\x6D",

		.alen	= 20,

		.result	= "\xF9\x7A\xB2\xAA\x35\x6D\x8E\xDC"

			  "\xE1\x76\x44\xAC\x8C\x78\xE2\x5D"

			  "\xD2\x4D\xED\xBB\x29\xEB\xF1\xB6"
@@ -20694,8 +20709,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x01\x02\x02\x01",

		.ilen	= 52,

		.assoc	= "\x3F\x7E\xF6\x42\x10\x10\x10\x10"

			  "\x10\x10\x10\x10",

		.alen	= 12,

			  "\x10\x10\x10\x10\x4E\x28\x00\x00"

			  "\xA2\xFC\xA1\xA3",

		.alen	= 20,

		.result	= "\xFB\xA2\xCA\xA8\xC6\xC5\xF9\xF0"

			  "\xF2\x2C\xA5\x4A\x06\x12\x10\xAD"

			  "\x3F\x6E\x57\x91\xCF\x1A\xCA\x21"
@@ -20718,8 +20734,9 @@ static struct aead_testvec aes_gcm_rfc4106_enc_tv_template[] = { 
			  "\x71\x72\x73\x74\x01\x02\x02\x01",

		.ilen	= 32,

		.assoc	= "\x00\x00\x43\x21\x87\x65\x43\x21"

			  "\x00\x00\x00\x07",

		.alen	= 12,

			  "\x00\x00\x00\x07\x48\x55\xEC\x7D"

			  "\x3A\x23\x4B\xFD",

		.alen	= 20,

		.result	= "\x74\x75\x2E\x8A\xEB\x5D\x87\x3C"

			  "\xD7\xC0\xF4\xAC\xC3\x6C\x4B\xFF"

			  "\x84\xB7\xD7\xB9\x8F\x0C\xA8\xB6"
@@ -20741,7 +20758,7 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = { 
			  "\x81\x9F\x8D\xC5\xD7\x41\xA0\x1B",

		.ilen	= 32,

		.assoc  = zeroed_string,

                .alen   = 8,

		.alen   = 16,

		.result = zeroed_string,

		.rlen   = 16,








@@ -20750,15 +20767,15 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"









			  "\x00\x00\x00\x00",









		.klen	= 20,









                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01"









                          "\x00\x00\x00\x00",









		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",









		.input	= "\xC0\x0D\x8B\x42\x0F\x8F\x34\x18"









			  "\x88\xB1\xC5\xBC\xC5\xB6\xD6\x28"









			  "\x6A\x9D\xDF\x11\x5E\xFE\x5E\x9D"









			  "\x2F\x70\x44\x92\xF7\xF2\xE3\xEF",









		.ilen	= 32,









                .assoc  = zeroed_string,









                .alen   = 8,









		.assoc  = "\x00\x00\x00\x00\x00\x00\x00\x00"









			  "\x00\x00\x00\x00\x00\x00\x00\x01",









		.alen   = 16,









		.result = zeroed_string,









		.rlen   = 16,









	}, {








@@ -20773,7 +20790,7 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\xB1\x68\xFD\x14\x52\x64\x61\xB2",









		.ilen	= 32,









		.assoc  = zeroed_string,









                .alen   = 8,









		.alen   = 16,









		.result = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x01\x01\x01\x01\x01\x01\x01\x01",









		.rlen   = 16,








@@ -20788,8 +20805,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x90\x92\xB7\xE3\x5F\xA3\x9A\x63"









			  "\x7E\xD7\x1F\xD8\xD3\x7C\x4B\xF5",









		.ilen	= 32,









                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01",









                .alen   = 8,









		.assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x00\x00\x00\x00\x00\x00\x00\x00",









		.alen   = 16,









		.result = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x01\x01\x01\x01\x01\x01\x01\x01",









		.rlen   = 16,








@@ -20799,15 +20817,15 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"









			  "\x00\x00\x00\x00",









		.klen	= 20,









                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01"









                          "\x00\x00\x00\x00",









		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",









		.input	= "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"









			  "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"









			  "\x64\x50\xF9\x32\x13\xFB\x74\x61"









			  "\xF4\xED\x52\xD3\xC5\x10\x55\x3C",









		.ilen	= 32,









                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01",









                .alen   = 8,









		.assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x00\x00\x00\x00\x00\x00\x00\x01",









		.alen   = 16,









		.result = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x01\x01\x01\x01\x01\x01\x01\x01",









		.rlen   = 16,








@@ -20816,8 +20834,7 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x6d\x6a\x8f\x94\x67\x30\x83\x08"









			  "\x00\x00\x00\x00",









		.klen	= 20,









                .iv     = "\x00\x00\x00\x00\x00\x00\x00\x01"









                          "\x00\x00\x00\x00",









		.iv     = "\x00\x00\x00\x00\x00\x00\x00\x01",









		.input	= "\xC1\x0C\x8A\x43\x0E\x8E\x35\x19"









			  "\x89\xB0\xC4\xBD\xC4\xB7\xD7\x29"









			  "\x98\x14\xA1\x42\x37\x80\xFD\x90"








@@ -20829,8 +20846,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\xD2\xB6\xC2\x4A\x76\xC2\x92\x85"









			  "\xBD\xCF\x62\x98\x58\x14\xE5\xBD",









		.ilen	= 80,









                .assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01",









                .alen   = 8,









		.assoc  = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x00\x00\x00\x00\x00\x00\x00\x01",









		.alen   = 16,









		.result = "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x01\x01\x01\x01\x01\x01\x01\x01"









			  "\x01\x01\x01\x01\x01\x01\x01\x01"








@@ -20845,8 +20863,7 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f"









			  "\x00\x00\x00\x00",









		.klen	= 20,









                .iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef"









                          "\x00\x00\x00\x00",









		.iv     = "\x00\x00\x45\x67\x89\xab\xcd\xef",









		.input	= "\xC1\x76\x33\x85\xE2\x9B\x5F\xDE"









			  "\xDE\x89\x3D\x42\xE7\xC9\x69\x8A"









			  "\x44\x6D\xC3\x88\x46\x2E\xC2\x01"








@@ -20875,8 +20892,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x80\x72\xB0\x4C\x82\x0D\x60\x3C",









		.ilen	= 208,









		.assoc  = "\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"









                          "\xaa\xaa\xaa\xaa",









                .alen   = 12,









			  "\xaa\xaa\xaa\xaa\x00\x00\x45\x67"









			  "\x89\xab\xcd\xef",









		.alen   = 20,









		.result = "\xff\xff\xff\xff\xff\xff\xff\xff"









			  "\xff\xff\xff\xff\xff\xff\xff\xff"









			  "\xff\xff\xff\xff\xff\xff\xff\xff"








@@ -20919,8 +20937,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x00\x21\x00\x01\x01\x02\x02\x01",









		.rlen	= 72,









		.assoc	= "\x00\x00\x43\x21\x87\x65\x43\x21"









			  "\x00\x00\x00\x00",









		.alen	= 12,









			  "\x00\x00\x00\x00\x49\x56\xED\x7E"









			  "\x3B\x24\x4C\xFE",









		.alen	= 20,









		.input	= "\xFE\xCF\x53\x7E\x72\x9D\x5B\x07"









			  "\xDC\x30\xDF\x52\x8D\xD2\x2B\x76"









			  "\x8D\x1B\x98\x73\x66\x96\xA6\xFD"








@@ -20948,8 +20967,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x65\x72\x63\x69\x74\x79\x02\x64"









			  "\x6B\x00\x00\x01\x00\x01\x00\x01",









		.rlen	= 64,









		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A",









		.alen	= 8,









		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A"









			  "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",









		.alen	= 16,









		.input	= "\xDE\xB2\x2C\xD9\xB0\x7C\x72\xC1"









			  "\x6E\x3A\x65\xBE\xEB\x8D\xF3\x04"









			  "\xA5\xA5\x89\x7D\x33\xAE\x53\x0F"








@@ -20977,8 +20997,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x02\x04\x05\xB4\x01\x01\x04\x02"









			  "\x01\x02\x02\x01",









		.rlen	= 52,









		.assoc	= "\x4A\x2C\xBF\xE3\x00\x00\x00\x02",









		.alen	= 8,









		.assoc	= "\x4A\x2C\xBF\xE3\x00\x00\x00\x02"









			  "\x01\x02\x03\x04\x05\x06\x07\x08",









		.alen	= 16,









		.input	= "\xFF\x42\x5C\x9B\x72\x45\x99\xDF"









			  "\x7A\x3B\xCD\x51\x01\x94\xE0\x0D"









			  "\x6A\x78\x10\x7F\x1B\x0B\x1C\xBF"








@@ -21004,8 +21025,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x75\x76\x77\x61\x62\x63\x64\x65"









			  "\x66\x67\x68\x69\x01\x02\x02\x01",









		.rlen	= 64,









		.assoc	= "\x00\x00\x00\x00\x00\x00\x00\x01",









		.alen	= 8,









		.assoc	= "\x00\x00\x00\x00\x00\x00\x00\x01"









			  "\x00\x00\x00\x00\x00\x00\x00\x00",









		.alen	= 16,









		.input	= "\x46\x88\xDA\xF2\xF9\x73\xA3\x92"









			  "\x73\x29\x09\xC3\x31\xD5\x6D\x60"









			  "\xF6\x94\xAB\xAA\x41\x4B\x5E\x7F"








@@ -21033,8 +21055,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x66\x67\x68\x69\x01\x02\x02\x01",









		.rlen	= 64,









		.assoc	= "\x42\xF6\x7E\x3F\x10\x10\x10\x10"









			  "\x10\x10\x10\x10",









		.alen	= 12,









			  "\x10\x10\x10\x10\x4E\x28\x00\x00"









			  "\xA2\xFC\xA1\xA3",









		.alen	= 20,









		.input	= "\xFB\xA2\xCA\xA4\x85\x3C\xF9\xF0"









			  "\xF2\x2C\xB1\x0D\x86\xDD\x83\xB0"









			  "\xFE\xC7\x56\x91\xCF\x1A\x04\xB0"








@@ -21058,8 +21081,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x01\x02\x02\x01",









		.rlen	= 28,









		.assoc	= "\x42\xF6\x7E\x3F\x10\x10\x10\x10"









			  "\x10\x10\x10\x10",









		.alen	= 12,









			  "\x10\x10\x10\x10\x4E\x28\x00\x00"









			  "\xA2\xFC\xA1\xA3",









		.alen	= 20,









		.input	= "\xFB\xA2\xCA\x84\x5E\x5D\xF9\xF0"









			  "\xF2\x2C\x3E\x6E\x86\xDD\x83\x1E"









			  "\x1F\xC6\x57\x92\xCD\x1A\xF9\x13"








@@ -21080,8 +21104,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\xCB\x71\x26\x02\xDD\x6B\xB0\x3E"









			  "\x50\x10\x16\xD0\x75\x68\x00\x01",









		.rlen	= 40,









		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A",









		.alen	= 8,









		.assoc	= "\x00\x00\xA5\xF8\x00\x00\x00\x0A"









			  "\xFA\xCE\xDB\xAD\xDE\xCA\xF8\x88",









		.alen	= 16,









		.input	= "\xA5\xB1\xF8\x06\x60\x29\xAE\xA4"









			  "\x0E\x59\x8B\x81\x22\xDE\x02\x42"









			  "\x09\x38\xB3\xAB\x33\xF8\x28\xE6"








@@ -21108,8 +21133,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x23\x01\x01\x01",









		.rlen	= 76,









		.assoc	= "\x00\x00\x01\x00\x00\x00\x00\x00"









			  "\x00\x00\x00\x01",









		.alen	= 12,









			  "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"









			  "\xCE\xFA\xCE\x74",









		.alen	= 20,









		.input	= "\x18\xA6\xFD\x42\xF7\x2C\xBF\x4A"









			  "\xB2\xA2\xEA\x90\x1F\x73\xD8\x14"









			  "\xE3\xE7\xF2\x43\xD9\x54\x12\xE1"








@@ -21138,8 +21164,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x50\x10\x1F\x64\x6D\x54\x00\x01",









		.rlen	= 40,









		.assoc	= "\x17\x40\x5E\x67\x15\x6F\x31\x26"









			  "\xDD\x0D\xB9\x9B",









		.alen	= 12,









			  "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"









			  "\x69\x76\x65\x63",









		.alen	= 20,









		.input	= "\xF2\xD6\x9E\xCD\xBD\x5A\x0D\x5B"









			  "\x8D\x5E\xF3\x8B\xAD\x4D\xA5\x8D"









			  "\x1F\x27\x8F\xDE\x98\xEF\x67\x54"








@@ -21166,8 +21193,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x15\x01\x01\x01",









		.rlen	= 76,









		.assoc	= "\x42\xF6\x7E\x3F\x10\x10\x10\x10"









			  "\x10\x10\x10\x10",









		.alen	= 12,









			  "\x10\x10\x10\x10\x4E\x28\x00\x00"









			  "\xA2\xFC\xA1\xA3",









		.alen	= 20,









		.input	= "\xFB\xA2\xCA\xD1\x2F\xC1\xF9\xF0"









			  "\x0D\x3C\xEB\xF3\x05\x41\x0D\xB8"









			  "\x3D\x77\x84\xB6\x07\x32\x3D\x22"








@@ -21200,8 +21228,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x72\x72\x6F\x77\x01\x02\x02\x01",









		.rlen	= 72,









		.assoc	= "\x17\x40\x5E\x67\x15\x6F\x31\x26"









			  "\xDD\x0D\xB9\x9B",









		.alen	= 12,









			  "\xDD\x0D\xB9\x9B\x61\x6E\x64\x01"









			  "\x69\x76\x65\x63",









		.alen	= 20,









		.input	= "\xD4\xB7\xED\x86\xA1\x77\x7F\x2E"









			  "\xA1\x3D\x69\x73\xD3\x24\xC6\x9E"









			  "\x7B\x43\xF8\x26\xFB\x56\x83\x12"








@@ -21222,8 +21251,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







		.iv	= "\x43\x45\x7E\x91\x82\x44\x3B\xC6",









		.result	= "\x01\x02\x02\x01",









		.rlen	= 4,









		.assoc	= "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF",









		.alen	= 8,









		.assoc	= "\x33\x54\x67\xAE\xFF\xFF\xFF\xFF"









			  "\x43\x45\x7E\x91\x82\x44\x3B\xC6",









		.alen	= 16,









		.input	= "\x43\x7F\x86\x6B\xCB\x3F\x69\x9F"









			  "\xE9\xB0\x82\x2B\xAC\x96\x1C\x45"









			  "\x04\xBE\xF2\x70",








@@ -21239,8 +21269,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x62\x65\x00\x01",









		.rlen	= 20,









		.assoc	= "\x00\x00\x01\x00\x00\x00\x00\x00"









			  "\x00\x00\x00\x01",









		.alen	= 12,









			  "\x00\x00\x00\x01\xCA\xFE\xDE\xBA"









			  "\xCE\xFA\xCE\x74",









		.alen	= 20,









		.input	= "\x29\xC9\xFC\x69\xA1\x97\xD0\x38"









			  "\xCC\xDD\x14\xE2\xDD\xFC\xAA\x05"









			  "\x43\x33\x21\x64\x41\x25\x03\x52"








@@ -21264,8 +21295,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x01\x02\x02\x01",









		.rlen	= 52,









		.assoc	= "\x79\x6B\x69\x63\xFF\xFF\xFF\xFF"









			  "\xFF\xFF\xFF\xFF",









		.alen	= 12,









			  "\xFF\xFF\xFF\xFF\x33\x30\x21\x69"









			  "\x67\x65\x74\x6D",









		.alen	= 20,









		.input	= "\xF9\x7A\xB2\xAA\x35\x6D\x8E\xDC"









			  "\xE1\x76\x44\xAC\x8C\x78\xE2\x5D"









			  "\xD2\x4D\xED\xBB\x29\xEB\xF1\xB6"








@@ -21291,8 +21323,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x01\x02\x02\x01",









		.rlen	= 52,









		.assoc	= "\x3F\x7E\xF6\x42\x10\x10\x10\x10"









			  "\x10\x10\x10\x10",









		.alen	= 12,









			  "\x10\x10\x10\x10\x4E\x28\x00\x00"









			  "\xA2\xFC\xA1\xA3",









		.alen	= 20,









		.input	= "\xFB\xA2\xCA\xA8\xC6\xC5\xF9\xF0"









			  "\xF2\x2C\xA5\x4A\x06\x12\x10\xAD"









			  "\x3F\x6E\x57\x91\xCF\x1A\xCA\x21"








@@ -21315,8 +21348,9 @@ static struct aead_testvec aes_gcm_rfc4106_dec_tv_template[] = {







			  "\x71\x72\x73\x74\x01\x02\x02\x01",









		.rlen	= 32,









		.assoc	= "\x00\x00\x43\x21\x87\x65\x43\x21"









			  "\x00\x00\x00\x07",









		.alen	= 12,









			  "\x00\x00\x00\x07\x48\x55\xEC\x7D"









			  "\x3A\x23\x4B\xFD",









		.alen	= 20,









		.input	= "\x74\x75\x2E\x8A\xEB\x5D\x87\x3C"









			  "\xD7\xC0\xF4\xAC\xC3\x6C\x4B\xFF"









			  "\x84\xB7\xD7\xB9\x8F\x0C\xA8\xB6"