From e75d775e7c8dd58f06e699371f44928535a59c44 Mon Sep 17 00:00:00 2001 From: mdw Date: Sat, 15 Jul 2000 10:03:13 +0000 Subject: [PATCH] Formatting changes. --- tests/blowfish | 4 +--- tests/dsa | 5 +---- tests/lcrand | 3 +-- tests/md4 | 3 +-- tests/md5 | 4 +--- tests/mp | 3 +-- tests/mptext | 61 ++++++++++++++++++++++++++++------------------------------ tests/mpx | 4 +--- tests/rmd256 | 5 ++--- tests/rmd320 | 5 ++--- tests/sha | 4 +--- 11 files changed, 41 insertions(+), 60 deletions(-) diff --git a/tests/blowfish b/tests/blowfish index 612dc7d..4eb4bc1 100644 --- a/tests/blowfish +++ b/tests/blowfish @@ -1,6 +1,6 @@ # Test vectors for Blowfish # -# $Id: blowfish,v 1.1 1999/09/03 08:41:14 mdw Exp $ +# $Id: blowfish,v 1.2 2000/07/15 10:03:13 mdw Exp $ # --- Main block cipher --- # @@ -48,7 +48,6 @@ blowfish { # From wherever the previous tests came from. blowfish-sched { - f0 fedcba9876543210 f9ad597c49db005e; @@ -120,5 +119,4 @@ blowfish-sched { f0e1d2c3b4a5968778695a4b3c2d1e0f0011223344556677 fedcba9876543210 05044b62fa52d080; - } diff --git a/tests/dsa b/tests/dsa index 4b2b766..58ea8bb 100644 --- a/tests/dsa +++ b/tests/dsa @@ -1,6 +1,6 @@ # Test vectors for DSA # -# $Id: dsa,v 1.3 2000/07/05 17:49:31 mdw Exp $ +# $Id: dsa,v 1.4 2000/07/15 10:03:13 mdw Exp $ # --- About the tests --- # @@ -9,7 +9,6 @@ # and verification. gen { - # --- One that I made up --- bbac0ab63411435cb72f1f95b16ab94c92c34221 256 @@ -34,7 +33,6 @@ gen { } sign { - # --- Quick simple test --- 0x84d192cd06ae59691897fa409da6198d5269325d @@ -69,7 +67,6 @@ sign { } verify-good { - # --- Simple test ---- 0x84d192cd06ae59691897fa409da6198d5269325d diff --git a/tests/lcrand b/tests/lcrand index c9e66e8..791727e 100644 --- a/tests/lcrand +++ b/tests/lcrand @@ -1,9 +1,8 @@ # Test vectors for linear congruential generator # -# $Id: lcrand,v 1.2 2000/07/09 21:33:54 mdw Exp $ +# $Id: lcrand,v 1.3 2000/07/15 10:03:13 mdw Exp $ lcrand { - # --- Standard stuff --- 0 271828183; diff --git a/tests/md4 b/tests/md4 index 551b6a3..bfa1864 100644 --- a/tests/md4 +++ b/tests/md4 @@ -1,6 +1,6 @@ # Test vectors for MD4 hash function # -# $Id: md4,v 1.1 1999/09/03 08:41:14 mdw Exp $ +# $Id: md4,v 1.2 2000/07/15 10:03:13 mdw Exp $ # --- Basic hash function --- # @@ -8,7 +8,6 @@ # implementation. md4 { - "" 31d6cfe0d16ae931b73c59d7e0c089c0; "a" bde52cb31de33e46245e05fbdbd6fb24; "abc" a448017aaf21d8525fc10ae87aa6729d; diff --git a/tests/md5 b/tests/md5 index 4e9e306..d34918d 100644 --- a/tests/md5 +++ b/tests/md5 @@ -1,6 +1,6 @@ # Test vectors for MD5 hash function # -# $Id: md5,v 1.2 2000/07/09 21:33:54 mdw Exp $ +# $Id: md5,v 1.3 2000/07/15 10:03:13 mdw Exp $ # --- Basic hash function --- # @@ -8,7 +8,6 @@ # implementation. md5 { - "" d41d8cd98f00b204e9800998ecf8427e; "a" 0cc175b9c0f1b6a831c399e269772661; "abc" 900150983cd24fb0d6963f7d28e17f72; @@ -51,7 +50,6 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 # Test vectors from RFC2104 and RFC2202. md5-hmac { - "Hi There" 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b 9294727a3638bb1c13f48ef8158bfc9d; diff --git a/tests/mp b/tests/mp index 599ef97..ed5e3b8 100644 --- a/tests/mp +++ b/tests/mp @@ -1,6 +1,6 @@ # Test vectors for MP functions # -# $Id: mp,v 1.6 2000/07/09 21:33:40 mdw Exp $ +# $Id: mp,v 1.7 2000/07/15 10:03:13 mdw Exp $ add { 5 4 9; 5 -4 1; -5 4 -1; -5 -4 -9; @@ -47,7 +47,6 @@ sqrt { } gcd { - # --- Simple tests --- 16 12 4 -2 3; diff --git a/tests/mptext b/tests/mptext index 973a0ad..8624eaf 100644 --- a/tests/mptext +++ b/tests/mptext @@ -1,41 +1,38 @@ # Test vectors for MP textual I/O # -# $Id: mptext,v 1.4 2000/06/25 12:58:34 mdw Exp $ +# $Id: mptext,v 1.5 2000/07/15 10:03:13 mdw Exp $ mptext-ascii { + # --- Perfectly valid things --- + + 10 0 10 0; + 0 0 10 0; + 10 52 10 52; + 10 654365464655464577673765769678 10 654365464655464577673765769678; + 10 654365464655464577673765769678 16 8425e6d06f272b9a2d73ed1ce; + 16 8425E6D06F272B9A2D73ED1CE 10 654365464655464577673765769678; + 0 654365464655464577673765769678 16 8425e6d06f272b9a2d73ed1ce; + 0 16_8425E6D06F272B9A2D73ED1CE 10 654365464655464577673765769678; + 0 -0x8425E6D06F272B9A2D73ED1CE 10 -654365464655464577673765769678; + 8 -366570443501403714657464766613 10 -596569802840985608098409867; + 0 0366570443501403714657464766613 10 596569802840985608098409867; + + # --- Bogus things --- + + 10 "" 0 0; # Empty string fails + 10 foo 0 0; # Non-numeric character + 10 134f 10 134; # Stop parsing when reaching `f' + 4 12345 10 27; # Stop parsing when reaching `4' + 0 37_ 10 37; # 37 is an invalid base, so stop at `_' + 0 36_ 0 0; # 36 is a valid base, so restart and fail + + # --- Bugs --- + + 16 -9802d5c5d5a73f9d4e694a8920f95231b4017f3ec6a4654ace3fa3d85879e5964dade0e051d57f13c275dab1df3da5331f39271efb2792d1dad4460fd5eb5c21fbf355456f523e5631e623074ff9b3e85cf5e0a9336c8d8b8621b24c4e625800ee0152d12c8e22658a66ade38cb4453ab6e4958114717355186649a6cc20d9f5ae2207f99814965035072a9f2121c8f9dd22ab134181378906291aae97287b62a2f592bbceb4198c9cd78e1968bf1e16865c3c6ce9c777232f186b5da240a24523a07faca9de44eba510c91917e099372e67a6a66e93fe7aaefcb9c5485e1a889eae721ab6407586880a95575a968b43bdf50323627aa0fcddfa4e198b0008 + 10 -74959454570640520505374182178324326240748657042677990093617716411759477136824854815262670168473667077524864904515489090301434501507378472350618141578200289566815110468728966378289347050752371322168328511598641143081017162500179880923097593329564317427467179672704707842937085621549781627579801356509572397210965270406925309382945647493757499822518272539171346319468210919037390479279679328187057939609889863122790083219768061816093131875491575840052493376341193028052061557296969558099473333023971577236615940525630787016398581105441977909848659239970133974969366933817929047771871736452423855320657946133173829640; - # --- Perfectly valid things --- - - 10 0 10 0; - 0 0 10 0; - 10 52 10 52; - 10 654365464655464577673765769678 10 654365464655464577673765769678; - 10 654365464655464577673765769678 16 8425e6d06f272b9a2d73ed1ce; - 16 8425E6D06F272B9A2D73ED1CE 10 654365464655464577673765769678; - 0 654365464655464577673765769678 16 8425e6d06f272b9a2d73ed1ce; - 0 16_8425E6D06F272B9A2D73ED1CE 10 654365464655464577673765769678; - 0 -0x8425E6D06F272B9A2D73ED1CE 10 -654365464655464577673765769678; - 8 -366570443501403714657464766613 10 -596569802840985608098409867; - 0 0366570443501403714657464766613 10 596569802840985608098409867; - - - # --- Bogus things --- - - 10 "" 0 0; # Empty string fails - 10 foo 0 0; # Non-numeric character - 10 134f 10 134; # Stop parsing when reaching `f' - 4 12345 10 27; # Stop parsing when reaching `4' - 0 37_ 10 37; # 37 is an invalid base, so stop at `_' - 0 36_ 0 0; # 36 is a valid base, so restart and fail - - # --- Bugs --- - - 16 -9802d5c5d5a73f9d4e694a8920f95231b4017f3ec6a4654ace3fa3d85879e5964dade0e051d57f13c275dab1df3da5331f39271efb2792d1dad4460fd5eb5c21fbf355456f523e5631e623074ff9b3e85cf5e0a9336c8d8b8621b24c4e625800ee0152d12c8e22658a66ade38cb4453ab6e4958114717355186649a6cc20d9f5ae2207f99814965035072a9f2121c8f9dd22ab134181378906291aae97287b62a2f592bbceb4198c9cd78e1968bf1e16865c3c6ce9c777232f186b5da240a24523a07faca9de44eba510c91917e099372e67a6a66e93fe7aaefcb9c5485e1a889eae721ab6407586880a95575a968b43bdf50323627aa0fcddfa4e198b0008 - 10 -74959454570640520505374182178324326240748657042677990093617716411759477136824854815262670168473667077524864904515489090301434501507378472350618141578200289566815110468728966378289347050752371322168328511598641143081017162500179880923097593329564317427467179672704707842937085621549781627579801356509572397210965270406925309382945647493757499822518272539171346319468210919037390479279679328187057939609889863122790083219768061816093131875491575840052493376341193028052061557296969558099473333023971577236615940525630787016398581105441977909848659239970133974969366933817929047771871736452423855320657946133173829640; - - 10 687036505685680036980563991304827689190226068191165515873309582371531653761560838357887565473014960851061079052387145199258972778940173525017542879674305252823453991900595437468144352005006881129612951699750949026636206282574720840178116341517038998609517724307448384647380133273761360084019113505091720961437658149042479826982973196933684563380877276612883608481996579884762706391098995123384485837872544276099219443948234067623442105312332114374763392077663374681230289067615025968182722516808457505932863951619224171887832194148545132638772027329666389477813640620737624951105503846166715576529533580414958055708947608220960395455545922617914622611716584821091744228076205865701038484061060900340103461251087987631583104425599437283952841086221737575051158322973751353914369450945591184550003693808660890173148206999627057352641910478408389852121815588924208719373851205997267929487223022997903565246821511833717944887785333763131071163649350968541111796906733695518487580626938892775883629672280655177072837819344983336811201072380418330154409415723975489649421805372088286721361996667976678161505679350285875598457893785891475462099191282531966080162136450154198672623485698300307676277037616099696441730508788295411634665370788798384809584417102543248560317224205079917990766513568040641690632751952309869792602319263342525778046078743231821682847703178976601855555261436480615639995150308874740741630953255447186244703692652027199198662385455033073594432232250325046519267763604243367272471024553800469955272676941568451192546782745963075159357666087761637705388608592656535848292947073782242206595438203903079185128849386496430347274188109070907185471363018498891836986716946253163675821471661778024303689714601286352436391739170368727508436484115845640636653283093361670039386061546795520151041150800979484160765783927564359393959237330742523328888527872599693558141880251962681735003114604660394550415472363991770499647732372855076408144546777820449665557724138072899691283182780416000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 10 687036505685680036980563991304827689190226068191165515873309582371531653761560838357887565473014960851061079052387145199258972778940173525017542879674305252823453991900595437468144352005006881129612951699750949026636206282574720840178116341517038998609517724307448384647380133273761360084019113505091720961437658149042479826982973196933684563380877276612883608481996579884762706391098995123384485837872544276099219443948234067623442105312332114374763392077663374681230289067615025968182722516808457505932863951619224171887832194148545132638772027329666389477813640620737624951105503846166715576529533580414958055708947608220960395455545922617914622611716584821091744228076205865701038484061060900340103461251087987631583104425599437283952841086221737575051158322973751353914369450945591184550003693808660890173148206999627057352641910478408389852121815588924208719373851205997267929487223022997903565246821511833717944887785333763131071163649350968541111796906733695518487580626938892775883629672280655177072837819344983336811201072380418330154409415723975489649421805372088286721361996667976678161505679350285875598457893785891475462099191282531966080162136450154198672623485698300307676277037616099696441730508788295411634665370788798384809584417102543248560317224205079917990766513568040641690632751952309869792602319263342525778046078743231821682847703178976601855555261436480615639995150308874740741630953255447186244703692652027199198662385455033073594432232250325046519267763604243367272471024553800469955272676941568451192546782745963075159357666087761637705388608592656535848292947073782242206595438203903079185128849386496430347274188109070907185471363018498891836986716946253163675821471661778024303689714601286352436391739170368727508436484115845640636653283093361670039386061546795520151041150800979484160765783927564359393959237330742523328888527872599693558141880251962681735003114604660394550415472363991770499647732372855076408144546777820449665557724138072899691283182780416000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 - ; + 10 687036505685680036980563991304827689190226068191165515873309582371531653761560838357887565473014960851061079052387145199258972778940173525017542879674305252823453991900595437468144352005006881129612951699750949026636206282574720840178116341517038998609517724307448384647380133273761360084019113505091720961437658149042479826982973196933684563380877276612883608481996579884762706391098995123384485837872544276099219443948234067623442105312332114374763392077663374681230289067615025968182722516808457505932863951619224171887832194148545132638772027329666389477813640620737624951105503846166715576529533580414958055708947608220960395455545922617914622611716584821091744228076205865701038484061060900340103461251087987631583104425599437283952841086221737575051158322973751353914369450945591184550003693808660890173148206999627057352641910478408389852121815588924208719373851205997267929487223022997903565246821511833717944887785333763131071163649350968541111796906733695518487580626938892775883629672280655177072837819344983336811201072380418330154409415723975489649421805372088286721361996667976678161505679350285875598457893785891475462099191282531966080162136450154198672623485698300307676277037616099696441730508788295411634665370788798384809584417102543248560317224205079917990766513568040641690632751952309869792602319263342525778046078743231821682847703178976601855555261436480615639995150308874740741630953255447186244703692652027199198662385455033073594432232250325046519267763604243367272471024553800469955272676941568451192546782745963075159357666087761637705388608592656535848292947073782242206595438203903079185128849386496430347274188109070907185471363018498891836986716946253163675821471661778024303689714601286352436391739170368727508436484115845640636653283093361670039386061546795520151041150800979484160765783927564359393959237330742523328888527872599693558141880251962681735003114604660394550415472363991770499647732372855076408144546777820449665557724138072899691283182780416000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; } mptext-bin-in { diff --git a/tests/mpx b/tests/mpx index db0230e..8507fdc 100644 --- a/tests/mpx +++ b/tests/mpx @@ -1,6 +1,6 @@ # Test vectors for low-level MP functions # -# $Id: mpx,v 1.6 2000/06/25 12:58:34 mdw Exp $ +# $Id: mpx,v 1.7 2000/07/15 10:03:13 mdw Exp $ # --- Load-store tests --- # @@ -23,7 +23,6 @@ load-store { # --- Shift tests --- lsl { - # --- Simple sanity checks --- 01 2 04; @@ -108,7 +107,6 @@ lsl { } lsr { - # --- Simple sanity checks --- 04 2 01; diff --git a/tests/rmd256 b/tests/rmd256 index 333876e..e33107c 100644 --- a/tests/rmd256 +++ b/tests/rmd256 @@ -1,6 +1,6 @@ # Test vectors for RIPEMD-256 # -# $Id: rmd256,v 1.1 2000/07/09 21:30:34 mdw Exp $ +# $Id: rmd256,v 1.2 2000/07/15 10:03:13 mdw Exp $ # --- Basic hash function --- # @@ -31,8 +31,7 @@ rmd256 { # using the Catacomb implementation. rmd256-hmac { - - "Hi There" + "Hi There" 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b c1829c0d5a203bbf6e874a721d55ffec22456f3a0987e30a4861a40cad5dc9e7; diff --git a/tests/rmd320 b/tests/rmd320 index 92562d7..781d7bf 100644 --- a/tests/rmd320 +++ b/tests/rmd320 @@ -1,6 +1,6 @@ # Test vectors for RIPEMD-320 # -# $Id: rmd320,v 1.1 2000/07/09 21:30:34 mdw Exp $ +# $Id: rmd320,v 1.2 2000/07/15 10:03:13 mdw Exp $ # --- Basic hash function --- # @@ -31,8 +31,7 @@ rmd320 { # using the Catacomb implementation. rmd320-hmac { - - "Hi There" + "Hi There" 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b 03ec929cb94837c2acd709d03f4a26c3e38c7cec4fe2f5caff3b64e168321c8591b1d3ffeb87b9f4; diff --git a/tests/sha b/tests/sha index 1173627..99f5a40 100644 --- a/tests/sha +++ b/tests/sha @@ -1,6 +1,6 @@ # Test vectors for the SHA-1 hash function # -# $Id: sha,v 1.3 2000/07/09 21:33:54 mdw Exp $ +# $Id: sha,v 1.4 2000/07/15 10:03:13 mdw Exp $ # --- Basic hash function --- # @@ -9,7 +9,6 @@ # SHA-1. sha { - "" da39a3ee5e6b4b0d3255bfef95601890afd80709; "a" 86f7e437faa5a7fce15d1ddcb9eaeaea377667b8; "abc" a9993e364706816aba3e25717850c26c9cd0d89d; @@ -54,7 +53,6 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 # Test vectors from RFC2202. sha-hmac { - "Hi There" 0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b b617318655057264e28bc0b6fb378c8ef146be00; -- 2.11.0