From 8ae87f8762df2ec3b7d5124fa8d4cc339df4f71c Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Fri, 22 Nov 2002 15:13:10 +0000
Subject: [PATCH] MFH

---
 ext/mhash/tests/001.phpt |  66 ++++++++++++++++++----------------
 ext/mhash/tests/002.phpt |  74 +++++++++++++++++++++++++++++----------
 ext/mhash/tests/003.phpt | Bin 1756 -> 2375 bytes
 3 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/ext/mhash/tests/001.phpt b/ext/mhash/tests/001.phpt
index 57f50c0deb..cbedd1815b 100644
--- a/ext/mhash/tests/001.phpt
+++ b/ext/mhash/tests/001.phpt
@@ -1,5 +1,7 @@
 --TEST--
 mhash() test
+--INI--
+magic_quotes_runtime=0
 --SKIPIF--
 <?php
 	include "skip.inc";
@@ -8,60 +10,64 @@ mhash() test
 <?php
 
 $supported_hash_al = array(
-"MHASH_MD5",
-"MHASH_SHA1",
-"MHASH_HAVAL256",
-"MHASH_HAVAL192",
-"MHASH_HAVAL224",
-"MHASH_HAVAL160",
-"MHASH_RIPEMD160",
-"MHASH_GOST",
-"MHASH_TIGER",
-"MHASH_CRC32",
-"MHASH_CRC32B"
+"MHASH_MD5"       => "-›Û‘ùN–ÙÄâ®S*̓j",
+"MHASH_SHA1"      => "/“AåZƒíõI{ø;£Û*}à£",
+"MHASH_HAVAL256"  => "²Uþÿ
­d'5Ç›Æ•¡ü¥;Ýýúñ ²u’‡“¯",
+"MHASH_HAVAL192"  => "Lè7ÞH0	*²Æp”Ɉß×Û
Í",
+"MHASH_HAVAL224"  => "SbхgR¿,›²Öý×r¹ÅÈÎ^È&•&K…á",
+"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_CRC32"     => "ƒ¸",
+"MHASH_CRC32B"    => "¤·Zß"
 );
 
-	$data = "This is the test of the mhash extension...";
+$data = "This is the test of the mhash extension...";
 
