Split AES tests by key length for AES-NI

1 files changed, 45 insertions, 44 deletions

diff --git a/checks/validate.dat b/checks/validate.dat
index 617be804c..9150c6b51 100644
--- a/checks/validate.dat
+++ b/checks/validate.dat
@@ -22957,7 +22957,7 @@ B4ECC305C3DBD8E5:FBBEC8F5DBF4CEFD:1B5E23EBD915C1FEE59F57DD91AF7347
 # The block cipher tests above are distinct from these ECB mode tests
 # for testing reasons. They could otherwise easily be CIPHER/ECB/NoPadding
 
-[AES/ECB/NoPadding]
+[AES-128/ECB/NoPadding]
 D8F532538289EF7D06B506A4FD5BE9C9FD7A929E0FD917686D9520ED236A276D\
 69E63C821F9DE0BF23CF1D19C7374FD1C3139DE2E1BA4693C3E9D29D774C2FF4\
 69E63C821F9DE0BF23CF1D19C7374FD1C3139DE2E1BA4693C3E9D29D774C2FF4\
@@ -23587,13 +23587,14 @@ EDE3E69EE5B55AC758EB39E70E6533CC4D89C148F6AD68293E743CD82B9638F020EE589D:\
 
 # From NIST Special Publication 800-XX (prerelease): "Recommendation for Block
 # Cipher Modes of Operation"
-[AES/CBC/NoPadding]
+[AES-128/CBC/NoPadding]
 6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E51\
 30C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710:\
 7649ABAC8119B246CEE98E9B12E9197D5086CB9B507219EE95DB113A917678B2\
 73BED6B8E3C1743B7116E69E222295163FF1CAA1681FAC09120ECA307586E1A7:\
 2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F
 
+[AES-192/CBC/NoPadding]
 6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E51\
 30C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710:\
 4F021DB243BC633D7178183A9FA071E8B4D9ADA9AD7DEDF4E5E738763F69145A\
@@ -23601,6 +23602,7 @@ EDE3E69EE5B55AC758EB39E70E6533CC4D89C148F6AD68293E743CD82B9638F020EE589D:\
 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:\
 000102030405060708090A0B0C0D0E0F
 
+[AES-256/CBC/NoPadding]
 6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E51\
 30C81C46A35CE411E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710:\
 F58C4C04D6E5F1BA779EABFB5F7BFBD69CFC4E967EDB808D679F777BC6702C7D\
@@ -23608,14 +23610,16 @@ F58C4C04D6E5F1BA779EABFB5F7BFBD69CFC4E967EDB808D679F777BC6702C7D\
 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:\
 000102030405060708090A0B0C0D0E0F
 
-[AES/CFB(8)]
+[AES-128/CFB(8)]
 6BC1BEE22E409F96E93D7E117393172AAE2D:3B79424C9C0DD436BACE9E0ED4586A4F32B9:\
 2B7E151628AED2A6ABF7158809CF4F3C:000102030405060708090A0B0C0D0E0F
 
+[AES-192/CFB(8)]
 6BC1BEE22E409F96E93D7E117393172AAE2D:CDA2521EF0A905CA44CD057CBF0D47A0678A:\
 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B:\
 000102030405060708090A0B0C0D0E0F
 
+[AES-256/CFB(8)]
 6BC1BEE22E409F96E93D7E117393172AAE2D:DC1F1A8520A64DB55FCC8AC554844E889700:\
 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4:\
 000102030405060708090A0B0C0D0E0F
@@ -23775,7 +23779,6 @@ E26112BE7A99FECC557C3D53674E6E670F824FE7784EFCCFA40BC88D4F88B5A29902171D:\
 FB18B846F801571026BD501FFFE67E8D51D6AE9B8379A8676F65E2C7EE0D02E9FF9BBB23482C:\
 30B6CF4FA2DDAE8CD2FC6ACAA5302B77:EEF619A392FEAC7DB491E4591088C041
 
-[AES/EAX]
 814C87C4E33C797A93A77DB1F045996667A1C10D78123A:\
 F5526447A82E275E9CAC44EDB940171F9123C3FDA7F55D\
 8586CB574A00AFC12381F40964D096CD:\
@@ -23993,7 +23996,7 @@ F71566B677596557D4C218DEC8A7D2611FE6FA07633C558FF372308F5D680C0F\
 E9E5E812B623D9E72C23518F082EA48C:\
 251AD494D64DAB08B66A96CB8C7876A6:F87A825C39326949EB19EE5BD30CCBF9
 
-[AES/EAX(64)]
+[AES-128/EAX(64)]
 :32E55CE0C3FAEA48:\
 C61A0851AB4E515D11525B92E2B9D850:C825FC7C4D539DC74887CECC70884F37
 
@@ -24228,43 +24231,6 @@ B3D32466028D0BA36555E7E11AB0EE0666061D1645D962444BC47A38188930A8\
 2718281828459045235360287471352631415926535897932384626433832795:\
 FF000000000000000000000000000000
 
