com php-src: Ensure that all crypt() formats are supported: ext/standard/config.m4

From: Date: Fri, 25 Mar 2016 19:39:14 +0000
Subject: com php-src: Ensure that all crypt() formats are supported: ext/standard/config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-91482@lists.php.net to get a copy of this message
Commit: a142c274fbc31b073a57e70f358d59e498753064 Author: Nikita Popov <nikic@php.net> Fri, 25 Mar 2016 20:37:17 +0100 Parents: e9ee9e13f0164789ff708cdae720fd893dff9c9d Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a142c274fbc31b073a57e70f358d59e498753064 Log: Ensure that all crypt() formats are supported Checks for md5, sha512 and sha256 were missing. As a result the PHP_*_CRYPT constants are always 1 now. Changed paths: M ext/standard/config.m4 Diff: diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index f9afff3..36a11c4 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -242,7 +242,7 @@ int main() { dnl dnl If one of them is missing, use our own implementation, portable code is then possible dnl -if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then +if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "x$php_crypt_r" = "x0"; then dnl dnl Check for __alignof__ support in the compiler @@ -278,72 +278,19 @@ if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 1, [Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5]) - AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) - AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) - AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) - AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) - AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) - AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c) else - if test "$ac_cv_crypt_des" = "yes"; then - ac_result=1 - ac_crypt_des=1 - else - ac_result=0 - ac_crypt_des=0 - fi - AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports standard DES salt]) - - if test "$ac_cv_crypt_blowfish" = "yes"; then - ac_result=1 - ac_crypt_blowfish=1 - else - ac_result=0 - ac_crypt_blowfish=0 - fi - AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, $ac_result, [Whether the system supports BlowFish salt]) - - if test "$ac_cv_crypt_ext_des" = "yes"; then - ac_result=1 - ac_crypt_edes=1 - else - ac_result=0 - ac_crypt_edes=0 - 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 - else - ac_result=0 - ac_crypt_sha512=0 - fi - 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 - ac_crypt_sha256=1 - else - ac_result=0 - ac_crypt_sha256=0 - fi - 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 +AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, 1, [Whether the system supports standard DES salt]) +AC_DEFINE_UNQUOTED(PHP_BLOWFISH_CRYPT, 1, [Whether the system supports BlowFish salt]) +AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, 1, [Whether the system supports extended DES salt]) +AC_DEFINE_UNQUOTED(PHP_MD5_CRYPT, 1, [Whether the system supports MD5 salt]) +AC_DEFINE_UNQUOTED(PHP_SHA512_CRYPT, 1, [Whether the system supports SHA512 salt]) +AC_DEFINE_UNQUOTED(PHP_SHA256_CRYPT, 1, [Whether the system supports SHA256 salt]) + dnl dnl Check for available functions dnl

« previous php.cvs (#91482) next »