diff options
| author | Ferenc Kovacs <tyra3l@gmail.com> | 2016-09-15 09:38:46 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyra3l@gmail.com> | 2016-09-15 09:38:46 +0200 |
| commit | cb49f418301b58e83dbd869a4b1f222b1a8d7208 (patch) | |
| tree | cb35975dfb57c3ca23408475e03136d6327a72ed | |
| parent | b0269468ea767cafa9d700a0dc0c2b38dca9c2ee (diff) | |
| download | php-git-cb49f418301b58e83dbd869a4b1f222b1a8d7208.tar.gz | |
Revert "Fixed bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify"
This reverts commit 295303b59059536079caf68b4d76acf2149bd42c.
| -rw-r--r-- | ext/standard/crypt.c | 8 | ||||
| -rw-r--r-- | ext/standard/tests/strings/bug72703.phpt | 17 |
2 files changed, 0 insertions, 25 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index 10f19ff113..1b83d6e127 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -201,14 +201,6 @@ PHPAPI int php_crypt(const char *password, const int pass_len, const char *salt, salt[5] >= '0' && salt[5] <= '9' && salt[6] == '$') { char output[PHP_MAX_SALT_LEN + 1]; - int k = 7; - - while (isalnum(salt[k]) || '.' == salt[k] || '/' == salt[k]) { - k++; - } - if (k != salt_len) { - return FAILURE; - } memset(output, 0, PHP_MAX_SALT_LEN + 1); diff --git a/ext/standard/tests/strings/bug72703.phpt b/ext/standard/tests/strings/bug72703.phpt deleted file mode 100644 index 5e3bf4875d..0000000000 --- a/ext/standard/tests/strings/bug72703.phpt +++ /dev/null @@ -1,17 +0,0 @@ ---TEST-- -Bug #72703 Out of bounds global memory read in BF_crypt triggered by password_verify ---SKIPIF-- -<?php -if (!function_exists('crypt'))) { - die("SKIP crypt() is not available"); -} -?> ---FILE-- -<?php - var_dump(password_verify("","$2y$10$$")); -?> -==OK== ---EXPECT-- -bool(false) -==OK== - |