Re: cvs: php4 /ext/mhash/tests 001.phpt 003.phpt

From: Date: Thu, 28 Nov 2002 14:20:43 +0000
Subject: Re: cvs: php4 /ext/mhash/tests 001.phpt 003.phpt
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-16730@lists.php.net to get a copy of this message
Ah - now for mhash all tests PASS. marcus At 15:13 28.11.2002, Ilia Alshanetsky wrote: 
iliaa           Thu Nov 28 09:13:44 2002 EDT
Modified files: 
    /php4/ext/mhash/tests       003.phpt 001.phpt
Log: Fixed mhash tests, apparently the TIGER algorithm was updated (fixed?) in later mhash releases and consequently returns a different hash. I've updated the hash to the one generated by latter releases. Removed useless \r from ext/mhash/tests/003.phpt. Index: php4/ext/mhash/tests/003.phpt diff -u php4/ext/mhash/tests/003.phpt:1.2 php4/ext/mhash/tests/003.phpt:1.3 --- php4/ext/mhash/tests/003.phpt:1.2 Fri Nov 22 09:07:29 2002 
+++ php4/ext/mhash/tests/003.phpt       Thu Nov 28 09:13:44 2002
@@ -9,63 +9,63 @@ $supported_hash_al = array( 
 "MHASH_MD5"       => "†\x15N¯”2Íé4z¡P”¹ÀFë\x06æ ”\x0CTyªzcg®hµààt^W\x09þÞ-Ÿésš­A7Yú§:Ìí‚\x10w´Ý²x€dãqëS³©Õ^҃š«&UÈ,þÛè: „aǙÙ×zä\x06\x1CS›\x01",
-"MHASH_SHA1"      => "Ý1\\p\x06\x1D\x07E]SÂû\x0B\x08ß\x0Caªf\\\x1A±§\x01ú\x10•T#\$‹¨2¥­ä\x06³›xc\x0Aº=\x16ˆæ\"IJ\x0E®'NΚԽ÷n‡Ë\x08J3É\x15<+H\x13\x1D0§[\x00§À[‘ñÿê¿Y»\x12qÄØ¡\x19¸K¯mI",
+"MHASH_SHA1"      => "Ý1\\p\x06\x1D\x07E]SÂû\x0B\x08ß\x0Caªf\\\x1A±§\x01ú\x10•T#\$‹¨2¥­ä\x06³›xc\x0Aº=\x16ˆæ\"IJ\x0E®'NΚԽ÷n‡Ë\x08J3É\x15<+H\x13\x1D0§[\x00§À[‘ñÿê¿Y»\x12qÄØ¡\x19¸K¯mI",
 "MHASH_HAVAL256"  => "ÞG\x00Ÿ‡Õé¢NÏPwÖ\x0CH6W¥Ù„«+·€õ‡,Êö\x1C\x0DgdZ„ŽUþá\x07)oAiÉ[Nað®îú²d…TÁ\x17\x1F°¢ü2ªZîÓÕÁUÓ46}IYb,ÚÞþC®\x17½\x1AuùÔþ÷{ñ’¾[x",
 "MHASH_HAVAL224"  => "\\Jÿ=‚ZÖ\x08ö\x08Èêçyî8haÆ\x0A˜ó×p³¦g|yÂÚÜ«qÝàÀ\x19\x1E\x06ƒ—«)å˼l¼Ðnj¨G\x0CB@kw躍Q“ù‚v52O¸P¬-0·5\x00L m`G-2ÃI",
 "MHASH_HAVAL192"  => "\"àÂq&\x02<….ùA\x07»/\x1Eá2°d\x17‹Ëû\x1C2æXv\x0Bp½Å±Å%™\x03\x16(ÂC;î+\x08p«z8®²\x12\x15\x13NÁ\x08‰u¹©d‡d)qهºùv_ÙæÖMINª„¯çà xLt—žº±Ç‡",
 "MHASH_HAVAL160"  => "Öåðï\x07óúÌídní¶6GXìÞmÆû\x06\x1E\x00¤­õη#÷Ž¡5ˆM­‚\"míiÁ\x1D„1\$\x0Eù|­X<O)Y;¿=ÓÊ°¸y.³Ø\"Ê\x02ëÐÙ´B™ Ô¯…¾Òµ©k>G¹¸ÊÉ\x19Á\x17~Ä\x0D~",
 "MHASH_RIPEMD160" => "äÕÛFšòŸxâ¹\x0DÇ5ÉÏ\x02\x0a\x1D[\x19¦gDXgw”ÔÜ¡DÔ&Åb¯ùŽ†jŠ’B™ëö°êš7ù‡¡û]é¶GíÃ[\x14G`^\x1B«Ã\x08Kç “\x11\x17ë3C-ABâ%ß\x04K\x03??öK´¡†‚¤ù",
-"MHASH_GOST"      => "ÀDöi½~†C•=wƂý\x17’BÙß\x15}­øs¾M­\x01äd|\x01‚4h“Yç\"\x0A°I*b@фÄxc@sÞ¨y¾†ýN%d÷×\x09¶ŠFD\x0a\x12\x12Pà\x0FÇÕ}E©À~â:pOôŒ\x0D­pwìR{\x19M‡",
-"MHASH_TIGER"     => "Âó!Êåñ¥p+#’Á­#ýžéf6y©ÛÂó!Êåñ¥p+#’Á­#ýžéf6y©ÛÂó!Êåñ¥p+#’Á­#ýžéf6y©ÛÂó!Êåñ¥p+#’Á­#ýžéf6y©ÛÂó!Ê",
+"MHASH_GOST"      => "ÀDöi½~†C•=wƂý\x17’BÙß\x15}­øs¾M­\x01äd|\x01‚4h“Yç\"\x0A°I*b@фÄxc@sÞ¨y¾†ýN%d÷×\x09¶ŠFD\x0a\x12\x12Pà\x0FÇÕ}E©À~â:pOôŒ\x0D­pwìR{\x19M‡",
+"MHASH_TIGER"     => "gêÉ{Ê\nG±ö&/3däÎ#7þ2UöBQ/Óy)ºÌñçX#k'h¤ÂÀÀn‹ä/¥÷E‚¸©›ÛÀ˜p*M1 VÄÉKÚyºOÕ ×ø•M¨¢——6Ô|\"ª",
 "MHASH_CRC32"     => "H@Œ&_šYïèoQÅÒÐ1[Fq\"®\x08ÁÌÝfŸéVÈ8\x08ã¥EöîE<¤™M¼:Ⱥ…¥r„ðk*±HœÚu±è/}›ßÛh3iW»ñžJ?vui…¥=ÕW\"üó",
 "MHASH_CRC32B"    => "µl«e¦>}û*©]¶Fכ6\x13ŠbCÍˏ. I¯\x0F­jœÎ¥0ÐÛ\x0D\x1F<˜Æ.Qyç­¾¶tiý°xbØ\$}ƒ\x0Bõ˜È´“ ×ϬȌDÅDK…\x13é1uLðÝ6§¡`÷æɏ|Ecñ\x04°",
); -foreach ($supported_hash_al as $hash=>$wanted) { +foreach ($supported_hash_al as $hash=>$wanted) { 
        $passwd = str_repeat($hash, 10);
        $salt = str_repeat($hash, 2);
-       $result = mhash_keygen_s2k(constant($hash), $passwd, $salt, 100);
-       if (!strcmp($result, $wanted)) {
-               echo "$hash\nok\n";
-       } else {
-               echo "$hash: ";
-               var_dump(bin2hex($wanted));
-               echo "$hash: ";
-               var_dump(bin2hex($result));
-       }
-       echo "\n";
-} -?> ---EXPECT-- -MHASH_MD5 -ok - -MHASH_SHA1 -ok - -MHASH_HAVAL256 -ok - -MHASH_HAVAL224 -ok - -MHASH_HAVAL192 -ok - -MHASH_HAVAL160 -ok - -MHASH_RIPEMD160 -ok - -MHASH_GOST -ok - -MHASH_TIGER -ok - -MHASH_CRC32 -ok - -MHASH_CRC32B -ok 
+       $result = mhash_keygen_s2k(constant($hash), $passwd, $salt, 100);
+       if (!strcmp($result, $wanted)) {
+               echo "$hash\nok\n";
+       } else {
+               echo "$hash: ";
+               var_dump(bin2hex($wanted));
+               echo "$hash: ";
+               var_dump(bin2hex($result));
+       }
+       echo "\n";
+} +?> +--EXPECT-- +MHASH_MD5 +ok + +MHASH_SHA1 +ok + +MHASH_HAVAL256 +ok + +MHASH_HAVAL224 +ok + +MHASH_HAVAL192 +ok + +MHASH_HAVAL160 +ok + +MHASH_RIPEMD160 +ok + +MHASH_GOST +ok + +MHASH_TIGER +ok + +MHASH_CRC32 +ok + +MHASH_CRC32B +ok Index: php4/ext/mhash/tests/001.phpt diff -u php4/ext/mhash/tests/001.phpt:1.2 php4/ext/mhash/tests/001.phpt:1.3 --- php4/ext/mhash/tests/001.phpt:1.2 Fri Nov 22 09:07:29 2002 
+++ php4/ext/mhash/tests/001.phpt       Thu Nov 28 09:13:44 2002
@@ -18,7 +18,7 @@ "MHASH_HAVAL160" => "Ƴo‡uWi¼´ò\"q”{ùË", "MHASH_RIPEMD160" => "lGCZ¡ÓYķƯF4Ÿ\x0C>XX=", 
 "MHASH_GOST"      => "\x0A%Rνõ|­ñQGòU¶C)5»œ,Ç⍋-ž",
-"MHASH_TIGER"     => "•:Ãyš\x01¹ý둮«— ~g9\\»T0à\x0D",
+"MHASH_TIGER"     => "ý¹šyÃ:•g~ —«®‘ëà0T»\9",
 "MHASH_CRC32"     => "ƒ¸",
 "MHASH_CRC32B"    => "¤·Zß"
); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php


« previous php.cvs (#16730) next »