-[AES/XTS]
-000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\
-202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\
-404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F\
-606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\
-808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F\
-A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF\
-C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF\
-E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF\
-000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\
-202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\
-404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F\
-606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\
-808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F\
-A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF\
-C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF\
-E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF:\
-1C3B3A102F770386E4836C99E370CF9BEA00803F5E482357A4AE12D414A3E63B\
-5D31E276F8FE4A8D66B317F9AC683F44680A86AC35ADFC3345BEFECB4BB188FD\
-5776926C49A3095EB108FD1098BAEC70AAA66999A72A82F27D848B21D4A741B0\
-C5CD4D5FFF9DAC89AEBA122961D03A757123E9870F8ACF1000020887891429CA\
-2A3E7A7D7DF7B10355165C8B9A6D0A7DE8B062C4500DC4CD120C0F7418DAE3D0\
-B5781C34803FA75421C790DFE1DE1834F280D7667B327F6C8CD7557E12AC3A0F\
-93EC05C52E0493EF31A12D3D9260F79A289D6A379BC70C50841473D1A8CC81EC\
-583E9645E07B8D9670655BA5BBCFECC6DC3966380AD8FECB17B6BA02469A020A\
-84E18E8F84252070C13E9F1F289BE54FBC481457778F616015E1327A02B140F1\
-505EB309326D68378F8374595C849D84F4C333EC4423885143CB47BD71C5EDAE\
-9BE69A2FFECEB1BEC9DE244FBE15992B11B77C040F12BD8F6A975A44A0F90C29\
-A9ABC3D4D893927284C58754CCE294529F8614DCD2ABA991925FEDC4AE74FFAC\
-6E333B93EB4AFF0479DA9A410E4450E0DD7AE4C6E2910900575DA401FC07059F\
-645E8B7E9BFDEF33943054FF84011493C27B3429EAEDB4ED5376441A77ED4385\
-1AD77F16F541DFD269D50D6A5F14FB0AAB1CBB4C1550BE97F7AB4066193C4CAA\
-773DAD38014BD2092FA755C824BB5E54C4F36FFDA9FCEA70B9C6E693E148C151:\
-2718281828459045235360287471352662497757247093699959574966967627\
-3141592653589793238462643383279502884197169399375105820974944592:\
-FF000000000000000000000000000000
-
 000102030405060708090A0B0C0D0E0F10:\
 6C1625DB4671522D3D7599601DE7CA09ED:\
 FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0BFBEBDBCBBBAB9B8B7B6B5B4B3B2B1B0:\
@@ -24320,13 +24286,48 @@ CAE4803A93AA4334AB482A0AFAC9C0AEDA70B45A481DF5DEC5DF8CC0F423C77A\
 E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECF:\
 21436587A90000000000000000000000
 
-# Generated by Botan
-
 000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E:\
 D05BC090A8E04F1B3D3ECDD5BAEC0FD4EDBF9DACE45D6F6A7306E64BE5DD82:\
 FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0BFBEBDBCBBBAB9B8B7B6B5B4B3B2B1B0:\
 9A785634120000000000000000000000
 
+[AES-256/XTS]
+000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\
+202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\
+404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F\
+606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\
+808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F\
+A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF\
+C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF\
+E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF\
+000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\
+202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\
+404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F\
+606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F\
+808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F\
+A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF\
+C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF\
+E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF:\
+1C3B3A102F770386E4836C99E370CF9BEA00803F5E482357A4AE12D414A3E63B\
+5D31E276F8FE4A8D66B317F9AC683F44680A86AC35ADFC3345BEFECB4BB188FD\
+5776926C49A3095EB108FD1098BAEC70AAA66999A72A82F27D848B21D4A741B0\
+C5CD4D5FFF9DAC89AEBA122961D03A757123E9870F8ACF1000020887891429CA\
+2A3E7A7D7DF7B10355165C8B9A6D0A7DE8B062C4500DC4CD120C0F7418DAE3D0\
+B5781C34803FA75421C790DFE1DE1834F280D7667B327F6C8CD7557E12AC3A0F\
+93EC05C52E0493EF31A12D3D9260F79A289D6A379BC70C50841473D1A8CC81EC\
+583E9645E07B8D9670655BA5BBCFECC6DC3966380AD8FECB17B6BA02469A020A\
+84E18E8F84252070C13E9F1F289BE54FBC481457778F616015E1327A02B140F1\
+505EB309326D68378F8374595C849D84F4C333EC4423885143CB47BD71C5EDAE\
+9BE69A2FFECEB1BEC9DE244FBE15992B11B77C040F12BD8F6A975A44A0F90C29\
+A9ABC3D4D893927284C58754CCE294529F8614DCD2ABA991925FEDC4AE74FFAC\
+6E333B93EB4AFF0479DA9A410E4450E0DD7AE4C6E2910900575DA401FC07059F\
+645E8B7E9BFDEF33943054FF84011493C27B3429EAEDB4ED5376441A77ED4385\
+1AD77F16F541DFD269D50D6A5F14FB0AAB1CBB4C1550BE97F7AB4066193C4CAA\
+773DAD38014BD2092FA755C824BB5E54C4F36FFDA9FCEA70B9C6E693E148C151:\
+2718281828459045235360287471352662497757247093699959574966967627\
+3141592653589793238462643383279502884197169399375105820974944592:\
+FF000000000000000000000000000000
+
 [Serpent/XTS]
 
 53514C69746520666F726D6174203300040001010040202091E4F9BE00000000\