-	foreach ($supported_hash_al as $hash) {
-		echo $hash . "\n";
-		var_dump(mhash(constant($hash), $data));
-		echo "\n";
+foreach ($supported_hash_al as $hash=>$wanted) {
+	$result = mhash(constant($hash), $data);
+	if ($result==$wanted) {
+		echo "$hash\nok\n";
+	} else {
+		echo "$hash: ";
+		var_dump($wanted);
+		echo "$hash: ";
+		var_dump($result);
 	}
+	echo "\n";
+}
 ?>
 --EXPECT--
 MHASH_MD5
-string(16) "-›Û‘ùN–ÙÄâ®S*̓j"
+ok
 
 MHASH_SHA1
-string(20) "/“AåZƒíõI{ø;£Û*}à£"
+ok
 
 MHASH_HAVAL256
-string(32) "²Uþÿ
­d'5Ç›Æ•¡ü¥;Ýýúñ ²u’‡“¯"
+ok
 
 MHASH_HAVAL192
-string(24) "Lè7ÞH0	*²Æp”Ɉß×Û
Í"
+ok
 
 MHASH_HAVAL224
-string(28) "SbхgR¿,›²Öý×r¹ÅÈÎ^È&•&K…á"
+ok
 
 MHASH_HAVAL160
-string(20) "Ƴo‡uWi¼´ò"q”{ùË"
+ok
 
 MHASH_RIPEMD160
-string(20) "lGCZ¡ÓYķƯF4Ÿ>XX="
+ok
 
 MHASH_GOST
-string(32) "
-%Rνõ|­ñQGòU¶C)5»œ,Ç⍋-ž"
+ok
 
 MHASH_TIGER
-string(24) "•:Ãyš
¹ý둮«— ~g9\»T0à
-"
+ok
 
 MHASH_CRC32
-string(4) "ƒ¸"
+ok
 
 MHASH_CRC32B
-string(4) "¤·Zß"
-
+ok
diff --git a/ext/mhash/tests/002.phpt b/ext/mhash/tests/002.phpt
index 3dcdab2d91..6f89bc2272 100644
--- a/ext/mhash/tests/002.phpt
+++ b/ext/mhash/tests/002.phpt
@@ -6,23 +6,59 @@ mhash_get_block_size() & mhash_get_hash_name() test
 ?>
 --FILE--
 <?php
-	$hc = mhash_count() + 1;
-	
-	for ($i=0; $i<$hc; $i++) {
-		if (($hn = mhash_get_hash_name($i))) {
-			echo $hn . "\t->\t" . mhash_get_block_size($i) . "\n";
-		}
-	}
+$supported_hash_al = array(
+"MD5"       => 16,
+"MD4"       => 16,
+"SHA1"      => 20,
+"SHA256"    => 32,
+"HAVAL256"  => 32,
+"HAVAL192"  => 24,
+"HAVAL224"  => 28,
+"HAVAL160"  => 20,
+"HAVAL128"  => 16,
+"RIPEMD160" => 20,
+"GOST"      => 32,
+"TIGER"     => 24,
+"TIGER160"  => 20,
+"TIGER128"  => 16,
+"CRC32"     => 4,
+"CRC32B"    => 4,
+"ADLER32"   => 4,
+"NA_XYZ"    => 0   /* verify that the algorythm works */
+);
+
+$hc = mhash_count() + 1;
+
+$known_hash_al = array();	
+for ($i=0; $i < $hc; $i++) {
+	$known_hash_al[mhash_get_hash_name($i)] = $i;
+}
+
+foreach ($supported_hash_al as $name => $len) {
+	if (array_key_exists($name, $known_hash_al)) {
+		$len = mhash_get_block_size($known_hash_al[$name]);
+		echo "$name = $len\n";
+	} else {
+		echo "$name ? $len\n";
+	} 
+}
 ?>
---EXPECT--
-CRC32	->	4
-MD5	->	16
-SHA1	->	20
-HAVAL256	->	32
-RIPEMD160	->	20
-TIGER	->	24
-GOST	->	32
-CRC32B	->	4
-HAVAL224	->	28
-HAVAL192	->	24
-HAVAL160	->	20
+--EXPECTREGEX--
+MD5 . 16
+MD4 . 16
+SHA1 . 20
+SHA256 . 32
+HAVAL256 . 32
+HAVAL192 . 24
+HAVAL224 . 28
+HAVAL160 . 20
+HAVAL128 . 16
+RIPEMD160 . 20
+GOST . 32
+TIGER . 24
+TIGER160 . 20
+TIGER128 . 16
+CRC32 . 4
+CRC32B . 4
+ADLER32 . 4
+NA_XYZ . 0
diff --git a/ext/mhash/tests/003.phpt b/ext/mhash/tests/003.phpt
index 677142e4c30f38434c715b4eba8d4f6cfa6d9bee..4656eb89b18d2d0d779097ae8eef9aff973e4c0c 100644
GIT binary patch
literal 2375
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
H^N`_RA|R>(

delta 1265
zcmX>ubcc6BW4#WSlCOtjut$8bhohkqoaf;f=ICQ&YKA6aXlaBdVq|23CSqu2fDj4t
z3~=>zK@oEI4-SDV(1{Q6baxGc^W&X^oQ;v}0CSy`xHPS~xHu<^vMbal=A>&XRC951
zsuUy^7ni3f*eVp46vY>%7NjPYXs7_CbrcK@fa-xNiW756u*n;NrGYBS5{u$fN^=V|
zax)T(Gvc#TE7Mc+;){*4HIno5ic1pnASP<+C_rt~nY@RcCkmv!mdoCbOIO!5BEZ!-
zL|2y!=!nd`bPYoT15E{`wh5ws>!%o<eQ8p)Fks5g18%R`o-LTd6H>XVDmi^!#?}W9
zO5(yf|J~D_|FU@QthJ8jk-wH(oq5|NF!73NJ)2Bp@N7mUR1@zS#uTv0vb)9xANtMB
zai1q~Ra%VH#^sE^1g3^4t8}k0TDtZL+veF7$y~c^#X6oTd3y1!Q=jX1Zq}8(-}Bo0
zPjh$~pA@yx_7IjeSRT!={6O@?kN;ookK8R(c;v=H$q75W*XMddtaOL_g72O?!~FKE
zFBkcp4=BIJ<6#!Q^kxgoYVGX}U)yyiocboim7WsS(ii&gA-iV2W9G?dzr+vg-u>E?
z(i(D5Tz;}4lSG90Ua8WbSN?sk{y1r0bOoB9lpY)^RAaJf)%)qlzFS}Jq0xpE@$R{&
zf6Ev>izwsnFW7r@<5AU_%wigcoUPw!a}=zuvRJoCNL1MGAjjl<W-Tw&5Q_2oZ`%}g
zjpG}~iC51n-&tfNav$TG@%eheX2E6YHI?;;Zrxd3c=y2pNjbLW>8myCxt^Zhle6c-
z@tzg#Jd;l_$s{xQaONhs>l*R#9fk%4JS46?{qUas^RF{+Q}W(!Gjor4b1(PUZ#FrG
zCDXp1+phe*Z=q?2@3bbR+_#wrWm^nY_<q)`jj-|8jI`cwd->Fc9hG{UZzL$4N?@8S
z$ResGc~HFW2v;3iU_7~c+iljT`4x|Lave84d7g<&Hd=CW5sP-ch<ieu^y<SL-p>~>
zPZkt^ZS1V;==4bSK8rWAz5O@uEeqS4mi$CB?10O+%)NDO&Qop6k2U=jpX7A&zG&^*
zAI1B8r!hWBsbOp~$(S7ZT#0Lgr&f}~#g-!#$qvQ$R@7JSt8e@3r<(HpI_I`7Hy17;
zp@0W!{Kv1>x~@D>_sFWi|BFZu*V=;eH$l~szU?S>PM*M;&Vw8wlX=-B`IOdi96WP3
zZT`!!6XF&eldajTE0yN{`HZ4dL1}Bw>eOX+wZFAi#@26hyFS}YxGTx|?CE|zPS5rH
z)3WBATWWCOHkZ83jAMF%mCvW`+tyo>`FBG_(hZf`X6~;uPHdUXdHwvF6Fn|RUA$X`
eUmBMBe7I}2d||@(XD9n7)VL;pWU1ev#03D}H1S;k

-- 
2.50.1