joey Tue, 23 Feb 2010 21:14:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=295441
Log:
MFH'd crypt() tests - renamed to fit phpt schema, tests for DES-fallback,
use b'' on strings.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
D
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
A +
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(from
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt:r295433)
A
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
2010-02-23 20:53:58 UTC (rev 295440)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/bug51059.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -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';
?>
Deleted:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 20:53:58 UTC (rev 295440)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -1,22 +0,0 @@
---TEST--
-Test Blowfish crypt() with invalid rounds
---FILE--
-<?php
-
-foreach(range(32, 38) as $i) {
- if (crypt('U*U', '$2a$'.$i.'$CCCCCCCCCCCCCCCCCCCCCC$') === FALSE) {
- echo "$i. OK\n";
- } else {
- echo "$i. Not OK\n";
- }
-}
-
-?>
---EXPECT--
-32. OK
-33. OK
-34. OK
-35. OK
-36. OK
-37. OK
-38. OK
Copied:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(from rev 295433,
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt)
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation1.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -0,0 +1,37 @@
+--TEST--
+Test Blowfish crypt() with invalid rounds
+--SKIPIF--
+<?php
+if (!function_exists('crypt') || !defined("CRYPT_BLOWFISH")) {
+ die("SKIP crypt()-blowfish is not available");
+}
+?>
+--FILE--
+<?php
+
+$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";
+ }
+}
+
+?>
+--EXPECT--
+32. OK
+33. OK
+34. OK
+35. OK
+36. OK
+37. OK
+38. OK
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
===================================================================
---
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/strings/crypt_blowfish_variation2.phpt
2010-02-23 21:14:51 UTC (rev 295441)
@@ -0,0 +1,14 @@
+--TEST--
+Test Blowfish crypt() falls back to DES when rounds are not specified,
+or Blowfish is not available.
+--FILE--
+<?php
+$crypt = crypt(b'U*U',
b'$2a$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW');
+if ($crypt===b'$2SHYF.wPGyfE') {
+ echo "OK\n";
+} else {
+ echo "Not OK\n";
+}
+?>
+--EXPECT--
+OK
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
