Skip to content

Commit 5518e0e

Browse files
committed
Windows: Allow OpenSSL Argon2 password hashing on ZTS
This is a follow-up of ce6e7a2 (GH-19236).
1 parent f99ca63 commit 5518e0e

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

ext/openssl/config.w32

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ if (PHP_OPENSSL != "no") {
1616
AC_DEFINE("LOAD_OPENSSL_LEGACY_PROVIDER", 1, "Define to 1 to load the OpenSSL legacy algorithm provider in addition to the default provider.");
1717
}
1818
if (PHP_OPENSSL_ARGON2 != "no") {
19-
if (PHP_ZTS != "no") {
20-
WARNING("OpenSSL argon2 hashing not supported in ZTS mode for now");
21-
} else if (!GREP_HEADER("openssl/thread.h", "OSSL_set_max_threads", PHP_PHP_BUILD + "\\include")) {
19+
if (!GREP_HEADER("openssl/thread.h", "OSSL_set_max_threads", PHP_PHP_BUILD + "\\include")) {
2220
WARNING("OpenSSL argon2 hashing requires OpenSSL >= 3.2");
2321
} else {
2422
AC_DEFINE("HAVE_OPENSSL_ARGON2", 1, "Define to 1 to enable OpenSSL argon2 password hashing.");

0 commit comments

Comments
 (0)