Skip to content

Commit 45ebe47

Browse files
committed
Autotools: Sync CS in ext/openssl
1 parent 6d59620 commit 45ebe47

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

ext/openssl/config0.m4

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ PHP_ARG_WITH([openssl-argon2],
2525
[no])
2626

2727
if test "$PHP_OPENSSL" != "no"; then
28-
PHP_NEW_EXTENSION([openssl], [openssl.c openssl_pwhash.c xp_ssl.c], [$ext_shared])
28+
PHP_NEW_EXTENSION([openssl],
29+
[openssl.c openssl_pwhash.c xp_ssl.c],
30+
[$ext_shared])
2931
PHP_SUBST([OPENSSL_SHARED_LIBADD])
3032
PHP_SETUP_OPENSSL([OPENSSL_SHARED_LIBADD],
3133
[AC_DEFINE([HAVE_OPENSSL_EXT], [1],
@@ -46,13 +48,14 @@ if test "$PHP_OPENSSL" != "no"; then
4648
[Define to 1 to load the OpenSSL legacy algorithm provider in addition to
4749
the default provider.])])
4850

49-
if test "$PHP_OPENSSL_ARGON2" != "no"; then
50-
if test "$PHP_THREAD_SAFETY" != "no"; then
51-
AC_MSG_ERROR([Not supported in ZTS mode for now])
52-
fi
51+
AS_VAR_IF([PHP_OPENSSL_ARGON2], [no],, [
52+
AS_VAR_IF([PHP_THREAD_SAFETY], [yes],
53+
[AC_MSG_ERROR([Not supported in ZTS mode for now])])
54+
5355
PHP_CHECK_LIBRARY([crypto], [OSSL_set_max_threads],
54-
[AC_DEFINE([HAVE_OPENSSL_ARGON2], [1], [ Define to 1 to enable argon2 password hashing ])],
56+
[AC_DEFINE([HAVE_OPENSSL_ARGON2], [1],
57+
[Define to 1 to enable OpenSSL argon2 password hashing.])],
5558
[AC_MSG_ERROR([argon2 hashing requires OpenSSL 3.2])],
5659
[$OPENSSL_LIBS])
57-
fi
60+
])
5861
fi

0 commit comments

Comments
 (0)