Skip to content

Commit

Permalink
PHPC-2454: Remove --enable-system-ciphers configure option (#1681)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmikola authored Sep 24, 2024
1 parent d9a90ec commit 4d37f3a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 19 deletions.
2 changes: 2 additions & 0 deletions UPGRADE-2.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ UPGRADE FROM 1.x to 2.0
`MongoDB\BSON\Int64` class instead.
* The `--with-openssl-dir` configure option has been removed. If using OpenSSL,
ensure that it is detected by `pkg-config`.
* The `--with-system-ciphers` configure option has been removed. Use
`--enable-mongodb-crypto-system-profile` instead.
20 changes: 1 addition & 19 deletions scripts/autotools/libmongoc/CheckSSL.m4
Original file line number Diff line number Diff line change
Expand Up @@ -229,25 +229,7 @@ PHP_ARG_ENABLE([mongodb-crypto-system-profile],
[no])
PHP_MONGODB_VALIDATE_ARG([PHP_MONGODB_CRYPTO_SYSTEM_PROFILE], [yes no])

PHP_ARG_WITH([system-ciphers],
[deprecated option for whether to use system crypto profile],
AS_HELP_STRING([--enable-system-ciphers],
[MongoDB: whether to use system crypto profile (deprecated for --enable-mongodb-crypto-system-profile) [default=no]]),
[no],
[no])

dnl Do not validate PHP_SYSTEM_CIPHERS for static builds, since it is also used
dnl by the OpenSSL extension, which checks for values other than "no".
if test "$ext_shared" = "yes"; then
PHP_MONGODB_VALIDATE_ARG([PHP_SYSTEM_CIPHERS], [yes no])

if test "$PHP_SYSTEM_CIPHERS" != "no"; then
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])
fi
fi

dnl Also consider the deprecated --enable-system-ciphers option
if test "$PHP_MONGODB_CRYPTO_SYSTEM_PROFILE" = "yes" -o "$PHP_SYSTEM_CIPHERS" = "yes"; then
if test "$PHP_MONGODB_CRYPTO_SYSTEM_PROFILE" = "yes"; then
if test "$PHP_MONGODB_SSL" = "openssl"; then
AC_SUBST(MONGOC_ENABLE_CRYPTO_SYSTEM_PROFILE, 1)
else
Expand Down

0 comments on commit 4d37f3a

Please sign in to comment.