diff options
| author | Leigh <leight@gmail.com> | 2014-10-07 12:27:57 +0100 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-30 21:06:39 -0800 |
| commit | 7e870c596d3e178ac17fc2b5dffce0fb7029269f (patch) | |
| tree | 7355db41a448608f4ba45be12fe29c0dd1b36384 | |
| parent | 2d9d10fbbf3f2e07d0e28d1707776d44bad56ca7 (diff) | |
| download | php-git-7e870c596d3e178ac17fc2b5dffce0fb7029269f.tar.gz | |
Bug fixes in light of failing bcrypt tests
Conflicts:
ext/standard/crypt.c
| -rw-r--r-- | ext/standard/crypt.c | 1 | ||||
| -rw-r--r-- | ext/standard/tests/strings/crypt_blowfish.phpt | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index b0d17153f2..f884397742 100644 --- 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 2bb2b5ff34..0bf0d1949e 100644 --- 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 |