From: Marcus Boerger <helly@php.net>
Date: Fri, 22 Nov 2002 15:13:10 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.3.0RC2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ae87f8762df2ec3b7d5124fa8d4cc339df4f71c;p=php

MFH
---

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 677142e4c3..4656eb89b1 100644
Binary files a/ext/mhash/tests/003.phpt and b/ext/mhash/tests/003.phpt differ