diff options
| author | Felipe Pena <felipe@php.net> | 2010-04-22 20:54:35 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-04-22 20:54:35 +0000 |
| commit | 5234958f8a835587abea7abf7492eadcc5f75773 (patch) | |
| tree | 162639bc3b58220b6c14a619be6f2216e4a20431 | |
| parent | 3dbf6acd7b93e565e391b84110954bb74512fb75 (diff) | |
| download | php-git-5234958f8a835587abea7abf7492eadcc5f75773.tar.gz | |
- Fixed bug #51435 (Missing ifdefs / logic bug in crypt code cause compile errors)
| -rw-r--r-- | ext/standard/config.m4 | 13 | ||||
| -rw-r--r-- | ext/standard/crypt.c | 6 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 92982a94fc..4e3db0ffe4 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -306,6 +306,15 @@ else fi AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports extended DES salt]) + if test "$ac_cv_crypt_md5" = "yes"; then + ac_result=1 + ac_crypt_md5=1 + else + ac_result=0 + ac_crypt_md5=0 + fi + AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, $ac_result, [Whether the system supports MD5 salt]) + if test "$ac_cv_crypt_sha512" = "yes"; then ac_result=1 ac_crypt_sha512=1 @@ -313,7 +322,7 @@ else ac_result=0 ac_crypt_sha512=0 fi - AC_DEFINE_UNQUOTED(PHP_EXT_SHA512_CRYPT, $ac_result, [Whether the system supports SHA512 salt]) + AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, $ac_result, [Whether the system supports SHA512 salt]) if test "$ac_cv_crypt_sha256" = "yes"; then ac_result=1 @@ -322,7 +331,7 @@ else ac_result=0 ac_crypt_sha256=0 fi - AC_DEFINE_UNQUOTED(PHP_EXT_SHA256_CRYPT, $ac_result, [Whether the system supports SHA256 salt]) + AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, $ac_result, [Whether the system supports SHA256 salt]) AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des]) fi diff --git a/ext/standard/crypt.c b/ext/standard/crypt.c index 471daffbcd..f66d58ab81 100644 --- a/ext/standard/crypt.c +++ b/ext/standard/crypt.c @@ -29,7 +29,7 @@ #if HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef PHP_USE_PHP_CRYPT_R +#if PHP_USE_PHP_CRYPT_R # include "php_crypt_r.h" # include "crypt_freesec.h" #else @@ -116,7 +116,7 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */ REGISTER_LONG_CONSTANT("CRYPT_SHA512", PHP_SHA512_CRYPT, CONST_CS | CONST_PERSISTENT); #endif -#ifdef PHP_USE_PHP_CRYPT_R +#if PHP_USE_PHP_CRYPT_R php_init_crypt_r(); #endif @@ -126,7 +126,7 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */ PHP_MSHUTDOWN_FUNCTION(crypt) /* {{{ */ { -#ifdef PHP_USE_PHP_CRYPT_R +#if PHP_USE_PHP_CRYPT_R php_shutdown_crypt_r(); #endif |