com php-src: Bug fixes in light of failing bcrypt tests: ext/standard/crypt.c ext/standard/tests/strings/crypt_blowfis h.phpt
| From: | Stanislav Malyshev | Date: | Mon, 01 Dec 2014 05:06:39 +0000 |
| Subject: | com php-src: Bug fixes in light of failing bcrypt tests: ext/standard/crypt.c ext/standard/tests/strings/crypt_blowfis h.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83421@lists.php.net to get a copy of this message | ||
Commit: 7e870c596d3e178ac17fc2b5dffce0fb7029269f
Author: Leigh <leight@gmail.com> Tue, 7 Oct 2014 12:27:57 +0100
Committer: Stanislav Malyshev <stas@php.net> Sun, 30 Nov 2014 21:06:39 -0800
Parents: 2d9d10fbbf3f2e07d0e28d1707776d44bad56ca7
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7e870c596d3e178ac17fc2b5dffce0fb7029269f
Log:
Bug fixes in light of failing bcrypt tests
Conflicts:
ext/standard/crypt.c
Changed paths:
M ext/standard/crypt.c
M ext/standard/tests/strings/crypt_blowfish.phpt
Diff:
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c
index b0d1715..f884397 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 2bb2b5f..0bf0d19 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