The current tests (with your patch) work properly on my test machines here.
Could you please MFH the patch to the mhash tests.
Thanks,
Ilia
On November 22, 2002 09:07 am, Marcus Boerger wrote:
> helly Fri Nov 22 09:07:30 2002 EDT
>
> Modified files:
> /php4/ext/mhash/tests 001.phpt 002.phpt 003.phpt
> Log:
> Show which algorythm fails and do not fail when we have new algos.
> #for me TIGER fails anybody else?
>
>
> Index: php4/ext/mhash/tests/001.phpt
> diff -u php4/ext/mhash/tests/001.phpt:1.1 php4/ext/mhash/tests/001.phpt:1.2
> --- php4/ext/mhash/tests/001.phpt:1.1 Wed Nov 20 01:48:39 2002
> +++ php4/ext/mhash/tests/001.phpt Fri Nov 22 09:07:29 2002
> @@ -1,5 +1,7 @@
> --TEST--
> mhash() test
> +--INI--
> +magic_quotes_runtime=0
> --SKIPIF--
> <?php
> include "skip.inc";
> @@ -8,59 +10,64 @@
> <?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
> Index: php4/ext/mhash/tests/002.phpt
> diff -u php4/ext/mhash/tests/002.phpt:1.1 php4/ext/mhash/tests/002.phpt:1.2
> --- php4/ext/mhash/tests/002.phpt:1.1 Wed Nov 20 01:48:39 2002
> +++ php4/ext/mhash/tests/002.phpt Fri Nov 22 09:07:29 2002
> @@ -6,23 +6,59 @@
> ?>
> --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
> Index: php4/ext/mhash/tests/003.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
