Skip to content

Commit 4d37f3a

Browse files
authored
PHPC-2454: Remove --enable-system-ciphers configure option (#1681)
1 parent d9a90ec commit 4d37f3a

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

UPGRADE-2.0.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ UPGRADE FROM 1.x to 2.0
3232
`MongoDB\BSON\Int64` class instead.
3333
* The `--with-openssl-dir` configure option has been removed. If using OpenSSL,
3434
ensure that it is detected by `pkg-config`.
35+
* The `--with-system-ciphers` configure option has been removed. Use
36+
`--enable-mongodb-crypto-system-profile` instead.

scripts/autotools/libmongoc/CheckSSL.m4

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -229,25 +229,7 @@ PHP_ARG_ENABLE([mongodb-crypto-system-profile],
229229
[no])
230230
PHP_MONGODB_VALIDATE_ARG([PHP_MONGODB_CRYPTO_SYSTEM_PROFILE], [yes no])
231231

232-
PHP_ARG_WITH([system-ciphers],
233-
[deprecated option for whether to use system crypto profile],
234-
AS_HELP_STRING([--enable-system-ciphers],
235-
[MongoDB: whether to use system crypto profile (deprecated for --enable-mongodb-crypto-system-profile) [default=no]]),
236-
[no],
237-
[no])
238-
239-
dnl Do not validate PHP_SYSTEM_CIPHERS for static builds, since it is also used
240-
dnl by the OpenSSL extension, which checks for values other than "no".
241-
if test "$ext_shared" = "yes"; then
242-
PHP_MONGODB_VALIDATE_ARG([PHP_SYSTEM_CIPHERS], [yes no])
243-
244-
if test "$PHP_SYSTEM_CIPHERS" != "no"; then
245-
AC_MSG_WARN([Using --enable-system-ciphers is deprecated and will be removed in a future version. Please use --enable-mongodb-crypto-system-profile instead])
246-
fi
247-
fi
248-
249-
dnl Also consider the deprecated --enable-system-ciphers option
250-
if test "$PHP_MONGODB_CRYPTO_SYSTEM_PROFILE" = "yes" -o "$PHP_SYSTEM_CIPHERS" = "yes"; then
232+
if test "$PHP_MONGODB_CRYPTO_SYSTEM_PROFILE" = "yes"; then
251233
if test "$PHP_MONGODB_SSL" = "openssl"; then
252234
AC_SUBST(MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE, 1)
253235
else

0 commit comments

Comments
 (0)