From d20628437aeadd850bd8c91b947ce80f681ad0d2 Mon Sep 17 00:00:00 2001 From: Jeremy Mikola Date: Mon, 23 Sep 2024 16:48:37 -0400 Subject: [PATCH] PHPC-2454: Remove --enable-system-ciphers configure option --- UPGRADE-2.0.md | 2 ++ scripts/autotools/libmongoc/CheckSSL.m4 | 20 +------------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/UPGRADE-2.0.md b/UPGRADE-2.0.md index eebbc6226..6f1e309af 100644 --- a/UPGRADE-2.0.md +++ b/UPGRADE-2.0.md @@ -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. diff --git a/scripts/autotools/libmongoc/CheckSSL.m4 b/scripts/autotools/libmongoc/CheckSSL.m4 index a5d1f1ac1..d5ffecdf1 100644 --- a/scripts/autotools/libmongoc/CheckSSL.m4 +++ b/scripts/autotools/libmongoc/CheckSSL.m4 @@ -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