aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2014-07-27 13:18:50 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2014-08-01 10:36:11 -0400
commit3b9b8fe0ade1ee84ee4058261d2e39a1f283704b (patch)
treed7b818afca71c30af2f6834d84f1b3322506296c
parent4f74c3989b14338544b65360ca4f8587c63d7fd9 (diff)
crypto: testmgr - use chunks smaller than algo block size in chunk tests
This patch updates many of the chunked tcrypt test cases so that not all of the chunks are an exact multiple of the block size. This should help uncover cases where the residue passed to blkcipher_walk_done() is incorrect. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-rw-r--r--crypto/testmgr.h264
1 files changed, 132 insertions, 132 deletions
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index 46df9e88bbf3..6597203eccfa 100644
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -3153,8 +3153,8 @@ static struct cipher_testvec des_enc_tv_template[] = {
3153 "\x5F\x62\xC7\x72\xD9\xFC\xCB\x9A", 3153 "\x5F\x62\xC7\x72\xD9\xFC\xCB\x9A",
3154 .rlen = 248, 3154 .rlen = 248,
3155 .also_non_np = 1, 3155 .also_non_np = 1,
3156 .np = 2, 3156 .np = 3,
3157 .tap = { 248 - 8, 8 }, 3157 .tap = { 248 - 10, 2, 8 },
3158 }, 3158 },
3159}; 3159};
3160 3160
@@ -3263,8 +3263,8 @@ static struct cipher_testvec des_dec_tv_template[] = {
3263 "\xC6\x2F\xBB\x24\x8D\x19\x82\xEB", 3263 "\xC6\x2F\xBB\x24\x8D\x19\x82\xEB",
3264 .rlen = 248, 3264 .rlen = 248,
3265 .also_non_np = 1, 3265 .also_non_np = 1,
3266 .np = 2, 3266 .np = 3,
3267 .tap = { 248 - 8, 8 }, 3267 .tap = { 248 - 10, 2, 8 },
3268 }, 3268 },
3269}; 3269};
3270 3270
@@ -3389,8 +3389,8 @@ static struct cipher_testvec des_cbc_enc_tv_template[] = {
3389 "\xC6\x4A\xF3\x55\xC7\x29\x2E\x63", 3389 "\xC6\x4A\xF3\x55\xC7\x29\x2E\x63",
3390 .rlen = 248, 3390 .rlen = 248,
3391 .also_non_np = 1, 3391 .also_non_np = 1,
3392 .np = 2, 3392 .np = 3,
3393 .tap = { 248 - 8, 8 }, 3393 .tap = { 248 - 10, 2, 8 },
3394 }, 3394 },
3395}; 3395};
3396 3396
@@ -3498,8 +3498,8 @@ static struct cipher_testvec des_cbc_dec_tv_template[] = {
3498 "\xC6\x2F\xBB\x24\x8D\x19\x82\xEB", 3498 "\xC6\x2F\xBB\x24\x8D\x19\x82\xEB",
3499 .rlen = 248, 3499 .rlen = 248,
3500 .also_non_np = 1, 3500 .also_non_np = 1,
3501 .np = 2, 3501 .np = 3,
3502 .tap = { 248 - 8, 8 }, 3502 .tap = { 248 - 10, 2, 8 },
3503 }, 3503 },
3504}; 3504};
3505 3505
@@ -3573,8 +3573,8 @@ static struct cipher_testvec des_ctr_enc_tv_template[] = {
3573 "\x69\x74\xA1\x06\x46\x0F\x4E\x75", 3573 "\x69\x74\xA1\x06\x46\x0F\x4E\x75",
3574 .rlen = 248, 3574 .rlen = 248,
3575 .also_non_np = 1, 3575 .also_non_np = 1,
3576 .np = 2, 3576 .np = 3,
3577 .tap = { 248 - 8, 8 }, 3577 .tap = { 248 - 10, 2, 8 },
3578 }, { /* Generated with Crypto++ */ 3578 }, { /* Generated with Crypto++ */
3579 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55", 3579 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55",
3580 .klen = 8, 3580 .klen = 8,
@@ -3719,8 +3719,8 @@ static struct cipher_testvec des_ctr_dec_tv_template[] = {
3719 "\xC6\x2F\xBB\x24\x8D\x19\x82\xEB", 3719 "\xC6\x2F\xBB\x24\x8D\x19\x82\xEB",
3720 .rlen = 248, 3720 .rlen = 248,
3721 .also_non_np = 1, 3721 .also_non_np = 1,
3722 .np = 2, 3722 .np = 3,
3723 .tap = { 248 - 8, 8 }, 3723 .tap = { 248 - 10, 2, 8 },
3724 }, { /* Generated with Crypto++ */ 3724 }, { /* Generated with Crypto++ */
3725 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55", 3725 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55",
3726 .klen = 8, 3726 .klen = 8,
@@ -3955,8 +3955,8 @@ static struct cipher_testvec des3_ede_enc_tv_template[] = {
3955 "\xD8\x45\xFF\x33\xBA\xBB\x2B\x63", 3955 "\xD8\x45\xFF\x33\xBA\xBB\x2B\x63",
3956 .rlen = 496, 3956 .rlen = 496,
3957 .also_non_np = 1, 3957 .also_non_np = 1,
3958 .np = 2, 3958 .np = 3,
3959 .tap = { 496 - 16, 16 }, 3959 .tap = { 496 - 20, 4, 16 },
3960 }, 3960 },
3961}; 3961};
3962 3962
@@ -4120,8 +4120,8 @@ static struct cipher_testvec des3_ede_dec_tv_template[] = {
4120 "\xB8\x03\xEA\x7D\xE1\x48\xD3\x47", 4120 "\xB8\x03\xEA\x7D\xE1\x48\xD3\x47",
4121 .rlen = 496, 4121 .rlen = 496,
4122 .also_non_np = 1, 4122 .also_non_np = 1,
4123 .np = 2, 4123 .np = 3,
4124 .tap = { 496 - 16, 16 }, 4124 .tap = { 496 - 20, 4, 16 },
4125 }, 4125 },
4126}; 4126};
4127 4127
@@ -4300,8 +4300,8 @@ static struct cipher_testvec des3_ede_cbc_enc_tv_template[] = {
4300 "\x95\x63\x73\xA2\x44\xAC\xF8\xA5", 4300 "\x95\x63\x73\xA2\x44\xAC\xF8\xA5",
4301 .rlen = 496, 4301 .rlen = 496,
4302 .also_non_np = 1, 4302 .also_non_np = 1,
4303 .np = 2, 4303 .np = 3,
4304 .tap = { 496 - 16, 16 }, 4304 .tap = { 496 - 20, 4, 16 },
4305 }, 4305 },
4306}; 4306};
4307 4307
@@ -4480,8 +4480,8 @@ static struct cipher_testvec des3_ede_cbc_dec_tv_template[] = {
4480 "\xB8\x03\xEA\x7D\xE1\x48\xD3\x47", 4480 "\xB8\x03\xEA\x7D\xE1\x48\xD3\x47",
4481 .rlen = 496, 4481 .rlen = 496,
4482 .also_non_np = 1, 4482 .also_non_np = 1,
4483 .np = 2, 4483 .np = 3,
4484 .tap = { 496 - 16, 16 }, 4484 .tap = { 496 - 20, 4, 16 },
4485 }, 4485 },
4486}; 4486};
4487 4487
@@ -4620,8 +4620,8 @@ static struct cipher_testvec des3_ede_ctr_enc_tv_template[] = {
4620 "\x5C\xEE\xFC\xCF\xC4\x70\x00\x34", 4620 "\x5C\xEE\xFC\xCF\xC4\x70\x00\x34",
4621 .rlen = 496, 4621 .rlen = 496,
4622 .also_non_np = 1, 4622 .also_non_np = 1,
4623 .np = 2, 4623 .np = 3,
4624 .tap = { 496 - 16, 16 }, 4624 .tap = { 496 - 20, 4, 16 },
4625 }, { /* Generated with Crypto++ */ 4625 }, { /* Generated with Crypto++ */
4626 .key = "\x9C\xD6\xF3\x9C\xB9\x5A\x67\x00" 4626 .key = "\x9C\xD6\xF3\x9C\xB9\x5A\x67\x00"
4627 "\x5A\x67\x00\x2D\xCE\xEB\x2D\xCE" 4627 "\x5A\x67\x00\x2D\xCE\xEB\x2D\xCE"
@@ -4898,8 +4898,8 @@ static struct cipher_testvec des3_ede_ctr_dec_tv_template[] = {
4898 "\xB8\x03\xEA\x7D\xE1\x48\xD3\x47", 4898 "\xB8\x03\xEA\x7D\xE1\x48\xD3\x47",
4899 .rlen = 496, 4899 .rlen = 496,
4900 .also_non_np = 1, 4900 .also_non_np = 1,
4901 .np = 2, 4901 .np = 3,
4902 .tap = { 496 - 16, 16 }, 4902 .tap = { 496 - 20, 4, 16 },
4903 }, { /* Generated with Crypto++ */ 4903 }, { /* Generated with Crypto++ */
4904 .key = "\x9C\xD6\xF3\x9C\xB9\x5A\x67\x00" 4904 .key = "\x9C\xD6\xF3\x9C\xB9\x5A\x67\x00"
4905 "\x5A\x67\x00\x2D\xCE\xEB\x2D\xCE" 4905 "\x5A\x67\x00\x2D\xCE\xEB\x2D\xCE"
@@ -5238,8 +5238,8 @@ static struct cipher_testvec bf_enc_tv_template[] = {
5238 "\xC9\x1A\xFB\x5D\xDE\xBB\x43\xF4", 5238 "\xC9\x1A\xFB\x5D\xDE\xBB\x43\xF4",
5239 .rlen = 504, 5239 .rlen = 504,
5240 .also_non_np = 1, 5240 .also_non_np = 1,
5241 .np = 2, 5241 .np = 3,
5242 .tap = { 504 - 8, 8 }, 5242 .tap = { 504 - 10, 2, 8 },
5243 }, 5243 },
5244}; 5244};
5245 5245
@@ -5430,8 +5430,8 @@ static struct cipher_testvec bf_dec_tv_template[] = {
5430 "\x2B\xC2\x59\xF0\x64\xFB\x92\x06", 5430 "\x2B\xC2\x59\xF0\x64\xFB\x92\x06",
5431 .rlen = 504, 5431 .rlen = 504,
5432 .also_non_np = 1, 5432 .also_non_np = 1,
5433 .np = 2, 5433 .np = 3,
5434 .tap = { 504 - 8, 8 }, 5434 .tap = { 504 - 10, 2, 8 },
5435 }, 5435 },
5436}; 5436};
5437 5437
@@ -5587,8 +5587,8 @@ static struct cipher_testvec bf_cbc_enc_tv_template[] = {
5587 "\xB4\x98\xD8\x6B\x74\xE7\x65\xF4", 5587 "\xB4\x98\xD8\x6B\x74\xE7\x65\xF4",
5588 .rlen = 504, 5588 .rlen = 504,
5589 .also_non_np = 1, 5589 .also_non_np = 1,
5590 .np = 2, 5590 .np = 3,
5591 .tap = { 504 - 8, 8 }, 5591 .tap = { 504 - 10, 2, 8 },
5592 }, 5592 },
5593}; 5593};
5594 5594
@@ -5744,8 +5744,8 @@ static struct cipher_testvec bf_cbc_dec_tv_template[] = {
5744 "\x2B\xC2\x59\xF0\x64\xFB\x92\x06", 5744 "\x2B\xC2\x59\xF0\x64\xFB\x92\x06",
5745 .rlen = 504, 5745 .rlen = 504,
5746 .also_non_np = 1, 5746 .also_non_np = 1,
5747 .np = 2, 5747 .np = 3,
5748 .tap = { 504 - 8, 8 }, 5748 .tap = { 504 - 10, 2, 8 },
5749 }, 5749 },
5750}; 5750};
5751 5751
@@ -6750,8 +6750,8 @@ static struct cipher_testvec tf_enc_tv_template[] = {
6750 "\x2C\x75\x64\xC4\xCA\xC1\x7E\xD5", 6750 "\x2C\x75\x64\xC4\xCA\xC1\x7E\xD5",
6751 .rlen = 496, 6751 .rlen = 496,
6752 .also_non_np = 1, 6752 .also_non_np = 1,
6753 .np = 2, 6753 .np = 3,
6754 .tap = { 496 - 16, 16 }, 6754 .tap = { 496 - 20, 4, 16 },
6755 }, 6755 },
6756}; 6756};
6757 6757
@@ -6918,8 +6918,8 @@ static struct cipher_testvec tf_dec_tv_template[] = {
6918 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 6918 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
6919 .rlen = 496, 6919 .rlen = 496,
6920 .also_non_np = 1, 6920 .also_non_np = 1,
6921 .np = 2, 6921 .np = 3,
6922 .tap = { 496 - 16, 16 }, 6922 .tap = { 496 - 20, 4, 16 },
6923 }, 6923 },
6924}; 6924};
6925 6925
@@ -7101,8 +7101,8 @@ static struct cipher_testvec tf_cbc_enc_tv_template[] = {
7101 "\x0A\xA3\x30\x10\x26\x25\x41\x2C", 7101 "\x0A\xA3\x30\x10\x26\x25\x41\x2C",
7102 .rlen = 496, 7102 .rlen = 496,
7103 .also_non_np = 1, 7103 .also_non_np = 1,
7104 .np = 2, 7104 .np = 3,
7105 .tap = { 496 - 16, 16 }, 7105 .tap = { 496 - 20, 4, 16 },
7106 }, 7106 },
7107}; 7107};
7108 7108
@@ -7284,8 +7284,8 @@ static struct cipher_testvec tf_cbc_dec_tv_template[] = {
7284 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 7284 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
7285 .rlen = 496, 7285 .rlen = 496,
7286 .also_non_np = 1, 7286 .also_non_np = 1,
7287 .np = 2, 7287 .np = 3,
7288 .tap = { 496 - 16, 16 }, 7288 .tap = { 496 - 20, 4, 16 },
7289 }, 7289 },
7290}; 7290};
7291 7291
@@ -8358,8 +8358,8 @@ static struct cipher_testvec tf_lrw_enc_tv_template[] = {
8358 "\x11\xd7\xb8\x6e\xea\xe1\x80\x30", 8358 "\x11\xd7\xb8\x6e\xea\xe1\x80\x30",
8359 .rlen = 512, 8359 .rlen = 512,
8360 .also_non_np = 1, 8360 .also_non_np = 1,
8361 .np = 2, 8361 .np = 3,
8362 .tap = { 512 - 16, 16 }, 8362 .tap = { 512 - 20, 4, 16 },
8363 }, 8363 },
8364}; 8364};
8365 8365
@@ -8611,8 +8611,8 @@ static struct cipher_testvec tf_lrw_dec_tv_template[] = {
8611 "\x21\xc4\xc2\x75\x67\x89\x37\x0a", 8611 "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
8612 .rlen = 512, 8612 .rlen = 512,
8613 .also_non_np = 1, 8613 .also_non_np = 1,
8614 .np = 2, 8614 .np = 3,
8615 .tap = { 512 - 16, 16 }, 8615 .tap = { 512 - 20, 4, 16 },
8616 }, 8616 },
8617}; 8617};
8618 8618
@@ -8953,8 +8953,8 @@ static struct cipher_testvec tf_xts_enc_tv_template[] = {
8953 "\x37\x30\xe1\x91\x8d\xb3\x2a\xff", 8953 "\x37\x30\xe1\x91\x8d\xb3\x2a\xff",
8954 .rlen = 512, 8954 .rlen = 512,
8955 .also_non_np = 1, 8955 .also_non_np = 1,
8956 .np = 2, 8956 .np = 3,
8957 .tap = { 512 - 16, 16 }, 8957 .tap = { 512 - 20, 4, 16 },
8958 }, 8958 },
8959}; 8959};
8960 8960
@@ -9296,8 +9296,8 @@ static struct cipher_testvec tf_xts_dec_tv_template[] = {
9296 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", 9296 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
9297 .rlen = 512, 9297 .rlen = 512,
9298 .also_non_np = 1, 9298 .also_non_np = 1,
9299 .np = 2, 9299 .np = 3,
9300 .tap = { 512 - 16, 16 }, 9300 .tap = { 512 - 20, 4, 16 },
9301 }, 9301 },
9302}; 9302};
9303 9303
@@ -9494,8 +9494,8 @@ static struct cipher_testvec serpent_enc_tv_template[] = {
9494 "\xF4\x46\x2E\xEB\xAC\xF3\xD2\xB7", 9494 "\xF4\x46\x2E\xEB\xAC\xF3\xD2\xB7",
9495 .rlen = 496, 9495 .rlen = 496,
9496 .also_non_np = 1, 9496 .also_non_np = 1,
9497 .np = 2, 9497 .np = 3,
9498 .tap = { 496 - 16, 16 }, 9498 .tap = { 496 - 20, 4, 16 },
9499 }, 9499 },
9500}; 9500};
9501 9501
@@ -9720,8 +9720,8 @@ static struct cipher_testvec serpent_dec_tv_template[] = {
9720 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 9720 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
9721 .rlen = 496, 9721 .rlen = 496,
9722 .also_non_np = 1, 9722 .also_non_np = 1,
9723 .np = 2, 9723 .np = 3,
9724 .tap = { 496 - 16, 16 }, 9724 .tap = { 496 - 20, 4, 16 },
9725 }, 9725 },
9726}; 9726};
9727 9727
@@ -9902,8 +9902,8 @@ static struct cipher_testvec serpent_cbc_enc_tv_template[] = {
9902 "\xBC\x08\x3A\xA2\x29\xB3\xDF\xD1", 9902 "\xBC\x08\x3A\xA2\x29\xB3\xDF\xD1",
9903 .rlen = 496, 9903 .rlen = 496,
9904 .also_non_np = 1, 9904 .also_non_np = 1,
9905 .np = 2, 9905 .np = 3,
9906 .tap = { 496 - 16, 16 }, 9906 .tap = { 496 - 20, 4, 16 },
9907 }, 9907 },
9908}; 9908};
9909 9909
@@ -10043,8 +10043,8 @@ static struct cipher_testvec serpent_cbc_dec_tv_template[] = {
10043 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 10043 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
10044 .rlen = 496, 10044 .rlen = 496,
10045 .also_non_np = 1, 10045 .also_non_np = 1,
10046 .np = 2, 10046 .np = 3,
10047 .tap = { 496 - 16, 16 }, 10047 .tap = { 496 - 20, 4, 16 },
10048 }, 10048 },
10049}; 10049};
10050 10050
@@ -11117,8 +11117,8 @@ static struct cipher_testvec serpent_lrw_enc_tv_template[] = {
11117 "\xd9\x51\x0f\xd7\x94\x2f\xc5\xa7", 11117 "\xd9\x51\x0f\xd7\x94\x2f\xc5\xa7",
11118 .rlen = 512, 11118 .rlen = 512,
11119 .also_non_np = 1, 11119 .also_non_np = 1,
11120 .np = 2, 11120 .np = 3,
11121 .tap = { 512 - 16, 16 }, 11121 .tap = { 512 - 20, 4, 16 },
11122 }, 11122 },
11123}; 11123};
11124 11124
@@ -11370,8 +11370,8 @@ static struct cipher_testvec serpent_lrw_dec_tv_template[] = {
11370 "\x21\xc4\xc2\x75\x67\x89\x37\x0a", 11370 "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
11371 .rlen = 512, 11371 .rlen = 512,
11372 .also_non_np = 1, 11372 .also_non_np = 1,
11373 .np = 2, 11373 .np = 3,
11374 .tap = { 512 - 16, 16 }, 11374 .tap = { 512 - 20, 4, 16 },
11375 }, 11375 },
11376}; 11376};
11377 11377
@@ -11712,8 +11712,8 @@ static struct cipher_testvec serpent_xts_enc_tv_template[] = {
11712 "\xd4\xa0\x91\x98\x11\x5f\x4d\xb1", 11712 "\xd4\xa0\x91\x98\x11\x5f\x4d\xb1",
11713 .rlen = 512, 11713 .rlen = 512,
11714 .also_non_np = 1, 11714 .also_non_np = 1,
11715 .np = 2, 11715 .np = 3,
11716 .tap = { 512 - 16, 16 }, 11716 .tap = { 512 - 20, 4, 16 },
11717 }, 11717 },
11718}; 11718};
11719 11719
@@ -12055,8 +12055,8 @@ static struct cipher_testvec serpent_xts_dec_tv_template[] = {
12055 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", 12055 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
12056 .rlen = 512, 12056 .rlen = 512,
12057 .also_non_np = 1, 12057 .also_non_np = 1,
12058 .np = 2, 12058 .np = 3,
12059 .tap = { 512 - 16, 16 }, 12059 .tap = { 512 - 20, 4, 16 },
12060 }, 12060 },
12061}; 12061};
12062 12062
@@ -12238,8 +12238,8 @@ static struct cipher_testvec cast6_enc_tv_template[] = {
12238 "\x11\x74\x93\x57\xB4\x7E\xC6\x00", 12238 "\x11\x74\x93\x57\xB4\x7E\xC6\x00",
12239 .rlen = 496, 12239 .rlen = 496,
12240 .also_non_np = 1, 12240 .also_non_np = 1,
12241 .np = 2, 12241 .np = 3,
12242 .tap = { 496 - 16, 16 }, 12242 .tap = { 496 - 20, 4, 16 },
12243 }, 12243 },
12244}; 12244};
12245 12245
@@ -12409,8 +12409,8 @@ static struct cipher_testvec cast6_dec_tv_template[] = {
12409 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 12409 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
12410 .rlen = 496, 12410 .rlen = 496,
12411 .also_non_np = 1, 12411 .also_non_np = 1,
12412 .np = 2, 12412 .np = 3,
12413 .tap = { 496 - 16, 16 }, 12413 .tap = { 496 - 20, 4, 16 },
12414 }, 12414 },
12415}; 12415};
12416 12416
@@ -12550,8 +12550,8 @@ static struct cipher_testvec cast6_cbc_enc_tv_template[] = {
12550 "\x22\x46\x89\x2D\x0F\x2B\x08\x24", 12550 "\x22\x46\x89\x2D\x0F\x2B\x08\x24",
12551 .rlen = 496, 12551 .rlen = 496,
12552 .also_non_np = 1, 12552 .also_non_np = 1,
12553 .np = 2, 12553 .np = 3,
12554 .tap = { 496 - 16, 16 }, 12554 .tap = { 496 - 20, 4, 16 },
12555 }, 12555 },
12556}; 12556};
12557 12557
@@ -12691,8 +12691,8 @@ static struct cipher_testvec cast6_cbc_dec_tv_template[] = {
12691 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 12691 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
12692 .rlen = 496, 12692 .rlen = 496,
12693 .also_non_np = 1, 12693 .also_non_np = 1,
12694 .np = 2, 12694 .np = 3,
12695 .tap = { 496 - 16, 16 }, 12695 .tap = { 496 - 20, 4, 16 },
12696 }, 12696 },
12697}; 12697};
12698 12698
@@ -12848,8 +12848,8 @@ static struct cipher_testvec cast6_ctr_enc_tv_template[] = {
12848 "\xF9\xC5\xDD\x27\xB3\x39\xCB\xCB", 12848 "\xF9\xC5\xDD\x27\xB3\x39\xCB\xCB",
12849 .rlen = 496, 12849 .rlen = 496,
12850 .also_non_np = 1, 12850 .also_non_np = 1,
12851 .np = 2, 12851 .np = 3,
12852 .tap = { 496 - 16, 16 }, 12852 .tap = { 496 - 20, 4, 16 },
12853 }, 12853 },
12854}; 12854};
12855 12855
@@ -13005,8 +13005,8 @@ static struct cipher_testvec cast6_ctr_dec_tv_template[] = {
13005 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 13005 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
13006 .rlen = 496, 13006 .rlen = 496,
13007 .also_non_np = 1, 13007 .also_non_np = 1,
13008 .np = 2, 13008 .np = 3,
13009 .tap = { 496 - 16, 16 }, 13009 .tap = { 496 - 20, 4, 16 },
13010 }, 13010 },
13011}; 13011};
13012 13012
@@ -13152,8 +13152,8 @@ static struct cipher_testvec cast6_lrw_enc_tv_template[] = {
13152 "\xC4\xF5\x99\x61\xBC\xBB\x5B\x46", 13152 "\xC4\xF5\x99\x61\xBC\xBB\x5B\x46",
13153 .rlen = 512, 13153 .rlen = 512,
13154 .also_non_np = 1, 13154 .also_non_np = 1,
13155 .np = 2, 13155 .np = 3,
13156 .tap = { 512 - 16, 16 }, 13156 .tap = { 512 - 20, 4, 16 },
13157 }, 13157 },
13158}; 13158};
13159 13159
@@ -13299,8 +13299,8 @@ static struct cipher_testvec cast6_lrw_dec_tv_template[] = {
13299 "\x21\xc4\xc2\x75\x67\x89\x37\x0a", 13299 "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
13300 .rlen = 512, 13300 .rlen = 512,
13301 .also_non_np = 1, 13301 .also_non_np = 1,
13302 .np = 2, 13302 .np = 3,
13303 .tap = { 512 - 16, 16 }, 13303 .tap = { 512 - 20, 4, 16 },
13304 }, 13304 },
13305}; 13305};
13306 13306
@@ -13448,8 +13448,8 @@ static struct cipher_testvec cast6_xts_enc_tv_template[] = {
13448 "\x22\x60\x4E\xE8\xA4\x5D\x85\xB9", 13448 "\x22\x60\x4E\xE8\xA4\x5D\x85\xB9",
13449 .rlen = 512, 13449 .rlen = 512,
13450 .also_non_np = 1, 13450 .also_non_np = 1,
13451 .np = 2, 13451 .np = 3,
13452 .tap = { 512 - 16, 16 }, 13452 .tap = { 512 - 20, 4, 16 },
13453 }, 13453 },
13454}; 13454};
13455 13455
@@ -13597,8 +13597,8 @@ static struct cipher_testvec cast6_xts_dec_tv_template[] = {
13597 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", 13597 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
13598 .rlen = 512, 13598 .rlen = 512,
13599 .also_non_np = 1, 13599 .also_non_np = 1,
13600 .np = 2, 13600 .np = 3,
13601 .tap = { 512 - 16, 16 }, 13601 .tap = { 512 - 20, 4, 16 },
13602 }, 13602 },
13603}; 13603};
13604 13604
@@ -13805,8 +13805,8 @@ static struct cipher_testvec aes_enc_tv_template[] = {
13805 "\x17\xBB\xC0\x6B\x62\x3F\x56\xE9", 13805 "\x17\xBB\xC0\x6B\x62\x3F\x56\xE9",
13806 .rlen = 496, 13806 .rlen = 496,
13807 .also_non_np = 1, 13807 .also_non_np = 1,
13808 .np = 2, 13808 .np = 3,
13809 .tap = { 496 - 16, 16 }, 13809 .tap = { 496 - 20, 4, 16 },
13810 }, 13810 },
13811}; 13811};
13812 13812
@@ -13977,8 +13977,8 @@ static struct cipher_testvec aes_dec_tv_template[] = {
13977 "\xED\x56\xBF\x28\xB4\x1D\x86\x12", 13977 "\xED\x56\xBF\x28\xB4\x1D\x86\x12",
13978 .rlen = 496, 13978 .rlen = 496,
13979 .also_non_np = 1, 13979 .also_non_np = 1,
13980 .np = 2, 13980 .np = 3,
13981 .tap = { 496 - 16, 16 }, 13981 .tap = { 496 - 20, 4, 16 },
13982 }, 13982 },
13983}; 13983};
13984 13984
@@ -14196,8 +14196,8 @@ static struct cipher_testvec aes_cbc_enc_tv_template[] = {
14196 "\xA3\xAA\x13\xCC\x50\xFF\x7B\x02", 14196 "\xA3\xAA\x13\xCC\x50\xFF\x7B\x02",
14197 .rlen = 496, 14197 .rlen = 496,
14198 .also_non_np = 1, 14198 .also_non_np = 1,
14199 .np = 2, 14199 .np = 3,
14200 .tap = { 496 - 16, 16 }, 14200 .tap = { 496 - 20, 4, 16 },
14201 }, 14201 },
14202}; 14202};
14203 14203
@@ -14415,8 +14415,8 @@ static struct cipher_testvec aes_cbc_dec_tv_template[] = {
14415 "\xED\x56\xBF\x28\xB4\x1D\x86\x12", 14415 "\xED\x56\xBF\x28\xB4\x1D\x86\x12",
14416 .rlen = 496, 14416 .rlen = 496,
14417 .also_non_np = 1, 14417 .also_non_np = 1,
14418 .np = 2, 14418 .np = 3,
14419 .tap = { 496 - 16, 16 }, 14419 .tap = { 496 - 20, 4, 16 },
14420 }, 14420 },
14421}; 14421};
14422 14422
@@ -16321,8 +16321,8 @@ static struct cipher_testvec aes_lrw_enc_tv_template[] = {
16321 "\x74\x3f\x7d\x58\x88\x75\xde\x3e", 16321 "\x74\x3f\x7d\x58\x88\x75\xde\x3e",
16322 .rlen = 512, 16322 .rlen = 512,
16323 .also_non_np = 1, 16323 .also_non_np = 1,
16324 .np = 2, 16324 .np = 3,
16325 .tap = { 512 - 16, 16 }, 16325 .tap = { 512 - 20, 4, 16 },
16326 } 16326 }
16327}; 16327};
16328 16328
@@ -16575,8 +16575,8 @@ static struct cipher_testvec aes_lrw_dec_tv_template[] = {
16575 "\x21\xc4\xc2\x75\x67\x89\x37\x0a", 16575 "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
16576 .rlen = 512, 16576 .rlen = 512,
16577 .also_non_np = 1, 16577 .also_non_np = 1,
16578 .np = 2, 16578 .np = 3,
16579 .tap = { 512 - 16, 16 }, 16579 .tap = { 512 - 20, 4, 16 },
16580 } 16580 }
16581}; 16581};
16582 16582
@@ -16917,8 +16917,8 @@ static struct cipher_testvec aes_xts_enc_tv_template[] = {
16917 "\xb9\xc6\xe6\x93\xe1\x48\xc1\x51", 16917 "\xb9\xc6\xe6\x93\xe1\x48\xc1\x51",
16918 .rlen = 512, 16918 .rlen = 512,
16919 .also_non_np = 1, 16919 .also_non_np = 1,
16920 .np = 2, 16920 .np = 3,
16921 .tap = { 512 - 16, 16 }, 16921 .tap = { 512 - 20, 4, 16 },
16922 } 16922 }
16923}; 16923};
16924 16924
@@ -17259,8 +17259,8 @@ static struct cipher_testvec aes_xts_dec_tv_template[] = {
17259 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", 17259 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
17260 .rlen = 512, 17260 .rlen = 512,
17261 .also_non_np = 1, 17261 .also_non_np = 1,
17262 .np = 2, 17262 .np = 3,
17263 .tap = { 512 - 16, 16 }, 17263 .tap = { 512 - 20, 4, 16 },
17264 } 17264 }
17265}; 17265};
17266 17266
@@ -17476,8 +17476,8 @@ static struct cipher_testvec aes_ctr_enc_tv_template[] = {
17476 "\xF1\x4C\xE5\xB2\x91\x64\x0C\x51", 17476 "\xF1\x4C\xE5\xB2\x91\x64\x0C\x51",
17477 .rlen = 496, 17477 .rlen = 496,
17478 .also_non_np = 1, 17478 .also_non_np = 1,
17479 .np = 2, 17479 .np = 3,
17480 .tap = { 496 - 16, 16 }, 17480 .tap = { 496 - 20, 4, 16 },
17481 }, { /* Generated with Crypto++ */ 17481 }, { /* Generated with Crypto++ */
17482 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55" 17482 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55"
17483 "\x0F\x32\x55\x78\x9B\xBE\x78\x9B" 17483 "\x0F\x32\x55\x78\x9B\xBE\x78\x9B"
@@ -17831,8 +17831,8 @@ static struct cipher_testvec aes_ctr_dec_tv_template[] = {
17831 "\xED\x56\xBF\x28\xB4\x1D\x86\x12", 17831 "\xED\x56\xBF\x28\xB4\x1D\x86\x12",
17832 .rlen = 496, 17832 .rlen = 496,
17833 .also_non_np = 1, 17833 .also_non_np = 1,
17834 .np = 2, 17834 .np = 3,
17835 .tap = { 496 - 16, 16 }, 17835 .tap = { 496 - 20, 4, 16 },
17836 }, { /* Generated with Crypto++ */ 17836 }, { /* Generated with Crypto++ */
17837 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55" 17837 .key = "\xC9\x83\xA6\xC9\xEC\x0F\x32\x55"
17838 "\x0F\x32\x55\x78\x9B\xBE\x78\x9B" 17838 "\x0F\x32\x55\x78\x9B\xBE\x78\x9B"
@@ -21791,8 +21791,8 @@ static struct cipher_testvec cast5_enc_tv_template[] = {
21791 "\xF5\xBC\x25\xD6\x02\x56\x57\x1C", 21791 "\xF5\xBC\x25\xD6\x02\x56\x57\x1C",
21792 .rlen = 496, 21792 .rlen = 496,
21793 .also_non_np = 1, 21793 .also_non_np = 1,
21794 .np = 2, 21794 .np = 3,
21795 .tap = { 496 - 16, 16 }, 21795 .tap = { 496 - 20, 4, 16 },
21796 }, 21796 },
21797}; 21797};
21798 21798
@@ -21952,8 +21952,8 @@ static struct cipher_testvec cast5_dec_tv_template[] = {
21952 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 21952 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
21953 .rlen = 496, 21953 .rlen = 496,
21954 .also_non_np = 1, 21954 .also_non_np = 1,
21955 .np = 2, 21955 .np = 3,
21956 .tap = { 496 - 16, 16 }, 21956 .tap = { 496 - 20, 4, 16 },
21957 }, 21957 },
21958}; 21958};
21959 21959
@@ -22090,8 +22090,8 @@ static struct cipher_testvec cast5_cbc_enc_tv_template[] = {
22090 "\x1D\x18\x66\x44\x5B\x8F\x14\xEB", 22090 "\x1D\x18\x66\x44\x5B\x8F\x14\xEB",
22091 .rlen = 496, 22091 .rlen = 496,
22092 .also_non_np = 1, 22092 .also_non_np = 1,
22093 .np = 2, 22093 .np = 3,
22094 .tap = { 496 - 16, 16 }, 22094 .tap = { 496 - 20, 4, 16 },
22095 }, 22095 },
22096}; 22096};
22097 22097
@@ -22228,8 +22228,8 @@ static struct cipher_testvec cast5_cbc_dec_tv_template[] = {
22228 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 22228 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
22229 .rlen = 496, 22229 .rlen = 496,
22230 .also_non_np = 1, 22230 .also_non_np = 1,
22231 .np = 2, 22231 .np = 3,
22232 .tap = { 496 - 16, 16 }, 22232 .tap = { 496 - 20, 4, 16 },
22233 }, 22233 },
22234}; 22234};
22235 22235
@@ -22379,8 +22379,8 @@ static struct cipher_testvec cast5_ctr_enc_tv_template[] = {
22379 "\xC0\x0D\x96\xAA\x23\xF8\xFE\x13", 22379 "\xC0\x0D\x96\xAA\x23\xF8\xFE\x13",
22380 .rlen = 496, 22380 .rlen = 496,
22381 .also_non_np = 1, 22381 .also_non_np = 1,
22382 .np = 2, 22382 .np = 3,
22383 .tap = { 496 - 16, 16 }, 22383 .tap = { 496 - 20, 4, 16 },
22384 }, 22384 },
22385}; 22385};
22386 22386
@@ -22530,8 +22530,8 @@ static struct cipher_testvec cast5_ctr_dec_tv_template[] = {
22530 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7", 22530 "\xDC\x50\xE7\x7E\x15\x89\x20\xB7",
22531 .rlen = 496, 22531 .rlen = 496,
22532 .also_non_np = 1, 22532 .also_non_np = 1,
22533 .np = 2, 22533 .np = 3,
22534 .tap = { 496 - 16, 16 }, 22534 .tap = { 496 - 20, 4, 16 },
22535 }, 22535 },
22536}; 22536};
22537 22537
@@ -23689,8 +23689,8 @@ static struct cipher_testvec camellia_enc_tv_template[] = {
23689 "\x33\x1A\xBB\xD3\xA2\x7E\x97\x66", 23689 "\x33\x1A\xBB\xD3\xA2\x7E\x97\x66",
23690 .rlen = 1008, 23690 .rlen = 1008,
23691 .also_non_np = 1, 23691 .also_non_np = 1,
23692 .np = 2, 23692 .np = 3,
23693 .tap = { 1008 - 16, 16 }, 23693 .tap = { 1008 - 20, 4, 16 },
23694 }, 23694 },
23695}; 23695};
23696 23696
@@ -23989,8 +23989,8 @@ static struct cipher_testvec camellia_dec_tv_template[] = {
23989 "\x72\x09\xA0\x14\xAB\x42\xD9\x4D", 23989 "\x72\x09\xA0\x14\xAB\x42\xD9\x4D",
23990 .rlen = 1008, 23990 .rlen = 1008,
23991 .also_non_np = 1, 23991 .also_non_np = 1,
23992 .np = 2, 23992 .np = 3,
23993 .tap = { 1008 - 16, 16 }, 23993 .tap = { 1008 - 20, 4, 16 },
23994 }, 23994 },
23995}; 23995};
23996 23996
@@ -24285,8 +24285,8 @@ static struct cipher_testvec camellia_cbc_enc_tv_template[] = {
24285 "\x70\xC5\xB9\x0B\x3B\x7A\x6E\x6C", 24285 "\x70\xC5\xB9\x0B\x3B\x7A\x6E\x6C",
24286 .rlen = 1008, 24286 .rlen = 1008,
24287 .also_non_np = 1, 24287 .also_non_np = 1,
24288 .np = 2, 24288 .np = 3,
24289 .tap = { 1008 - 16, 16 }, 24289 .tap = { 1008 - 20, 4, 16 },
24290 }, 24290 },
24291}; 24291};
24292 24292
@@ -24581,8 +24581,8 @@ static struct cipher_testvec camellia_cbc_dec_tv_template[] = {
24581 "\x72\x09\xA0\x14\xAB\x42\xD9\x4D", 24581 "\x72\x09\xA0\x14\xAB\x42\xD9\x4D",
24582 .rlen = 1008, 24582 .rlen = 1008,
24583 .also_non_np = 1, 24583 .also_non_np = 1,
24584 .np = 2, 24584 .np = 3,
24585 .tap = { 1008 - 16, 16 }, 24585 .tap = { 1008 - 20, 4, 16 },
24586 }, 24586 },
24587}; 24587};
24588 24588
@@ -26167,8 +26167,8 @@ static struct cipher_testvec camellia_lrw_enc_tv_template[] = {
26167 "\x5a\xa8\x92\x7f\xba\xe6\x0c\x95", 26167 "\x5a\xa8\x92\x7f\xba\xe6\x0c\x95",
26168 .rlen = 512, 26168 .rlen = 512,
26169 .also_non_np = 1, 26169 .also_non_np = 1,
26170 .np = 2, 26170 .np = 3,
26171 .tap = { 512 - 16, 16 }, 26171 .tap = { 512 - 20, 4, 16 },
26172 }, 26172 },
26173}; 26173};
26174 26174
@@ -26420,8 +26420,8 @@ static struct cipher_testvec camellia_lrw_dec_tv_template[] = {
26420 "\x21\xc4\xc2\x75\x67\x89\x37\x0a", 26420 "\x21\xc4\xc2\x75\x67\x89\x37\x0a",
26421 .rlen = 512, 26421 .rlen = 512,
26422 .also_non_np = 1, 26422 .also_non_np = 1,
26423 .np = 2, 26423 .np = 3,
26424 .tap = { 512 - 16, 16 }, 26424 .tap = { 512 - 20, 4, 16 },
26425 }, 26425 },
26426}; 26426};
26427 26427
@@ -26762,8 +26762,8 @@ static struct cipher_testvec camellia_xts_enc_tv_template[] = {
26762 "\xd5\xc6\x99\xcc\x4e\x6c\x94\x95", 26762 "\xd5\xc6\x99\xcc\x4e\x6c\x94\x95",
26763 .rlen = 512, 26763 .rlen = 512,
26764 .also_non_np = 1, 26764 .also_non_np = 1,
26765 .np = 2, 26765 .np = 3,
26766 .tap = { 512 - 16, 16 }, 26766 .tap = { 512 - 20, 4, 16 },
26767 }, 26767 },
26768}; 26768};
26769 26769
@@ -27105,8 +27105,8 @@ static struct cipher_testvec camellia_xts_dec_tv_template[] = {
27105 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff", 27105 "\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff",
27106 .rlen = 512, 27106 .rlen = 512,
27107 .also_non_np = 1, 27107 .also_non_np = 1,
27108 .np = 2, 27108 .np = 3,
27109 .tap = { 512 - 16, 16 }, 27109 .tap = { 512 - 20, 4, 16 },
27110 }, 27110 },
27111}; 27111};
27112 27112