Bug fixes in light of failing bcrypt tests

Conflicts:
	ext/standard/crypt.c

diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index b0d17153f21acc1c399b49f0de4dbd5d7993e9f6..f884397742c7b8119e327aebd16f8c149f7b2eda 100644 (file)
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -242,7 +242,6 @@ PHP_FUNCTION(crypt)
                } else if (
                                salt[0] == '$' &&
                                salt[1] == '2' &&
-                               salt[2] >= 'a' && salt[2] <= 'z' &&
                                salt[3] == '$' &&
                                salt[4] >= '0' && salt[4] <= '3' &&
                                salt[5] >= '0' && salt[5] <= '9' &&

diff --git a/ext/standard/tests/strings/crypt_blowfish.phpt b/ext/standard/tests/strings/crypt_blowfish.phpt
index 2bb2b5ff34ebb7d0daa7e96ddb776a2bf14ad195..0bf0d1949e1a9ebcd40eca676a198b4263870494 100644 (file)
--- a/ext/standard/tests/strings/crypt_blowfish.phpt
+++ b/ext/standard/tests/strings/crypt_blowfish.phpt
@@ -105,3 +105,6 @@ foreach($tests2 as $test) {
 29. OK
 30. OK
 31. OK
+32. OK
+33. OK
+34. OK