diff options
| author | foobar <sniper@php.net> | 2001-08-04 23:58:56 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-08-04 23:58:56 +0000 |
| commit | d800a2e16a4979908abb9a51f6ac756e35186496 (patch) | |
| tree | 02ee80fa8b8d2393408c2bab3a5c393b897b9c44 /ext/standard/crypt.c | |
| parent | 628c21275ff52a2f011523583b1ab7d3340c233e (diff) | |
| download | php-git-d800a2e16a4979908abb9a51f6ac756e35186496.tar.gz | |
- Fixed bug: #10822
- CRYPT_SALT_LENGTH is now set to the maximum length the system
supports, like it has been in the documentation for ages.
- The automatic salt is now also working like it should.
Diffstat (limited to 'ext/standard/crypt.c')
| -rw-r--r-- | ext/standard/crypt.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index 9b2f8729b6..4e121d3e2b 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -93,11 +93,7 @@ static int php_crypt_rand_seeded=0; PHP_MINIT_FUNCTION(crypt) { -#if PHP_STD_DES_CRYPT - REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 2, CONST_CS | CONST_PERSISTENT); -#elif PHP_MD5_CRYPT - REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", 12, CONST_CS | CONST_PERSISTENT); -#endif + REGISTER_LONG_CONSTANT("CRYPT_SALT_LENGTH", PHP_MAX_SALT_LEN, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CRYPT_STD_DES", PHP_STD_DES_CRYPT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CRYPT_EXT_DES", PHP_EXT_DES_CRYPT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("CRYPT_MD5", PHP_MD5_CRYPT, CONST_CS | CONST_PERSISTENT); @@ -159,14 +155,14 @@ PHP_FUNCTION(crypt) /* The automatic salt generation only covers standard DES and md5-crypt */ if(!*salt) { -#if PHP_STD_DES_CRYPT - php_to64(&salt[0], PHP_CRYPT_RAND, 2); - salt[2] = '\0'; -#elif PHP_MD5_CRYPT +#if PHP_MD5_CRYPT strcpy(salt, "$1$"); php_to64(&salt[3], PHP_CRYPT_RAND, 4); php_to64(&salt[7], PHP_CRYPT_RAND, 4); strcpy(&salt[11], "$"); +#elif PHP_STD_DES_CRYPT + php_to64(&salt[0], PHP_CRYPT_RAND, 2); + salt[2] = '\0'; #endif } |