From 6453e19d2b41fb3cd598a476ce9d40b98a181f1b Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Thu, 6 Oct 2005 20:17:11 +0000 Subject: [PATCH] - Fix test in unicode mode --- ext/mhash/tests/003.phpt | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/ext/mhash/tests/003.phpt b/ext/mhash/tests/003.phpt index e5995f2a026..5afd41ec514 100644 --- a/ext/mhash/tests/003.phpt +++ b/ext/mhash/tests/003.phpt @@ -4,40 +4,6 @@ mhash_keygen_s2k() test ---FILE-- - "\x15N24zPF\x06栔\x0CTyzcght^W\x09-sA7Y:\x10wݲxdqS^҃&U,: aǙz\x06\x1CS\x01", -"MHASH_SHA1" => "1\\p\x06\x1D\x07E]S\x0B\x08\x0Caf\\\x1A\x01\x10T#\$2\x06xc\x0A=\x16\"IJ\x0E'NΚԽn\x08J3\x15<+H\x13\x1D0[\x00[Y\x12qء\x19KmI", -"MHASH_HAVAL256" => "G\x00NPw\x0CH6Wل+,\x1C\x0DgdZU\x07)oAi[NadT\x17\x1F2ZU46}IYb,C\x17\x1Au{[x", -"MHASH_HAVAL224" => "\\J=Z\x08\x08y8ha \x0Apg|yܫq\x19\x1E\x06) -˼lnjG\x0CB@kwºQv52OP-05\x00L m`G-2I", -"MHASH_HAVAL192" => "\"q&\x02<.A\x07/\x1E2d\x17\x1C2Xv\x0Bpű%\x03\x16(C;+\x08pz8\x12\x15\x13N\x08udd)qهv_MINxLtLJ", -"MHASH_HAVAL160" => "\x07dn6GXm\x06\x1E\x00η#5M\"mi\x1D1\$\x0E|XG\x19\x17~\x0D~", -"MHASH_RIPEMD160" => "Fx\x0D5\x02\x0a\x1D[\x19gDXgwܡD&bjB7]G[\x14G`^\x1B\x08K\x11\x173C-AB%\x04K\x03??K", -"MHASH_GOST" => "Di~C=wƂ\x17B\x15}sM\x01d|\x014hY\"\x0AI*b@фxc@sިyN%d\x09FD\x0a\x12\x12P\x0F}E~:pO\x0DpwR{\x19M", -"MHASH_TIGER" => "g{\nG&/3d#7`2UBQ/y)X#k'hn/Ep*M1 VKyO` M6|\"", -"MHASH_CRC32" => "H@&_YoQ1[Fq\"\x08fV8\x08EE<M:Ⱥrk*Hu/}h3iWJ?vu -i=W\"", -"MHASH_CRC32B" => "le>}*]Fכ6\x13bCˏ. I\x0FjΥ0\x0D\x1F<.Qy疾tixb\$}\x0Bȴ ϬȌDDK\x131uL6`ɏ|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-- + b"\x15N24zPF\x06栔\x0CTyzcght^W\x09-sA7Y:\x10wݲxdqS^҃&U,: aǙz\x06\x1CS\x01", +"MHASH_SHA1" => b"1\\p\x06\x1D\x07E]S\x0B\x08\x0Caf\\\x1A\x01\x10T#\$2\x06xc\x0A=\x16\"IJ\x0E'NΚԽn\x08J3\x15<+H\x13\x1D0[\x00[Y\x12qء\x19KmI", +"MHASH_HAVAL256" => b"G\x00NPw\x0CH6Wل+,\x1C\x0DgdZU\x07)oAi[NadT\x17\x1F2ZU46}IYb,C\x17\x1Au{[x", +"MHASH_HAVAL224" => b"\\J=Z\x08\x08y8ha \x0Apg|yܫq\x19\x1E\x06) +˼lnjG\x0CB@kwºQv52OP-05\x00L m`G-2I", +"MHASH_HAVAL192" => b"\"q&\x02<.A\x07/\x1E2d\x17\x1C2Xv\x0Bpű%\x03\x16(C;+\x08pz8\x12\x15\x13N\x08udd)qهv_MINxLtLJ", +"MHASH_HAVAL160" => b"\x07dn6GXm\x06\x1E\x00η#5M\"mi\x1D1\$\x0E|XG\x19\x17~\x0D~", +"MHASH_RIPEMD160" => b"Fx\x0D5\x02\x0a\x1D[\x19gDXgwܡD&bjB7]G[\x14G`^\x1B\x08K\x11\x173C-AB%\x04K\x03??K", +"MHASH_GOST" => b"Di~C=wƂ\x17B\x15}sM\x01d|\x014hY\"\x0AI*b@фxc@sިyN%d\x09FD\x0a\x12\x12P\x0F}E~:pO\x0DpwR{\x19M", +"MHASH_TIGER" => b"g{\nG&/3d#7`2UBQ/y)X#k'hn/Ep*M1 VKyO` M6|\"", +"MHASH_CRC32" => b"H@&_YoQ1[Fq\"\x08fV8\x08EE<M:Ⱥrk*Hu/}h3iWJ?vu +i=W\"", +"MHASH_CRC32B" => b"le>}*]Fכ6\x13bCˏ. I\x0FjΥ0\x0D\x1F<.Qy疾tixb\$}\x0Bȴ ϬȌDDK\x131uL6`ɏ|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"; +} +?>