joey Tue, 23 Feb 2010 20:24:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295436
Log:
Update crypt() tests to use binary strings and do stricter comparisons
Changed paths:
U php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
U
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
Modified: php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-23
19:41:15 UTC (rev 295435)
+++ php/php-src/trunk/ext/standard/tests/strings/bug51059.phpt 2010-02-23
20:24:51 UTC (rev 295436)
@@ -2,8 +2,8 @@
Bug #51059 crypt() segfaults on certain salts
--FILE--
<?php
-$res = crypt('a', '_');
-if ($res == '*0' || $res == '*1') echo 'OK';
+$res = crypt(b'a', b'_');
+if ($res === b'*0' || $res === b'*1') echo 'OK';
else echo 'Not OK';
?>
Modified:
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===================================================================
---
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 19:41:15 UTC (rev 295435)
+++
php/php-src/trunk/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 20:24:51 UTC (rev 295436)
@@ -3,8 +3,17 @@
--FILE--
<?php
-foreach(range(32, 38) as $i) {
- if (crypt('U*U', '$2a$'.$i.'$CCCCCCCCCCCCCCCCCCCCCC$') === FALSE) {
+$salts = array(b'32' => b'$2a$32$CCCCCCCCCCCCCCCCCCCCCC$',
+ b'33' => b'$2a$33$CCCCCCCCCCCCCCCCCCCCCC$',
+ b'34' => b'$2a$34$CCCCCCCCCCCCCCCCCCCCCC$',
+ b'35' => b'$2a$35$CCCCCCCCCCCCCCCCCCCCCC$',
+ b'36' => b'$2a$36$CCCCCCCCCCCCCCCCCCCCCC$',
+ b'37' => b'$2a$37$CCCCCCCCCCCCCCCCCCCCCC$',
+ b'38' => b'$2a$38$CCCCCCCCCCCCCCCCCCCCCC$',);
+
+foreach($salts as $i=>$salt) {
+ $crypt = crypt(b'U*U', $salt);
+ if ($crypt === b'*0' || $crypt === b'*1') {
echo "$i. OK\n";
} else {
echo "$i. Not OK\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
