Skip to content

PHPC-2228: Upgrade libmongocrypt to 1.8.1 #1428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 28, 2023
Merged

PHPC-2228: Upgrade libmongocrypt to 1.8.1 #1428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e25d56
Update update-submodule-sources script for zlib 1.2.13
jmikola May 26, 2023
3709243
PHPC-2228: Upgrade libmongocrypt to 1.8.1
jmikola May 26, 2023
58e26a5
Update expected error message for invalid crypt_shared override path
jmikola May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ if test "$PHP_MONGODB" != "no"; then
AC_MSG_CHECKING(for libmongocrypt)

if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists libmongocrypt; then
if $PKG_CONFIG libmongocrypt --atleast-version 1.8.0; then
if $PKG_CONFIG libmongocrypt --atleast-version 1.8.1; then
PHP_MONGODB_MONGOCRYPT_CFLAGS=`$PKG_CONFIG libmongocrypt --cflags`
PHP_MONGODB_MONGOCRYPT_LIBS=`$PKG_CONFIG libmongocrypt --libs`
PHP_MONGODB_MONGOCRYPT_VERSION=`$PKG_CONFIG libmongocrypt --modversion`
Expand All @@ -302,7 +302,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])
elif test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then
AC_MSG_ERROR(system libmongocrypt must be upgraded to version >= 1.8.0)
AC_MSG_ERROR(system libmongocrypt must be upgraded to version >= 1.8.1)
else
AC_MSG_RESULT([found an older version, compiling without client-side encryption])
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-submodule-sources.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'PHP_MONGODB_BSON_SOURCES' => 'src/libmongoc/src/libbson/src/bson',
'PHP_MONGODB_JSONSL_SOURCES' => 'src/libmongoc/src/libbson/src/jsonsl',
'PHP_MONGODB_MONGOC_SOURCES' => 'src/libmongoc/src/libmongoc/src/mongoc',
'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.2.12',
'PHP_MONGODB_ZLIB_SOURCES' => 'src/libmongoc/src/zlib-1.2.13',
'PHP_MONGODB_MONGOCRYPT_SOURCES' => 'src/libmongocrypt/src',
'PHP_MONGODB_MONGOCRYPT_CRYPTO_SOURCES' => 'src/libmongocrypt/src/crypto',
'PHP_MONGODB_MONGOCRYPT_OS_POSIX_SOURCES' => 'src/libmongocrypt/src/os_posix',
Expand Down
2 changes: 1 addition & 1 deletion src/LIBMONGOCRYPT_VERSION_CURRENT
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.0-alpha0
1.8.1
2 changes: 1 addition & 1 deletion src/libmongocrypt
Open in desktop
Submodule libmongocrypt updated 86 files
+5 −4 .evergreen/config.yml
+2 −0 .lsan-suppressions
+8 −0 CHANGELOG.md
+4 −23 CMakeLists.txt
+7 −7 README.md
+1 −1 bindings/cs/MongoDB.Libmongocrypt/Library.cs
+2 −2 bindings/cs/Scripts/build.cake
+6 −5 bindings/java/mongocrypt/src/main/java/com/mongodb/crypt/capi/CAPI.java
+6 −4 bindings/java/mongocrypt/src/test/java/com/mongodb/crypt/capi/MongoCryptTest.java
+26 −0 bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/encrypted-payload.json
+0 −0 bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/key-filter.json
+0 −0 bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/rangeopts.json
+0 −0 bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/value-to-encrypt.json
+0 −26 bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/encrypted-payload.json
+0 −0 bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/key-document.json
+9 −0 bindings/node/.evergreen/prebuild.sh
+4 −0 bindings/node/CHANGELOG.md
+2 −3 bindings/node/lib/stateMachine.js
+299 −187 bindings/node/package-lock.json
+3 −3 bindings/node/package.json
+4 −4 bindings/node/test/clientEncryption.test.js
+0 −42 bindings/node/test/cryptoCallbacks.test.js
+4 −17 bindings/python/.evergreen/test.sh
+1 −9 bindings/python/.evergreen/utils.sh
+10 −0 bindings/python/CHANGELOG.rst
+2 −2 bindings/python/README.rst
+1 −1 bindings/python/build-manylinux-wheel.sh
+128 −238 bindings/python/pymongocrypt/binding.py
+0 −27 bindings/python/pymongocrypt/compat.py
+5 −21 bindings/python/pymongocrypt/mongocrypt.py
+1 −1 bindings/python/pymongocrypt/version.py
+1 −1 bindings/python/release.sh
+14 −9 bindings/python/setup.py
+4 −12 bindings/python/test-requirements.txt
+1 −10 bindings/python/test/__init__.py
+26 −0 bindings/python/test/data/fle2-find-range-explicit-v2/int32/encrypted-payload.json
+0 −0 bindings/python/test/data/fle2-find-range-explicit-v2/int32/rangeopts.json
+0 −0 bindings/python/test/data/fle2-find-range-explicit-v2/int32/value-to-encrypt.json
+0 −26 bindings/python/test/data/fle2-find-range-explicit/int32/encrypted-payload.json
+5 −5 bindings/python/test/test_mongocrypt.py
+3 −1 cmake/IntelDFP.cmake
+50 −0 cmake/Platform.cmake
+21 −0 cmake/mongocrypt-config.cmake
+25 −0 etc/mongo-inteldfp-MONGOCRYPT-571.patch
+13 −0 etc/mongo-inteldfp-libmongocrypt-pr-625.patch
+3 −0 src/mc-fle2-encryption-placeholder.c
+2 −0 src/mc-fle2-rfds-private.h
+0 −2 src/mc-fle2-rfds.c
+6 −30 src/mc-rangeopts.c
+6 −3 src/mongocrypt-buffer.c
+11 −0 src/mongocrypt-ctx-encrypt.c
+3 −0 src/mongocrypt-ctx-rewrap-many-datakey.c
+3 −1 src/mongocrypt-key-broker.c
+11 −0 src/mongocrypt-private.h
+32 −30 src/mongocrypt.c
+0 −12 src/mongocrypt.h
+2 −2 test/data/fle2-explain/with-csfle/encrypted-payload.json
+8 −0 test/data/fle2-explicit/find-indexed-contentionFactor1-v2.json
+8 −0 test/data/fle2-explicit/find-indexed-v2.json
+8 −0 test/data/fle2-explicit/insert-indexed-contentionFactor1-v2.json
+8 −0 test/data/fle2-explicit/insert-indexed-same-user-and-index-key-v2.json
+8 −0 test/data/fle2-explicit/insert-indexed-v2.json
+26 −0 test/data/fle2-find-range-explicit/double-precision/encrypted-payload-v2.json
+26 −0 test/data/fle2-find-range-explicit/double/encrypted-payload-v2.json
+26 −0 test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload-v2.json
+0 −26 test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload.json
+0 −5 test/data/fle2-find-range-explicit/int32-nominmax/rangeopts.json
+0 −20 test/data/fle2-find-range-explicit/int32-nominmax/value-to-encrypt.json
+16 −0 test/data/fle2-find-range-explicit/int32-openinterval/encrypted-payload-v2.json
+26 −0 test/data/fle2-find-range-explicit/int32/encrypted-payload-v2.json
+8 −0 test/data/fle2-insert-range-explicit/double-precision/encrypted-payload-v2.json
+8 −0 test/data/fle2-insert-range-explicit/double/encrypted-payload-v2.json
+0 −70 test/data/fle2-insert-range-explicit/int32-nominmax/RNG_DATA.h
+8 −0 test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload-v2.json
+0 −8 test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload.json
+0 −5 test/data/fle2-insert-range-explicit/int32-nominmax/rangeopts.json
+0 −5 test/data/fle2-insert-range-explicit/int32-nominmax/value-to-encrypt.json
+8 −0 test/data/fle2-insert-range-explicit/int32/encrypted-payload-v2.json
+8 −0 test/data/fle2-insert-range-explicit/sparsity-2/encrypted-payload-v2.json
+1 −0 test/test-mc-fle2-payload-iev-v2.c
+1 −0 test/test-mc-fle2-payload-uev-v2.c
+1 −1 test/test-mc-fle2-rfds.c
+13 −0 test/test-mongocrypt-csfle-lib.c
+508 −34 test/test-mongocrypt-ctx-encrypt.c
+2 −2 test/test-mongocrypt.c
+2 −2 test/test-mongocrypt.h
2 changes: 1 addition & 1 deletion tests/manager/manager-ctor-auto_encryption-error-004.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var_dump(get_module_info('crypt_shared library version'));
<?php exit(0); ?>
--EXPECTF--
OK: Got MongoDB\Driver\Exception\EncryptionException
A crypt_shared override path was specified [/not/found], but we failed to open a dynamic library at that location
A crypt_shared override path was specified [/not/found], but we failed to open a dynamic library at that location%A

OK: Got MongoDB\Driver\Exception\EncryptionException
Option 'cryptSharedLibRequired' is 'true', but failed to load the crypt_shared runtime library
Expand Down