diff --git a/config.m4 b/config.m4 index 82a87f8bd..28e8ddae6 100644 --- a/config.m4 +++ b/config.m4 @@ -299,7 +299,7 @@ if test "$PHP_MONGODB" != "no"; then ]) if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" != "no"; then - PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.10.1], [ + PKG_CHECK_MODULES([PHP_MONGODB_MONGOCRYPT], [libmongocrypt >= 1.11.0], [ PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion` PHP_MONGODB_MONGOCRYPT_VERSION_STRING="System ($PHP_MONGODB_MONGOCRYPT_VERSION)" @@ -307,7 +307,7 @@ if test "$PHP_MONGODB" != "no"; then PHP_EVAL_LIBLINE($PHP_MONGODB_MONGOCRYPT_LIBS, MONGODB_SHARED_LIBADD) AC_DEFINE(HAVE_SYSTEM_LIBMONGOCRYPT, 1, [Use system libmongocrypt]) ],[ - AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.10.1) + AC_MSG_ERROR(Could not find system library for libmongocrypt >= 1.11.0) ]) fi fi diff --git a/config.w32 b/config.w32 index 9fe56cb43..db80390f8 100644 --- a/config.w32 +++ b/config.w32 @@ -177,6 +177,7 @@ if (PHP_MONGODB != "no") { // TODO: Support building with Secure Channel on Windows MONGOC_ENABLE_SSL_SECURE_CHANNEL: 0, MONGOC_ENABLE_CRYPTO_CNG: 0, + MONGOC_HAVE_BCRYPT_PBKDF2: 0, // Secure Transport does not apply to Windows MONGOC_ENABLE_SSL_SECURE_TRANSPORT: 0, MONGOC_ENABLE_CRYPTO_COMMON_CRYPTO: 0, diff --git a/scripts/autotools/libmongoc/CheckSSL.m4 b/scripts/autotools/libmongoc/CheckSSL.m4 index 5ec9c8d11..faf1190b2 100644 --- a/scripts/autotools/libmongoc/CheckSSL.m4 +++ b/scripts/autotools/libmongoc/CheckSSL.m4 @@ -186,6 +186,7 @@ AC_MSG_RESULT([$PHP_MONGODB_SSL]) dnl Disable Windows SSL and crypto AC_SUBST(MONGOC_ENABLE_SSL_SECURE_CHANNEL, 0) AC_SUBST(MONGOC_ENABLE_CRYPTO_CNG, 0) +AC_SUBST(MONGOC_HAVE_BCRYPT_PBKDF2, 0) if test "$PHP_MONGODB_SSL" = "openssl" -o "$PHP_MONGODB_SSL" = "libressl" -o "$PHP_MONGODB_SSL" = "darwin"; then AC_SUBST(MONGOC_ENABLE_SSL, 1) diff --git a/src/LIBMONGOCRYPT_VERSION_CURRENT b/src/LIBMONGOCRYPT_VERSION_CURRENT index 4dae2985b..1cac385c6 100644 --- a/src/LIBMONGOCRYPT_VERSION_CURRENT +++ b/src/LIBMONGOCRYPT_VERSION_CURRENT @@ -1 +1 @@ -1.10.1 +1.11.0 diff --git a/src/LIBMONGOC_VERSION_CURRENT b/src/LIBMONGOC_VERSION_CURRENT index f066e1f1d..1f22968d1 100644 --- a/src/LIBMONGOC_VERSION_CURRENT +++ b/src/LIBMONGOC_VERSION_CURRENT @@ -1 +1 @@ -1.28.0-20240715+git03e993d856 +1.28.0-20240827+git1858014e01 diff --git a/src/libmongoc b/src/libmongoc index 03e993d85..1858014e0 160000 --- a/src/libmongoc +++ b/src/libmongoc @@ -1 +1 @@ -Subproject commit 03e993d856b9abcffb78ffee21c919703ac94694 +Subproject commit 1858014e01c15a85b82c3980f53757e579834af2 diff --git a/src/libmongocrypt b/src/libmongocrypt index 654385b2f..9a88ac569 160000 --- a/src/libmongocrypt +++ b/src/libmongocrypt @@ -1 +1 @@ -Subproject commit 654385b2f898caefcb923110b7fa7f340d4b993d +Subproject commit 9a88ac5698e8e3ffcd6580b98c247f0126f26c40