From bd65ff0b39f3bfb23cef865dd03044a99d97d2fd Mon Sep 17 00:00:00 2001 From: andreaP Date: Tue, 23 Dec 2014 15:25:59 +0100 Subject: fixes and tests --- lib/crypto/test/crypto_SUITE.erl | 102 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) (limited to 'lib/crypto/test/crypto_SUITE.erl') diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl index 1031e6403f..1206ba2ca2 100644 --- a/lib/crypto/test/crypto_SUITE.erl +++ b/lib/crypto/test/crypto_SUITE.erl @@ -58,6 +58,7 @@ all() -> {group, aes_cfb8}, {group, aes_cfb128}, {group, aes_cbc256}, + {group, aes_ecb}, {group, aes_ige256}, {group, rc2_cbc}, {group, rc4}, @@ -96,6 +97,7 @@ groups() -> {aes_cfb8,[], [block]}, {aes_cfb128,[], [block]}, {aes_cbc256,[], [block]}, + {aes_ecb,[], [block]}, {aes_ige256,[], [block]}, {blowfish_cbc, [], [block]}, {blowfish_ecb, [], [block]}, @@ -749,6 +751,9 @@ group_config(aes_cbc128, Config) -> group_config(aes_cbc256, Config) -> Block = aes_cbc256(), [{block, Block} | Config]; +group_config(aes_ecb, Config) -> + Block = aes_ecb(), + [{block, Block} | Config]; group_config(aes_ige256, Config) -> Block = aes_ige256(), [{block, Block} | Config]; @@ -1183,6 +1188,103 @@ aes_cbc256() -> hexstr2bin("f69f2445df4f9b17ad2b417be66c3710")} ]. +aes_ecb() -> + [ + {aes_ecb, + hexstr2bin("0000000000000000"), + hexstr2bin("0000000000000000")}, + {aes_ecb, + hexstr2bin("FFFFFFFFFFFFFFFF"), + hexstr2bin("FFFFFFFFFFFFFFFF")}, + {aes_ecb, + hexstr2bin("3000000000000000"), + hexstr2bin("1000000000000001")}, + {aes_ecb, + hexstr2bin("1111111111111111"), + hexstr2bin("1111111111111111")}, + {aes_ecb, + hexstr2bin("0123456789ABCDEF"), + hexstr2bin("1111111111111111")}, + {aes_ecb, + hexstr2bin("0000000000000000"), + hexstr2bin("0000000000000000")}, + {aes_ecb, + hexstr2bin("FEDCBA9876543210"), + hexstr2bin("0123456789ABCDEF")}, + {aes_ecb, + hexstr2bin("7CA110454A1A6E57"), + hexstr2bin("01A1D6D039776742")}, + {aes_ecb, + hexstr2bin("0131D9619DC1376E"), + hexstr2bin("5CD54CA83DEF57DA")}, + {aes_ecb, + hexstr2bin("07A1133E4A0B2686"), + hexstr2bin("0248D43806F67172")}, + {aes_ecb, + hexstr2bin("3849674C2602319E"), + hexstr2bin("51454B582DDF440A")}, + {aes_ecb, + hexstr2bin("04B915BA43FEB5B6"), + hexstr2bin("42FD443059577FA2")}, + {aes_ecb, + hexstr2bin("0113B970FD34F2CE"), + hexstr2bin("059B5E0851CF143A")}, + {aes_ecb, + hexstr2bin("0170F175468FB5E6"), + hexstr2bin("0756D8E0774761D2")}, + {aes_ecb, + hexstr2bin("43297FAD38E373FE"), + hexstr2bin("762514B829BF486A")}, + {aes_ecb, + hexstr2bin("07A7137045DA2A16"), + hexstr2bin("3BDD119049372802")}, + {aes_ecb, + hexstr2bin("04689104C2FD3B2F"), + hexstr2bin("26955F6835AF609A")}, + {aes_ecb, + hexstr2bin("37D06BB516CB7546"), + hexstr2bin("164D5E404F275232")}, + {aes_ecb, + hexstr2bin("1F08260D1AC2465E"), + hexstr2bin("6B056E18759F5CCA")}, + {aes_ecb, + hexstr2bin("584023641ABA6176"), + hexstr2bin("004BD6EF09176062")}, + {aes_ecb, + hexstr2bin("025816164629B007"), + hexstr2bin("480D39006EE762F2")}, + {aes_ecb, + hexstr2bin("49793EBC79B3258F"), + hexstr2bin("437540C8698F3CFA")}, + {aes_ecb, + hexstr2bin("018310DC409B26D6"), + hexstr2bin("1D9D5C5018F728C2")}, + {aes_ecb, + hexstr2bin("1C587F1C13924FEF"), + hexstr2bin("305532286D6F295A")}, + {aes_ecb, + hexstr2bin("0101010101010101"), + hexstr2bin("0123456789ABCDEF")}, + {aes_ecb, + hexstr2bin("1F1F1F1F0E0E0E0E"), + hexstr2bin("0123456789ABCDEF")}, + {aes_ecb, + hexstr2bin("E0FEE0FEF1FEF1FE"), + hexstr2bin("0123456789ABCDEF")}, + {aes_ecb, + hexstr2bin("0000000000000000"), + hexstr2bin("FFFFFFFFFFFFFFFF")}, + {aes_ecb, + hexstr2bin("FFFFFFFFFFFFFFFF"), + hexstr2bin("0000000000000000")}, + {aes_ecb, + hexstr2bin("0123456789ABCDEF"), + hexstr2bin("0000000000000000")}, + {aes_ecb, + hexstr2bin("FEDCBA9876543210"), + hexstr2bin("FFFFFFFFFFFFFFFF")} + ]. + aes_ige256() -> [{aes_ige256, hexstr2bin("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"), -- cgit v1.2.3 From 6dbb25ea9c95b5101975e8ce60db65c219449266 Mon Sep 17 00:00:00 2001 From: andreaP Date: Thu, 8 Jan 2015 18:04:57 +0100 Subject: aligned implementation following last specs --- lib/crypto/test/crypto_SUITE.erl | 127 ++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 62 deletions(-) (limited to 'lib/crypto/test/crypto_SUITE.erl') diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl index 1206ba2ca2..e3ff753f71 100644 --- a/lib/crypto/test/crypto_SUITE.erl +++ b/lib/crypto/test/crypto_SUITE.erl @@ -1191,98 +1191,101 @@ aes_cbc256() -> aes_ecb() -> [ {aes_ecb, - hexstr2bin("0000000000000000"), - hexstr2bin("0000000000000000")}, + <<"YELLOW SUBMARINE">>, + <<"YELLOW SUBMARINE">>}, {aes_ecb, - hexstr2bin("FFFFFFFFFFFFFFFF"), - hexstr2bin("FFFFFFFFFFFFFFFF")}, + <<"0000000000000000">>, + <<"0000000000000000">>}, {aes_ecb, - hexstr2bin("3000000000000000"), - hexstr2bin("1000000000000001")}, + <<"FFFFFFFFFFFFFFFF">>, + <<"FFFFFFFFFFFFFFFF">>}, {aes_ecb, - hexstr2bin("1111111111111111"), - hexstr2bin("1111111111111111")}, + <<"3000000000000000">>, + <<"1000000000000001">>}, {aes_ecb, - hexstr2bin("0123456789ABCDEF"), - hexstr2bin("1111111111111111")}, + <<"1111111111111111">>, + <<"1111111111111111">>}, {aes_ecb, - hexstr2bin("0000000000000000"), - hexstr2bin("0000000000000000")}, + <<"0123456789ABCDEF">>, + <<"1111111111111111">>}, {aes_ecb, - hexstr2bin("FEDCBA9876543210"), - hexstr2bin("0123456789ABCDEF")}, + <<"0000000000000000">>, + <<"0000000000000000">>}, {aes_ecb, - hexstr2bin("7CA110454A1A6E57"), - hexstr2bin("01A1D6D039776742")}, + <<"FEDCBA9876543210">>, + <<"0123456789ABCDEF">>}, {aes_ecb, - hexstr2bin("0131D9619DC1376E"), - hexstr2bin("5CD54CA83DEF57DA")}, + <<"7CA110454A1A6E57">>, + <<"01A1D6D039776742">>}, {aes_ecb, - hexstr2bin("07A1133E4A0B2686"), - hexstr2bin("0248D43806F67172")}, + <<"0131D9619DC1376E">>, + <<"5CD54CA83DEF57DA">>}, {aes_ecb, - hexstr2bin("3849674C2602319E"), - hexstr2bin("51454B582DDF440A")}, + <<"07A1133E4A0B2686">>, + <<"0248D43806F67172">>}, {aes_ecb, - hexstr2bin("04B915BA43FEB5B6"), - hexstr2bin("42FD443059577FA2")}, + <<"3849674C2602319E">>, + <<"51454B582DDF440A">>}, {aes_ecb, - hexstr2bin("0113B970FD34F2CE"), - hexstr2bin("059B5E0851CF143A")}, + <<"04B915BA43FEB5B6">>, + <<"42FD443059577FA2">>}, {aes_ecb, - hexstr2bin("0170F175468FB5E6"), - hexstr2bin("0756D8E0774761D2")}, + <<"0113B970FD34F2CE">>, + <<"059B5E0851CF143A">>}, {aes_ecb, - hexstr2bin("43297FAD38E373FE"), - hexstr2bin("762514B829BF486A")}, + <<"0170F175468FB5E6">>, + <<"0756D8E0774761D2">>}, {aes_ecb, - hexstr2bin("07A7137045DA2A16"), - hexstr2bin("3BDD119049372802")}, + <<"43297FAD38E373FE">>, + <<"762514B829BF486A">>}, {aes_ecb, - hexstr2bin("04689104C2FD3B2F"), - hexstr2bin("26955F6835AF609A")}, + <<"07A7137045DA2A16">>, + <<"3BDD119049372802">>}, {aes_ecb, - hexstr2bin("37D06BB516CB7546"), - hexstr2bin("164D5E404F275232")}, + <<"04689104C2FD3B2F">>, + <<"26955F6835AF609A">>}, {aes_ecb, - hexstr2bin("1F08260D1AC2465E"), - hexstr2bin("6B056E18759F5CCA")}, + <<"37D06BB516CB7546">>, + <<"164D5E404F275232">>}, {aes_ecb, - hexstr2bin("584023641ABA6176"), - hexstr2bin("004BD6EF09176062")}, + <<"1F08260D1AC2465E">>, + <<"6B056E18759F5CCA">>}, {aes_ecb, - hexstr2bin("025816164629B007"), - hexstr2bin("480D39006EE762F2")}, + <<"584023641ABA6176">>, + <<"004BD6EF09176062">>}, {aes_ecb, - hexstr2bin("49793EBC79B3258F"), - hexstr2bin("437540C8698F3CFA")}, + <<"025816164629B007">>, + <<"480D39006EE762F2">>}, {aes_ecb, - hexstr2bin("018310DC409B26D6"), - hexstr2bin("1D9D5C5018F728C2")}, + <<"49793EBC79B3258F">>, + <<"437540C8698F3CFA">>}, {aes_ecb, - hexstr2bin("1C587F1C13924FEF"), - hexstr2bin("305532286D6F295A")}, + <<"018310DC409B26D6">>, + <<"1D9D5C5018F728C2">>}, {aes_ecb, - hexstr2bin("0101010101010101"), - hexstr2bin("0123456789ABCDEF")}, + <<"1C587F1C13924FEF">>, + <<"305532286D6F295A">>}, {aes_ecb, - hexstr2bin("1F1F1F1F0E0E0E0E"), - hexstr2bin("0123456789ABCDEF")}, + <<"0101010101010101">>, + <<"0123456789ABCDEF">>}, {aes_ecb, - hexstr2bin("E0FEE0FEF1FEF1FE"), - hexstr2bin("0123456789ABCDEF")}, + <<"1F1F1F1F0E0E0E0E">>, + <<"0123456789ABCDEF">>}, {aes_ecb, - hexstr2bin("0000000000000000"), - hexstr2bin("FFFFFFFFFFFFFFFF")}, + <<"E0FEE0FEF1FEF1FE">>, + <<"0123456789ABCDEF">>}, {aes_ecb, - hexstr2bin("FFFFFFFFFFFFFFFF"), - hexstr2bin("0000000000000000")}, + <<"0000000000000000">>, + <<"FFFFFFFFFFFFFFFF">>}, {aes_ecb, - hexstr2bin("0123456789ABCDEF"), - hexstr2bin("0000000000000000")}, + <<"FFFFFFFFFFFFFFFF">>, + <<"0000000000000000">>}, {aes_ecb, - hexstr2bin("FEDCBA9876543210"), - hexstr2bin("FFFFFFFFFFFFFFFF")} + <<"0123456789ABCDEF">>, + <<"0000000000000000">>}, + {aes_ecb, + <<"FEDCBA9876543210">>, + <<"FFFFFFFFFFFFFFFF">>} ]. aes_ige256() -> -- cgit v1.2.3