diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-01-13 11:49:09 -0500 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-01-13 11:49:09 -0500 |
| commit | 4a2fe3d0abd7b566b7865c387e1173093f70d626 (patch) | |
| tree | 3c6a3e9cfae24055c67f00d1c09c14cb8cd76b5f /ext/standard/crypt.c | |
| parent | 9cc988722451a011b5996103d07424890a2ee6c9 (diff) | |
| download | php-git-4a2fe3d0abd7b566b7865c387e1173093f70d626.tar.gz | |
Fix a few tests and remove error/warning for *0
Diffstat (limited to 'ext/standard/crypt.c')
| -rw-r--r-- | ext/standard/crypt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index dee74ce501..712b2ab4b0 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -216,6 +216,8 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN + 1); return result; } + } else if (salt[0] == '*' && (salt[1] == '0' || salt[1] == '1')) { + return NULL; } else { /* DES Fallback */ |