cvs: php4(PHP_4_3) /ext/mhash/tests 001.phpt 003.phpt
| From: | Ilia Alshanetsky | Date: | Thu, 28 Nov 2002 14:14:06 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/mhash/tests 001.phpt 003.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-16729@lists.php.net to get a copy of this message | ||
iliaa Thu Nov 28 09:14:06 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mhash/tests 001.phpt 003.phpt
Log:
MFH
Index: php4/ext/mhash/tests/001.phpt
diff -u php4/ext/mhash/tests/001.phpt:1.1.2.2 php4/ext/mhash/tests/001.phpt:1.1.2.3
--- php4/ext/mhash/tests/001.phpt:1.1.2.2 Fri Nov 22 10:13:10 2002
+++ php4/ext/mhash/tests/001.phpt Thu Nov 28 09:14:06 2002
@@ -18,7 +18,7 @@
"MHASH_HAVAL160" => "ƳouWi¼´ò\"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ß"
);
Index: php4/ext/mhash/tests/003.phpt
diff -u php4/ext/mhash/tests/003.phpt:1.1.2.2 php4/ext/mhash/tests/003.phpt:1.1.2.3
--- php4/ext/mhash/tests/003.phpt:1.1.2.2 Fri Nov 22 10:13:10 2002
+++ php4/ext/mhash/tests/003.phpt Thu Nov 28 09:14:06 2002
@@ -9,63 +9,63 @@
$supported_hash_al = array(
"MHASH_MD5" =>
"\x15N¯2Íé4z¡P¹ÀFë\x06æ \x0CTyªzcg®hµààt^W\x09þÞ-ésA7Yú§:Ìí\x10w´Ý²xdãqëS³©Õ^Ò«&UÈ,þÛè:
aÇÙ×zä\x06\x1CS\x01",
-"MHASH_SHA1" =>
"Ý1\\p\x06\x1D\x07E]SÂû\x0B\x08ß\x0Caªf\\\x1A±§\x01ú\x10T#\$¨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ú\x10T#\$¨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\x0DgdZUþá\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¼ÐǨ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\x0Bp½Å±Å%\x03\x16(ÂC;î+\x08p«z8®²\x12\x15\x13NÁ\x08u¹©dd)qï³Ùºùv_ÙæÖMINª¯çà xLtº±Ç",
"MHASH_HAVAL160" =>
"Öåðï\x07óúÌídní¶6GXìÞmÆû\x06\x1E\x00¤õη#÷¡5M\"míiÁ\x1D1\$\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¯ùjBëö°ê7ù¡û]é¶GíÃ[\x14G`^\x1B«Ã\x08Kç \x11\x17ë3C-ABâ%ß\x04K\x03??öK´¡¤ù",
-"MHASH_GOST" =>
"ÀDöi½~C=wÆý\x17BÙß\x15}øs¾M\x01äd|\x014hYç\"\x0A°I*b@ÑÄxc@sÞ¨y¾ýN%d÷×\x09¶FD\x0a\x12\x12Pà\x0FÇÕ}E©À~â:pOô\x0DpwìR{\x19M",
-"MHASH_TIGER" =>
"Âó!Êåñ¥p+#Á#ýéf6y©ÛÂó!Êåñ¥p+#Á#ýéf6y©ÛÂó!Êåñ¥p+#Á#ýéf6y©ÛÂó!Êåñ¥p+#Á#ýéf6y©ÛÂó!Ê",
+"MHASH_GOST" =>
"ÀDöi½~C=wÆý\x17BÙß\x15}øs¾M\x01äd|\x014hYç\"\x0A°I*b@ÑÄxc@sÞ¨y¾ýN%d÷×\x09¶FD\x0a\x12\x12Pà\x0FÇÕ}E©À~â:pOô\x0Dpwì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\x13bCÍË. I¯\x0FjÎ¥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