diff options
| author | Anatol Belski <ab@php.net> | 2016-09-10 02:49:30 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-09-10 02:49:30 +0200 |
| commit | 435048935e709ba12e89b348ec7eb4b45ab37f0b (patch) | |
| tree | 9682844613621829601c6acb60abdbccd9324321 /ext/standard/crypt.c | |
| parent | a90e438af34911c63e07898ee637413748c724a5 (diff) | |
| parent | e539ea439b78a5f6ee41b2338fef377aa77632c1 (diff) | |
| download | php-git-435048935e709ba12e89b348ec7eb4b45ab37f0b.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bug #73058 crypt broken when salt is 'too' long
Diffstat (limited to 'ext/standard/crypt.c')
| -rw-r--r-- | ext/standard/crypt.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index bb68da082c..f2f778e764 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -158,14 +158,6 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch salt[1] == '2' && salt[3] == '$') { char output[PHP_MAX_SALT_LEN + 1]; - int k = 7; - - while (isalnum(salt[k]) || '.' == salt[k] || '/' == salt[k]) { - k++; - } - if (k != salt_len) { - return NULL; - } memset(output, 0, PHP_MAX_SALT_LEN + 1); |