]> granicus.if.org Git - php/commitdiff
- Fix test in unicode mode
authorMarcus Boerger <helly@php.net>
Thu, 6 Oct 2005 20:17:11 +0000 (20:17 +0000)
committerMarcus Boerger <helly@php.net>
Thu, 6 Oct 2005 20:17:11 +0000 (20:17 +0000)
ext/mhash/tests/003.phpt

index e5995f2a0266fef0aaa926068a2610fa21550951..5afd41ec514d7451d2bab9c9df62b7591884afe9 100644 (file)
@@ -4,40 +4,6 @@ mhash_keygen_s2k() test
 <?php
        include "skip.inc";
 ?>
---FILE--
-<?php
-
-$supported_hash_al = array(
-"MHASH_MD5"       => "\86\90\x15N¯\942Íé4z¡P\94¹ÀFë\x06æ \94\x0CTyªzcg®hµààt^W\x09þÞ-\9fés\9d\9a­A7Yú§:Ìí\82\x10w´Ý²x\80dãqëS³©Õ^Ò\83\9a«&UÈ,þÛè: \84\99Ù×zä\81\x06\x1C\81S\9b\x01",
-"MHASH_SHA1"      => "Ý1\\p\x06\x1D\x07E]SÂû\x0B\x08ß\x0Caªf\\\x1A±§\x01ú\x10\95T#\$\8b¨2¥­ä\x06³\9bxc\x0Aº=\x16\88æ\"IJ\x0E®'\9d\9aÔ½÷n\87\8fË\x08J3É\x15<+H\x13\x1D0§[\x00§À[\91ñÿê¿Y»\x12qÄØ¡\x19\90¸K¯mI",
-"MHASH_HAVAL256"  => "\ eÞG\x00\9f\87Õé¢NÏPwÖ\x0CH6W¥Ù\84\ 4«+·\80õ\87,\90Êö\x1C\x0DgdZ\84\8eUþá\x07)oAiÉ[Nað®îú²d\85TÁ\x17\x1F°¢ü2ªZîÓÕÁUÓ46}IYb,ÚÞþC®\x17½\x1AuùÔþ÷{ñ\92¾[x",
-"MHASH_HAVAL224"  => "\\Jÿ=\82ZÖ\x08ö\x08Èêçyî8ha\vÆ\x0A\98ó×p³\11¦g|y\7fÂÚÜ«qÝàÀ\x19\x1E\x06\83\97«)\7f
-å˼l¼ÐÇ\8c¨G\x0CB@\1fkwè\1dº\8dQ\93\ fù\82v\ 352O¸P¬-0·5\14\x00L        m`G-2\ e\ eÃI",
-"MHASH_HAVAL192"  => "\"àÂq&\x02<\85.ùA\x07»/\x1Eá2°d\x17\8b\9dËû\x1C2æXv\x0B\8fp½Å±Å%\99\x03\x16(ÂC;î+\x08p«z8®²\x12\x15\x13NÁ\x08\89u¹©d\87d)qï\9e³Ù\87ºùv_ÙæÖMIN\17\19ª\84¯çà xLt\97\9eº±Ç\87",
-"MHASH_HAVAL160"  => "Öåðï\x07óúÌídní¶6GXìÞmÆû\x06\x1E\x00¤\96õη#÷\8e¡5\88M\96\82\"míiÁ\x1D\841\$\x0Eù|­X<O)Y;¿=Óʰ¸y.³Ø`\"Ê`\x02ëÐÙ´B\99   Ô¯\85¾Òµ©k>G¹¸ÊÉ\x19Á\x17~Ä\x0D~",
-"MHASH_RIPEMD160" => "äÕÛF\9aò\9fxâ¹\x0DÇ5ÉÏ\x02\x0a\x1D[\x19¦gDXgw\94ÔÜ¡DÔ&Åb¯ù\8d\8e\86j\8a\92B\99ëö°ê\9a\16\87¡û]é¶GíÃ[\x14G`^\x1B«Ã\x08Kç \ 3\93\x11\x17ë3C-ABâ%ß\x04K\x03??öK´¡\86\82¤ù",
-"MHASH_GOST"      => "ÀDöi½~\86C\95=wÆ\82ý\x17\92BÙß\x15}­øs¾M\96\x01äd|\x01\824h\93Yç\"\x0A°I*b@Ñ\84Äxc@sÞ¨\7f\7f\86ýN%d÷×\x09¶\8aFD\x0a\x12\x12Pà\x0FÇÕ}E©À~â:pOô\14\8c\x0D­pwìR{\x19M\87",
-"MHASH_TIGER"     => "gêÉ{\9dÊ\nG±ö&/3\ 2däÎ\1c#7`þ2UöBQ/Ó\12y)ºÌñçX#k'h¤ÂÀÀn\11\8b\19ä\ e/\ 4¥÷E\82\ f¸©\9bÛÀ\ 6\98p*M1 \17\18VÄÉKÚyº\eO`Õ     ×ø\95\18¢\97\976\8dÔ|\11\"ª",
-"MHASH_CRC32"     => "H\1c@\14\8c&\18_\9a\18èoQÅÒÐ1[Fq\1d\"®\x08ÁÌÝf\9féVÈ\178\x08\15ã¥EöîE<\9d¤\8d\1d\99M¼:Ⱥ\85¥r\10\84\12ðk*\16±H\9cÚu±\18è/}\9bßÛh3iW»ñ\9eJ?vu
-i\85¥=ÕW\"\9düó",
-"MHASH_CRC32B"    => "µl«e¦>}û*©]\7f¶F×\9b6\x13\8abCÍË\8f.     I¯\x0F\96j\9cÎ¥0ÐÛ\x0D\x1F<\98Æ.Qyç\96¾¶\8dtiý°xbØ\$}\83\x0Bõ\98È´\93   ×ϬÈ\8cDÅDK\85\x13é1uLðÝ6§¡`÷æÉ\8f\90|Ecñ\x04\7f°",
-);
-
-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
@@ -71,3 +37,37 @@ ok
 
 MHASH_CRC32B
 ok
