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: | Tue, 07 Oct 2014 11:27:57 +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-83425@lists.php.net to get a copy of this message | ||
Commit: 4e8c8761206f595691eaeee8a179fa9be286dcf3
Author: Leigh <leight@gmail.com> Tue, 7 Oct 2014 12:27:57 +0100
Parents: a0420a72afe064d3cb04735c0966eba053a868a7
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4e8c8761206f595691eaeee8a179fa9be286dcf3
Log:
Bug fixes in light of failing bcrypt tests
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 8750378..f992042 100644
--- a/ext/standard/crypt.c
+++ b/ext/standard/crypt.c
@@ -196,7 +196,6 @@ PHPAPI int php_crypt(const char *password, const int pass_len, const char *salt,
} 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' &&
@@ -219,7 +218,7 @@ PHPAPI int php_crypt(const char *password, const int pass_len, const char *salt,
_crypt_extended_init_r();
crypt_res = _crypt_extended_r(password, salt, &buffer);
- if (!crypt_res) {
+ if (!crypt_res || (salt[0] == '*' && salt[1] == '0')) {
return FAILURE;
} else {
*result = estrdup(crypt_res);
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