archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle *0 / *1 more consistently

Browse source 
Avoid throwing a DES salt deprecation warning if the libc crypt
implementation is used.
This commit is contained in:
Nikita Popov 2020-06-24 12:20:05 +02:00
parent 32257ac17f
commit 565baf05c0
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ext/standard/crypt.c
View file

@ -99,6 +99,11 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch
{ {
char *crypt_res; char *crypt_res;
zend_string *result; zend_string *result;
if (salt[0] == '*' && (salt[1] == '0' || salt[1] == '1')) {
return NULL;
}
/* Windows (win32/crypt) has a stripped down version of libxcrypt and /* Windows (win32/crypt) has a stripped down version of libxcrypt and
a CryptoApi md5_crypt implementation */ a CryptoApi md5_crypt implementation */
#if PHP_USE_PHP_CRYPT_R #if PHP_USE_PHP_CRYPT_R
@ -160,8 +165,6 @@ PHPAPI zend_string *php_crypt(const char *password, const int pass_len, const ch
ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN + 1); ZEND_SECURE_ZERO(output, PHP_MAX_SALT_LEN + 1);
return result; return result;
} }
} else if (salt[0] == '*' && (salt[1] == '0' || salt[1] == '1')) {
return NULL;
} else { } else {
/* DES Fallback */ /* DES Fallback */