Bug fixes in light of failing bcrypt tests

Conflicts: ext/standard/crypt.c
2024-11-28 12:26:37 +08:00 · 2014-10-07 12:27:57 +01:00 · 2014-10-07 12:27:57 +01:00 · 7e870c596d
commit 7e870c596d
parent 2d9d10fbbf
2 changed files with 3 additions and 1 deletions
--- 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' &&
--- 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