From: Marcus Boerger <helly@php.net>
Date: Thu, 6 Oct 2005 20:17:11 +0000 (+0000)
Subject: - Fix test in unicode mode
X-Git-Tag: RELEASE_0_9_1~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6453e19d2b41fb3cd598a476ce9d40b98a181f1b;p=php

- Fix test in unicode mode
---

diff --git a/ext/mhash/tests/003.phpt b/ext/mhash/tests/003.phpt
index e5995f2a02..5afd41ec51 100644
--- a/ext/mhash/tests/003.phpt
+++ b/ext/mhash/tests/003.phpt
@@ -4,40 +4,6 @@ mhash_keygen_s2k() test
 <?php
 	include "skip.inc";
 ?>
---FILE--
-<?php
-
-$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_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"     => "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?vu
-i…¥=Õ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) {
-	$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"†\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"      => b"Ý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"  => b"Þ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"  => b"\\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"  => b"\"àÂ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"  => b"Öåðï\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" => b"äÕÛ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"      => b"À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"     => b"gêÉ{Ê\nG±ö&/3däÎ#7`þ2UöBQ/Óy)ºÌñçX#k'h¤ÂÀÀn‹ä/¥÷E‚¸©›ÛÀ˜p*M1 VÄÉKÚyºO`Õ	×ø•M¨¢——6Ô|\"ª",
+"MHASH_CRC32"     => b"H@Œ&_šYïèoQÅÒÐ1[Fq\"®\x08ÁÌÝfŸéVÈ8\x08ã¥EöîE<¤™M¼:Ⱥ…¥r„ðk*±HœÚu±è/}›ßÛh3iW»ñžJ?vu
+i…¥=ÕW\"üó",
+"MHASH_CRC32B"    => b"µ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) {
+	$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";
+}
+?>