diff options
| author | lloyd <[email protected]> | 2009-12-24 21:38:25 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-24 21:38:25 +0000 |
| commit | 8e0c38eff91fc6c3df5cc0104704baa75149898e (patch) | |
| tree | e6d79db18899068f8cfa77f2455f00c86d86b6ef /checks | |
| parent | c85c79ac51b5829258dae7e51bb472b740da9574 (diff) | |
| parent | a48ae8f6c1aa605acbed76e9e2f1d6c2dcdd3d1e (diff) | |
propagate from branch 'net.randombit.botan' (head 367d157c1221a162f5b4098492944a509ef6d019)
to branch 'net.randombit.botan.c++0x' (head 1b9e8c4e92663f30b7d57b0fd8f57eb13cfce155)
Diffstat (limited to 'checks')
| -rw-r--r-- | checks/bench.cpp | 2 | ||||
| -rw-r--r-- | checks/check.cpp | 2 | ||||
| -rw-r--r-- | checks/misc.cpp | 2 | ||||
| -rw-r--r-- | checks/validate.dat | 17 |
4 files changed, 20 insertions, 3 deletions
diff --git a/checks/bench.cpp b/checks/bench.cpp index e733c75ec..df346ec75 100644 --- a/checks/bench.cpp +++ b/checks/bench.cpp @@ -147,7 +147,7 @@ void report_results(const std::string& algo, std::cout << " [" << i->second << "] " << std::fixed << std::setprecision(2) << i->first; } - std::cout << "\n"; + std::cout << std::endl; } } diff --git a/checks/check.cpp b/checks/check.cpp index 8b31f354d..975315608 100644 --- a/checks/check.cpp +++ b/checks/check.cpp @@ -123,7 +123,7 @@ int main(int argc, char* argv[]) opts.is_set("benchmark") || opts.is_set("bench-type")) { - double seconds = 2; + double seconds = 5; if(opts.is_set("seconds")) { diff --git a/checks/misc.cpp b/checks/misc.cpp index 198671451..a49778dc6 100644 --- a/checks/misc.cpp +++ b/checks/misc.cpp @@ -43,7 +43,7 @@ SecureVector<byte> decode_hex(const std::string& in) pipe.process_msg(in); result = pipe.read_all(); } - catch(std::exception& e) + catch(std::exception) { result.destroy(); } diff --git a/checks/validate.dat b/checks/validate.dat index ff2ed2f4b..9d319eaf3 100644 --- a/checks/validate.dat +++ b/checks/validate.dat @@ -4799,6 +4799,12 @@ D5D5D5D5D5D5D5D5:75F7C7005EA47839:D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5D5 0000000000000000:AA553A5DEC50E4A4:00000000000000040000000000000000 0000000000000001:0013FFF500120009:00000000000000000000000000000000 +000000010002000301020304050607080019324B647D96AFF5202D5B9C671B08\ +FAE6D2BEAA96826E0A141E28323C4650050A0F14191E2328050A0F14191E2328:\ +11FBED2B01986DE5540E5FEA18C2F8B19F0A0AB6E10CED78CF18FD7355E2C5C5\ +85DF52005608193D2F7DE750212FB7347B7314925DE59C097B7314925DE59C09:\ +00010002000300040005000600070008 + # Test vectors taken from ARIB STD-T63-35.203 V6.0.0 [KASUMI] EA024714AD5C4D84:DF1F9B251C0BF45F:2BD6459F82C5B300952C49104881FF48 @@ -23023,6 +23029,17 @@ AAE1BA501274C49A7A7EC67D7577114B7707DAB9D066AF086C09E7DD4116CEA6\ EE25DA9A65EF05A31ED0BDF56D525EC8968D1D01AF7165C5AEAC76BD367A575A:\ 00000000000000000000000000000000 +[IDEA/ECB/NoPadding] +000000010002000301020304050607080019324B647D96AFF5202D5B9C671B08\ +FAE6D2BEAA96826E0A141E28323C4650050A0F14191E2328050A0F14191E2328\ +000000010002000301020304050607080019324B647D96AFF5202D5B9C671B08\ +FAE6D2BEAA96826E0A141E28323C4650050A0F14191E2328050A0F14191E2328:\ +11FBED2B01986DE5540E5FEA18C2F8B19F0A0AB6E10CED78CF18FD7355E2C5C5\ +85DF52005608193D2F7DE750212FB7347B7314925DE59C097B7314925DE59C09\ +11FBED2B01986DE5540E5FEA18C2F8B19F0A0AB6E10CED78CF18FD7355E2C5C5\ +85DF52005608193D2F7DE750212FB7347B7314925DE59C097B7314925DE59C09:\ +00010002000300040005000600070008 + [DES/ECB/NoPadding] 059B5E0851CF143A:86A560F10EC6D85B:0113B970FD34F2CE 4E6F772069732074:3FA40E8A984D4815:0123456789ABCDEF |