Skip to content

Commit 3b0078e

Browse files
authored
CDRIVER-5744 update required libmongocrypt to 1.12.0 (#1784)
1 parent 8f24109 commit 3b0078e

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

.evergreen/scripts/compile-libmongocrypt.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ compile_libmongocrypt() {
1010
# `.evergreen/scripts/kms-divergence-check.sh` to ensure that there is no
1111
# divergence in the copied files.
1212

13-
# TODO: once 1.12.0 is released (containing de69cc91e1574e8861cd0ceb4bb866cc02a53d6b) replace the following with:
14-
# git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.12.0 || return
15-
{
16-
git clone -q https://github.com/mongodb/libmongocrypt || return
17-
git -C libmongocrypt checkout de69cc91e1574e8861cd0ceb4bb866cc02a53d6b
18-
}
13+
git clone -q --depth=1 https://github.com/mongodb/libmongocrypt --branch 1.12.0 || return
1914

2015
declare -a crypt_cmake_flags=(
2116
"-DMONGOCRYPT_MONGOC_DIR=${mongoc_dir}"
2217
"-DBUILD_TESTING=OFF"
2318
"-DENABLE_ONLINE_TESTS=OFF"
2419
"-DENABLE_MONGOC=OFF"
25-
"-DBUILD_VERSION=1.11.0-pre"
20+
"-DBUILD_VERSION=1.12.0"
2621
)
2722

2823
env \

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ Deprecated:
1212
* `mongoc_database_command` is deprecated and planned for removal in a future release. Use `mongoc_database_command_simple` instead.
1313
* `mongoc_collection_command` is deprecated and planned for removal in a future release. Use `mongoc_collection_command_simple` instead.
1414

15+
Notes:
16+
17+
* Raise required version of libmongocrypt to 1.12.0 to support In-Use Encryption (corresponds to the CMake option: `ENABLE_CLIENT_SIDE_ENCRYPTION`).
18+
1519
libmongoc 1.28.1
1620
================
1721

src/libmongoc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -514,10 +514,10 @@ elseif (NOT ENABLE_CLIENT_SIDE_ENCRYPTION STREQUAL OFF)
514514
find_package (mongocrypt QUIET)
515515
endif ()
516516

517-
if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.11.0)
517+
if (mongocrypt_FOUND AND "${mongocrypt_VERSION}" VERSION_LESS 1.12.0)
518518
message (STATUS " libmongocrypt found at ${mongocrypt_DIR}")
519519
message (STATUS " libmongocrypt version ${mongocrypt_VERSION} found")
520-
message (STATUS " libmongocrypt version 1.11.0 is required to enable In-Use Encryption Support.")
520+
message (STATUS " libmongocrypt version 1.12.0 is required to enable In-Use Encryption Support.")
521521
set (REQUIRED_MONGOCRYPT_VERSION_FOUND OFF)
522522
elseif (mongocrypt_FOUND)
523523
set (REQUIRED_MONGOCRYPT_VERSION_FOUND ON)

0 commit comments

Comments
 (0)