|
 |
ce9965 |
From fc4e31467c352032ee709ac55d3c67bc22abcd8d Mon Sep 17 00:00:00 2001
|
|
|
ce9965 |
From: Remi Collet <remi@remirepo.net>
|
|
|
ce9965 |
Date: Fri, 15 Oct 2021 17:11:12 +0200
|
|
|
ce9965 |
Subject: [PATCH] add --with-external-libcrypt build option display an error
|
|
|
ce9965 |
message if some algo not available in external libcrypt
|
|
|
ce9965 |
|
|
|
ce9965 |
---
|
|
|
ce9965 |
ext/standard/config.m4 | 21 ++++++++++++++++-----
|
|
|
ce9965 |
1 file changed, 16 insertions(+), 5 deletions(-)
|
|
|
ce9965 |
|
|
|
ce9965 |
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
|
|
|
ce9965 |
index 58b9c5e658a4..3ec18be4d7df 100644
|
|
|
ce9965 |
--- a/ext/standard/config.m4
|
|
|
ce9965 |
+++ b/ext/standard/config.m4
|
|
|
ce9965 |
@@ -267,14 +267,25 @@ int main() {
|
|
|
ce9965 |
])])
|
|
|
ce9965 |
|
|
|
ce9965 |
|
|
|
ce9965 |
+PHP_ARG_WITH([external-libcrypt],
|
|
|
ce9965 |
+ [for external libcrypt or libxcrypt],
|
|
|
ce9965 |
+ [AS_HELP_STRING([--with-external-libcrypt],
|
|
|
ce9965 |
+ [Use external libcrypt or libxcrypt])],
|
|
|
ce9965 |
+ [no],
|
|
|
ce9965 |
+ [no])
|
|
|
ce9965 |
+
|
|
|
ce9965 |
dnl
|
|
|
ce9965 |
dnl If one of them is missing, use our own implementation, portable code is then possible
|
|
|
ce9965 |
dnl
|
|
|
ce9965 |
-dnl TODO This is currently always enabled
|
|
|
ce9965 |
-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 "$ac_cv_func_crypt_r" != "yes" || true; then
|
|
|
ce9965 |
- 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])
|
|
|
ce9965 |
-
|
|
|
ce9965 |
- PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
|
|
|
ce9965 |
+dnl This is currently enabled by default
|
|
|
ce9965 |
+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 "$ac_cv_func_crypt_r" != "yes" || test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
|
|
|
ce9965 |
+ if test "$PHP_EXTERNAL_LIBCRYPT" = "no"; then
|
|
|
ce9965 |
+ 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])
|
|
|
ce9965 |
+
|
|
|
ce9965 |
+ PHP_ADD_SOURCES(PHP_EXT_DIR(standard), crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c)
|
|
|
ce9965 |
+ else
|
|
|
ce9965 |
+ AC_MSG_ERROR([Cannot use external libcrypt as some algo are missing])
|
|
|
ce9965 |
+ fi
|
|
|
ce9965 |
else
|
|
|
ce9965 |
AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des])
|
|
|
ce9965 |
fi
|