Update crypt() tests to use binary strings and do stricter comparisons

diff --git a/ext/standard/tests/strings/bug51059.phpt b/ext/standard/tests/strings/bug51059.phpt
index f2cbe9deff899b7a01ff971d52668dc70a0531f2..bdc56f1762db38ad8fd1abf89a2f77083959f688 100644 (file)
--- a/ext/standard/tests/strings/bug51059.phpt
+++ b/ext/standard/tests/strings/bug51059.phpt
@@ -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';
 
 ?>

diff --git a/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt b/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
index 6d40b0770e149d9a60c05bf363a96adc5f82d472..bc3ea98052d5f7dba03abea7b67110a61125ddaf 100644 (file)
--- a/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish_invalid_rounds.phpt
@@ -3,8 +3,17 @@ Test Blowfish crypt() with invalid rounds
 --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";