From 49f652c44edb1d6aa40cdd45ac940fc1d294c88b Mon Sep 17 00:00:00 2001 From: Jack Lloyd Date: Sun, 24 Sep 2017 17:47:46 -0400 Subject: Move ocb test data to ocb/ subdir [ci skip] --- src/tests/data/ocb/ocb_long.vec | 36 ++++++++++++++++++++++ src/tests/data/ocb/ocb_wide.vec | 60 ++++++++++++++++++++++++++++++++++++ src/tests/data/ocb/ocb_wide_long.vec | 15 +++++++++ src/tests/data/ocb_long.vec | 36 ---------------------- src/tests/data/ocb_wide.vec | 60 ------------------------------------ src/tests/data/ocb_wide_long.vec | 15 --------- src/tests/test_ocb.cpp | 6 ++-- 7 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 src/tests/data/ocb/ocb_long.vec create mode 100644 src/tests/data/ocb/ocb_wide.vec create mode 100644 src/tests/data/ocb/ocb_wide_long.vec delete mode 100644 src/tests/data/ocb_long.vec delete mode 100644 src/tests/data/ocb_wide.vec delete mode 100644 src/tests/data/ocb_wide_long.vec diff --git a/src/tests/data/ocb/ocb_long.vec b/src/tests/data/ocb/ocb_long.vec new file mode 100644 index 000000000..046ee3208 --- /dev/null +++ b/src/tests/data/ocb/ocb_long.vec @@ -0,0 +1,36 @@ + +Keylen = 128 +Taglen = 128 +Output = 67E944D23256C5E0B6C61FA22FDF1EA2 + +Keylen = 192 +Taglen = 128 +Output = F673F2C3E7174AAE7BAE986CA9F29E17 + +Keylen = 256 +Taglen = 128 +Output = D90EB8E9C977C88B79DD793D7FFA161C + +Keylen = 128 +Taglen = 96 +Output = 77A3D8E73589158D25D01209 + +Keylen = 192 +Taglen = 96 +Output = 05D56EAD2752C86BE6932C5E + +Keylen = 256 +Taglen = 96 +Output = 5458359AC23B0CBA9E6330DD + +Keylen = 128 +Taglen = 64 +Output = 192C9B7BD90BA06A + +Keylen = 192 +Taglen = 64 +Output = 0066BC6E0EF34E24 + +Keylen = 256 +Taglen = 64 +Output = 7D4EA5D445501CBE diff --git a/src/tests/data/ocb/ocb_wide.vec b/src/tests/data/ocb/ocb_wide.vec new file mode 100644 index 000000000..0bed695ef --- /dev/null +++ b/src/tests/data/ocb/ocb_wide.vec @@ -0,0 +1,60 @@ + +Key = 8182838485868788898A8B8C8D8E8F909192939495969798 +Nonce = F0F1 +AD = +In = +Out = B9CACBDCDDCECFFF75C0B9AA97808DE6FBCCC1D2AFB8B482 + +Key = 9192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8 +Nonce = F1F2 +AD = 05060708090A0B0C0D0E0F10 +In = 0102030405060708090A0B0C +Out = 4EB0BAACA698928B86E59F81B3474B5F53676B404B225E622E1206EADEA2B6BB4F736646 + +Key = A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8 +Nonce = F2F3 +AD = 060708090A0B0C0D0E0F101112131415161718191A1B1C1D +In = 02030405060708090A0B0C0D0E0F10111213141516171819 +Out = A8B5AEA7B4E9E2A2E803081982C7C46D36B380908BCEEE0775898DA1B5C9CDFF8522E6DA3E52461A7E92A69B7F132636 + +Key = B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8 +Nonce = F3F4 +AD = 0708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A +In = 030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242526 +Out = F8F1CEBB841D227D911D024669E08D903E0768250AA3CFF7BC466C3E14D6FC8A3D3ED4A70295B8FBD6416C3B8BA5482AFF18576CA0672A468B4C021C + +Key = C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8 +Nonce = F4F5 +AD = 08090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F3031323334353637 +In = 0405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233 +Out = CEFB901163563D53D5AC8764164388D091C40FEAB8ED24B7ECF1824B415C2FC95706359ED4A97B2B720FDC711B66B2915C8BC62509DE93E236965BFB57C04D57F96EE347EB7CF322 + +Key = 8182838485868788898A8B8C8D8E8F909192939495969798 +Nonce = F0F1F2F3F4F5F6F7F8F9FAFB +AD = +In = +Out = F00F1A7125DACF832FD0F50E6B44615C9996D209B29DF961 + +Key = 9192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8 +Nonce = F1F2F3F4F5F6F7F8F9FAFBFC +AD = 05060708090A0B0C0D0E0F10 +In = 0102030405060708090A0B0C +Out = 9AFC5E331177D5B4A34506C8670BAFC0E4882C7F6E82C72BD79BDF9E5AD6D4C830BC7A8B + +Key = A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8 +Nonce = F2F3F4F5F6F7F8F9FAFBFCFD +AD = 060708090A0B0C0D0E0F101112131415161718191A1B1C1D +In = 02030405060708090A0B0C0D0E0F10111213141516171819 +Out = 92A7C0C02A1F6E245762A3C3885DAFF1FAED6ACB4514475A5995C61B5E92C504AF63D449CD41F4F2F6F9EAF60B8017A0 + +Key = B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8 +Nonce = F3F4F5F6F7F8F9FAFBFCFDFE +AD = 0708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A +In = 030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242526 +Out = 2070BEDB155997DD86DE55F27CD45AA8223B16313C31BCC0D347CC7EF551DA4A27BCB1806D9418BB37C64AFB91272D0D193F32BCB7B081A150505FBB + +Key = C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8 +Nonce = F4F5F6F7F8F9FAFBFCFDFEFF +AD = 08090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F3031323334353637 +In = 0405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233 +Out = 70E46BCD56C24D0FBC2A280C3C2A26A9AAB9A0979B8B81C952EE799774C85F953E809AF6FEC0D5524972730C380017EF889E94B2D0C6CC75879291B49B8E86F9D4C7D6EE29383576 diff --git a/src/tests/data/ocb/ocb_wide_long.vec b/src/tests/data/ocb/ocb_wide_long.vec new file mode 100644 index 000000000..9fdb0b8a2 --- /dev/null +++ b/src/tests/data/ocb/ocb_wide_long.vec @@ -0,0 +1,15 @@ + +[Toy128] +Output = 0D099181BE37171BF94582877D6D4693 + +[Toy192] +Output = BFC53A29EABF2774369F3611DED760AE33338B607E5A8E40 + +[Toy256] +Output = 623C27E137975E25BEF2F8441CB5BDEAE8E0F1E158515193900BBD20D1A7AFF7 + +[Toy512] +Output = 6748655A0A83543D8AA6287AE9FFC37C9A433332DDFD4E8B42F94D741944D440 + +[SHACAL2] +Output = DC4AA181A65BD11EAA23D0881A20740B7DBA53C9DE2474DB3C3EF04770DFAD99 diff --git a/src/tests/data/ocb_long.vec b/src/tests/data/ocb_long.vec deleted file mode 100644 index 046ee3208..000000000 --- a/src/tests/data/ocb_long.vec +++ /dev/null @@ -1,36 +0,0 @@ - -Keylen = 128 -Taglen = 128 -Output = 67E944D23256C5E0B6C61FA22FDF1EA2 - -Keylen = 192 -Taglen = 128 -Output = F673F2C3E7174AAE7BAE986CA9F29E17 - -Keylen = 256 -Taglen = 128 -Output = D90EB8E9C977C88B79DD793D7FFA161C - -Keylen = 128 -Taglen = 96 -Output = 77A3D8E73589158D25D01209 - -Keylen = 192 -Taglen = 96 -Output = 05D56EAD2752C86BE6932C5E - -Keylen = 256 -Taglen = 96 -Output = 5458359AC23B0CBA9E6330DD - -Keylen = 128 -Taglen = 64 -Output = 192C9B7BD90BA06A - -Keylen = 192 -Taglen = 64 -Output = 0066BC6E0EF34E24 - -Keylen = 256 -Taglen = 64 -Output = 7D4EA5D445501CBE diff --git a/src/tests/data/ocb_wide.vec b/src/tests/data/ocb_wide.vec deleted file mode 100644 index 0bed695ef..000000000 --- a/src/tests/data/ocb_wide.vec +++ /dev/null @@ -1,60 +0,0 @@ - -Key = 8182838485868788898A8B8C8D8E8F909192939495969798 -Nonce = F0F1 -AD = -In = -Out = B9CACBDCDDCECFFF75C0B9AA97808DE6FBCCC1D2AFB8B482 - -Key = 9192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8 -Nonce = F1F2 -AD = 05060708090A0B0C0D0E0F10 -In = 0102030405060708090A0B0C -Out = 4EB0BAACA698928B86E59F81B3474B5F53676B404B225E622E1206EADEA2B6BB4F736646 - -Key = A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8 -Nonce = F2F3 -AD = 060708090A0B0C0D0E0F101112131415161718191A1B1C1D -In = 02030405060708090A0B0C0D0E0F10111213141516171819 -Out = A8B5AEA7B4E9E2A2E803081982C7C46D36B380908BCEEE0775898DA1B5C9CDFF8522E6DA3E52461A7E92A69B7F132636 - -Key = B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8 -Nonce = F3F4 -AD = 0708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A -In = 030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242526 -Out = F8F1CEBB841D227D911D024669E08D903E0768250AA3CFF7BC466C3E14D6FC8A3D3ED4A70295B8FBD6416C3B8BA5482AFF18576CA0672A468B4C021C - -Key = C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8 -Nonce = F4F5 -AD = 08090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F3031323334353637 -In = 0405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233 -Out = CEFB901163563D53D5AC8764164388D091C40FEAB8ED24B7ECF1824B415C2FC95706359ED4A97B2B720FDC711B66B2915C8BC62509DE93E236965BFB57C04D57F96EE347EB7CF322 - -Key = 8182838485868788898A8B8C8D8E8F909192939495969798 -Nonce = F0F1F2F3F4F5F6F7F8F9FAFB -AD = -In = -Out = F00F1A7125DACF832FD0F50E6B44615C9996D209B29DF961 - -Key = 9192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8 -Nonce = F1F2F3F4F5F6F7F8F9FAFBFC -AD = 05060708090A0B0C0D0E0F10 -In = 0102030405060708090A0B0C -Out = 9AFC5E331177D5B4A34506C8670BAFC0E4882C7F6E82C72BD79BDF9E5AD6D4C830BC7A8B - -Key = A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8 -Nonce = F2F3F4F5F6F7F8F9FAFBFCFD -AD = 060708090A0B0C0D0E0F101112131415161718191A1B1C1D -In = 02030405060708090A0B0C0D0E0F10111213141516171819 -Out = 92A7C0C02A1F6E245762A3C3885DAFF1FAED6ACB4514475A5995C61B5E92C504AF63D449CD41F4F2F6F9EAF60B8017A0 - -Key = B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8 -Nonce = F3F4F5F6F7F8F9FAFBFCFDFE -AD = 0708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A -In = 030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242526 -Out = 2070BEDB155997DD86DE55F27CD45AA8223B16313C31BCC0D347CC7EF551DA4A27BCB1806D9418BB37C64AFB91272D0D193F32BCB7B081A150505FBB - -Key = C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8 -Nonce = F4F5F6F7F8F9FAFBFCFDFEFF -AD = 08090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F3031323334353637 -In = 0405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233 -Out = 70E46BCD56C24D0FBC2A280C3C2A26A9AAB9A0979B8B81C952EE799774C85F953E809AF6FEC0D5524972730C380017EF889E94B2D0C6CC75879291B49B8E86F9D4C7D6EE29383576 diff --git a/src/tests/data/ocb_wide_long.vec b/src/tests/data/ocb_wide_long.vec deleted file mode 100644 index 9fdb0b8a2..000000000 --- a/src/tests/data/ocb_wide_long.vec +++ /dev/null @@ -1,15 +0,0 @@ - -[Toy128] -Output = 0D099181BE37171BF94582877D6D4693 - -[Toy192] -Output = BFC53A29EABF2774369F3611DED760AE33338B607E5A8E40 - -[Toy256] -Output = 623C27E137975E25BEF2F8441CB5BDEAE8E0F1E158515193900BBD20D1A7AFF7 - -[Toy512] -Output = 6748655A0A83543D8AA6287AE9FFC37C9A433332DDFD4E8B42F94D741944D440 - -[SHACAL2] -Output = DC4AA181A65BD11EAA23D0881A20740B7DBA53C9DE2474DB3C3EF04770DFAD99 diff --git a/src/tests/test_ocb.cpp b/src/tests/test_ocb.cpp index 8fc41c6c6..07f216f96 100644 --- a/src/tests/test_ocb.cpp +++ b/src/tests/test_ocb.cpp @@ -114,7 +114,7 @@ class OCB_Wide_KAT_Tests final : public Text_Based_Test { public: OCB_Wide_KAT_Tests() - : Text_Based_Test("ocb_wide.vec", "Key,Nonce,AD,In,Out") {} + : Text_Based_Test("ocb/ocb_wide.vec", "Key,Nonce,AD,In,Out") {} Test::Result run_one_test(const std::string&, const VarMap& vars) override { @@ -153,7 +153,7 @@ class OCB_Wide_Long_KAT_Tests final : public Text_Based_Test { public: OCB_Wide_Long_KAT_Tests() - : Text_Based_Test("ocb_wide_long.vec", "Output") {} + : Text_Based_Test("ocb/ocb_wide_long.vec", "Output") {} Test::Result run_one_test(const std::string& algo, const VarMap& vars) override { @@ -266,7 +266,7 @@ class OCB_Long_KAT_Tests final : public Text_Based_Test { public: OCB_Long_KAT_Tests() - : Text_Based_Test("ocb_long.vec", + : Text_Based_Test("ocb/ocb_long.vec", "Keylen,Taglen,Output") {} Test::Result run_one_test(const std::string&, const VarMap& vars) override -- cgit v1.2.3