+--FILE--
+<?php
+
+$supported_hash_al = array(
+"MHASH_MD5"       => b"\86\90\x15N¯\942Íé4z¡P\94¹ÀFë\x06æ \94\x0CTyªzcg®hµààt^W\x09þÞ-\9fés\9d\9a­A7Yú§:Ìí\82\x10w´Ý²x\80dãqëS³©Õ^Ò\83\9a«&UÈ,þÛè: \84\99Ù×zä\81\x06\x1C\81S\9b\x01",
+"MHASH_SHA1"      => b"Ý1\\p\x06\x1D\x07E]SÂû\x0B\x08ß\x0Caªf\\\x1A±§\x01ú\x10\95T#\$\8b¨2¥­ä\x06³\9bxc\x0Aº=\x16\88æ\"IJ\x0E®'\9d\9aÔ½÷n\87\8fË\x08J3É\x15<+H\x13\x1D0§[\x00§À[\91ñÿê¿Y»\x12qÄØ¡\x19\90¸K¯mI",
+"MHASH_HAVAL256"  => b"\ eÞG\x00\9f\87Õé¢NÏPwÖ\x0CH6W¥Ù\84\ 4«+·\80õ\87,\90Êö\x1C\x0DgdZ\84\8eUþá\x07)oAiÉ[Nað®îú²d\85TÁ\x17\x1F°¢ü2ªZîÓÕÁUÓ46}IYb,ÚÞþC®\x17½\x1AuùÔþ÷{ñ\92¾[x",
+"MHASH_HAVAL224"  => b"\\Jÿ=\82ZÖ\x08ö\x08Èêçyî8ha\vÆ\x0A\98ó×p³\11¦g|y\7fÂÚÜ«qÝàÀ\x19\x1E\x06\83\97«)\7f
+å˼l¼ÐÇ\8c¨G\x0CB@\1fkwè\1dº\8dQ\93\ fù\82v\ 352O¸P¬-0·5\14\x00L        m`G-2\ e\ eÃI",
+"MHASH_HAVAL192"  => b"\"àÂq&\x02<\85.ùA\x07»/\x1Eá2°d\x17\8b\9dËû\x1C2æXv\x0B\8fp½Å±Å%\99\x03\x16(ÂC;î+\x08p«z8®²\x12\x15\x13NÁ\x08\89u¹©d\87d)qï\9e³Ù\87ºùv_ÙæÖMIN\17\19ª\84¯çà xLt\97\9eº±Ç\87",
+"MHASH_HAVAL160"  => b"Öåðï\x07óúÌídní¶6GXìÞmÆû\x06\x1E\x00¤\96õη#÷\8e¡5\88M\96\82\"míiÁ\x1D\841\$\x0Eù|­X<O)Y;¿=Óʰ¸y.³Ø`\"Ê`\x02ëÐÙ´B\99  Ô¯\85¾Òµ©k>G¹¸ÊÉ\x19Á\x17~Ä\x0D~",
+"MHASH_RIPEMD160" => b"äÕÛF\9aò\9fxâ¹\x0DÇ5ÉÏ\x02\x0a\x1D[\x19¦gDXgw\94ÔÜ¡DÔ&Åb¯ù\8d\8e\86j\8a\92B\99ëö°ê\9a\16\87¡û]é¶GíÃ[\x14G`^\x1B«Ã\x08Kç \ 3\93\x11\x17ë3C-ABâ%ß\x04K\x03??öK´¡\86\82¤ù",
+"MHASH_GOST"      => b"ÀDöi½~\86C\95=wÆ\82ý\x17\92BÙß\x15}­øs¾M\96\x01äd|\x01\824h\93Yç\"\x0A°I*b@Ñ\84Äxc@sÞ¨\7f\7f\86ýN%d÷×\x09¶\8aFD\x0a\x12\x12Pà\x0FÇÕ}E©À~â:pOô\14\8c\x0D­pwìR{\x19M\87",
+"MHASH_TIGER"     => b"gêÉ{\9dÊ\nG±ö&/3\ 2däÎ\1c#7`þ2UöBQ/Ó\12y)ºÌñçX#k'h¤ÂÀÀn\11\8b\19ä\ e/\ 4¥÷E\82\ f¸©\9bÛÀ\ 6\98p*M1 \17\18VÄÉKÚyº\eO`Õ    ×ø\95\18¢\97\976\8dÔ|\11\"ª",
+"MHASH_CRC32"     => b"H\1c@\14\8c&\18_\9a\18èoQÅÒÐ1[Fq\1d\"®\x08ÁÌÝf\9féVÈ\178\x08\15ã¥EöîE<\9d¤\8d\1d\99M¼:Ⱥ\85¥r\10\84\12ðk*\16±H\9cÚu±\18è/}\9bßÛh3iW»ñ\9eJ?vu
+i\85¥=ÕW\"\9düó",
+"MHASH_CRC32B"    => b"µl«e¦>}û*©]\7f¶F×\9b6\x13\8abCÍË\8f.    I¯\x0F\96j\9cÎ¥0ÐÛ\x0D\x1F<\98Æ.Qyç\96¾¶\8dtiý°xbØ\$}\83\x0Bõ\98È´\93   ×ϬÈ\8cDÅDK\85\x13é1uLðÝ6§¡`÷æÉ\8f\90|Ecñ\x04\7f°",
+);
+
+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";
+}
+?>