libmongocrypt-helper 1.13.2.0.1001 → 1.19.0.0.1001

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf822be923fbdd64028517f349c49776bcd49fc71a20b2625bb0e7f947db6ee
-  data.tar.gz: d54d214ba2f0bbab4ad98adb1eb36ec4f1bd301eda8835e02a8f211c787a925a
+  metadata.gz: b049e3785ef7124bc0172a97aca5a01ac2c883998bf066bd399b23aaa6f7ab29
+  data.tar.gz: b993577d300b0aafe7bd074774829edbe4a54425a1bbe631cdfa6424d73abba7
 SHA512:
-  metadata.gz: d834c0a45d8f3bdd61e6031f9bb9ef2f66dee31c1155c8ac15b33b22cba6267b6cfc714235c0a93e010a701535ee3e8615276af62239e30d764d4adac10b69f6
-  data.tar.gz: 63e6f9acb70f94690bd11edd415fbfffabb5051c8c5c59b6ddaeeb809e0f423f24297f0541ca3f1e8e3e496b66beaae2fea7b05add2d4dd16af44aa1615b398a
+  metadata.gz: 7effe0b13cb6bdea52e7ae92e8ae7fb3ca8230936d95e128d5e11ee35964ec848e46691fd8342e594918915f268ff3b6fa9a924f65d3015c1c25b17e22fc6e6b
+  data.tar.gz: 4ee52e78b00238026409e733f629ab1067179909d20605c981cd7ce4229ed976ece08fd7f8b4db68645d33cbb571c3a04054e604d9ffbe7e7c5752a8bd98b23b

data/ext/libmongocrypt/libmongocrypt/CHANGELOG.md

@@ -1,4 +1,137 @@
 # ChangeLog
+
+## 1.19.0
+
+### Added
+- Stable support for prefix and suffix queries:
+    - The `prefixPreview` query type is replaced with `prefix`.
+    - The `suffixPreview` query type is replaced with `suffix`.
+    - Use the `string` algorithm (formerly `textPreview`) for `prefix`, `suffix`, and `substringPreview` query types.
+
+### Removed
+- Support for the experimental `prefixPreview` and `suffixPreview` query types.
+
+## 1.18.1
+
+### Fixed
+- Fix QE text explicit encryption handling of `caseSensitive` and `diacriticSensitive` options.
+    - This is a backwards breaking bug fix, but only applies to the experimental QE text algorithm "TextPreview".
+- Fix handling of malformed KMS replies.
+
+## 1.18.0
+
+### Added
+- Signed binaries for macOS and Linux are now available on the GitHub release.
+    - Linux binaries including `nocrypto` in the name have no dependency on OpenSSL. Drivers using the `nocrypto` variant are expected to set crypto callbacks (e.g. call `mongocrypt_setopt_crypto_hooks`) to do operations requiring crypto to avoid an error.
+    - Drivers that package libmongocrypt binaries are encouraged to migrate release scripts to use these binaries.
+        - No reduction in platform support is expected. glibc dependencies were checked against existing builds on RHEL 6.2 and Ubuntu 16.04.
+- Support referencing keys by `keyAltName` in `encryptedFieldsMap`.
+
+### Changed
+
+- Final release packages in the PPA are now available by specifying `release` in the repository configuration in place of the major/minor version (e.g., `1.17`). Details in `README.md`.
+- Bump downloaded libbson version from 2.1.0 to 2.3.0.
+
+### Deprecated
+- RHEL 6.2 builds are deprecated and may be removed in the future. The `linux-x86_64-glibc_2_7-nocrypto` release build may be used instead and has equivalent glibc requirements.
+
+### Removed
+
+- The configure-time CMake parameter `ENABLE_WINDOWS_STATIC_RUNTIME` has been
+  removed. Users that need the static MSVCRT library should instead set the
+  [`CMAKE_MSVC_RUNTIME_LIBRARY`][msvcrt] built-in CMake parameter when
+  configuring libmongocrypt.
+- Packages for Debian 9 and Debian 10.
+
+[msvcrt]: https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
+
+## 1.17.3
+
+### Fixed
+
+- Fix check in KMIP parser.
+
+## 1.17.2
+
+### Fixed
+
+- Fix build warning with GCC 16
+
+## 1.17.1
+
+Add package for Debian Trixie.
+
+## 1.17.0
+
+### New features
+
+- Support mixing QE and unencrypted JSON schemas.
+
+### Fixed
+
+- Comply with CMake policy CMP0148 (use `FindPython` instead of `FindPythonInterp` and `FindPythonLibs`).
+- Fix possible resource leak in Queryable Encryption.
+
+## 1.16.0
+
+### Changed
+
+- Set CMake minimum required version to `3.15...4.0` (with maximum policy version set to `4.0`).
+- `FetchContent_MakeAvailable()` is used to populate dependencies instead of `FetchContent_Populate()`.
+  - This applies to MongoDB C Driver when `MONGOCRYPT_MONGOC_DIR` is not set to `USE-SYSTEM`.
+  - This applies to IntelDFP when `MONGOCRYPT_DFP_DIR` is not set to `USE-SYSTEM`.
+  - Note: `FetchContent_Populate()` is still used for CMake versions prior to 3.18 to avoid `add_subdirectory()` behavior.
+- Bump downloaded libbson version from 1.30.3 to 2.1.0.
+
+### New features
+- Support in-place retry on KMS requests.
+
+### Fixed
+- Do not propagate `-fPIC` in CMake targets.
+
+## 1.15.2
+
+### Fixed
+- Rename internal headers to avoid conflicts building libmongocrypt and C driver together.
+
+## 1.15.1
+
+### Fixed
+- Fix possible error when text options include multiple query types and are used for a find payload: `Text search query specification cannot contain multiple query type specifications`.
+- Require setting contention for text options.
+- Improve error message if text options are unset when using text algorithm.
+
+
+## 1.15.0
+
+### New features
+- Support experimental Queryable Encryption text indexes with `cleanupStructuredEncryptionData` and `compactStructuredEncryptionData`.
+- Support experimental explicit encryption for algorithm type: `textPreview` and query types: `prefixPreview`, `suffixPreview` and `substringPreview`
+    - Add `mongocrypt_setopt_algorithm_text` to apply options for explicit encryption.
+
+### Fixed
+- Bypass command `buildinfo` (previously only `buildInfo` was bypassed).
+- Bypass command `serverStatus`.
+
+### Removed
+- Support for building with Visual Studio 2015. Use Visual Studio 2017 or newer.
+
+## 1.14.1
+### Fixed
+- Fix possible missing error state on `mongocrypt_ctx_finalize`.
+### Improvements
+- Add Ubuntu 24.04 package.
+
+## 1.14.0
+### Fixed
+- Fix building against libbson with extra alignment enabled (`ENABLE_EXTRA_ALIGNMENT=ON`).
+- Retry KMS encrypt request for context created by `mongocrypt_ctx_rewrap_many_datakey_init`.
+### Improvements
+- Improve performance of OpenSSL crypto operations.
+- Improve error for incorrect path to crypt_shared library.
+### New features
+- Support experimental Queryable Encryption text indexes for automatic encryption.
+
 ## 1.13.2
 ### Notes
 - Bump downloaded libbson version from 1.28.1 to 1.30.3. Fixes a CMake configure error on macOS with CMake 4.
@@ -126,7 +259,7 @@ This release makes backwards breaking changes to Queryable Encryption (QE) behav
 ## Warnings
 - This release has a severe bug in the context returned by `mongocrypt_ctx_rewrap_many_datakey_init` that may result in data corruption. Please upgrade to 1.5.2 before using `mongocrypt_ctx_rewrap_many_datakey_init`.
 ## Fixed
-- Update to use new payload for FLE 2.0 find. 
+- Update to use new payload for FLE 2.0 find.
 - Require contention factor.
 ## 1.5.0-rc2
 ### Fixed
@@ -146,7 +279,7 @@ This release makes backwards breaking changes to Queryable Encryption (QE) behav
 ## 1.5.0-rc0
 ## Fixed
 - Account for shared library rename.
-- Update to use new payload for FLE 2.0 find. 
+- Update to use new payload for FLE 2.0 find.
 
 ## 1.5.0-alpha2
 ## New Features

data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt

@@ -1,15 +1,4 @@
-cmake_minimum_required (VERSION 3.12)
-
-# Preempt the MSVC_RUNTIME_LIBRARY properties
-if (POLICY CMP0091)
-   cmake_policy (SET CMP0091 NEW)
-elseif (DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
-   message (WARNING "The CMAKE_MSVC_RUNTIME_LIBRARY variable is set, but CMake is too old to understand it")
-endif ()
-
-if (POLICY CMP0135)
-   cmake_policy (SET CMP0135 NEW)
-endif ()
+cmake_minimum_required (VERSION 3.15...4.0)
 
 project (mongocrypt C)
 
@@ -26,21 +15,10 @@ option (ENABLE_PIC
 option (ENABLE_BUILD_FOR_PPA "Maintainer-only option for preparing PPA build" OFF)
 option (ENABLE_ONLINE_TESTS "Enable online tests and the csfle utility. Requires libmongoc." ON)
 
-if (ENABLE_WINDOWS_STATIC_RUNTIME)
-   if (POLICY CMP0091)
-      # CMake 3.15 makes this trivial:
-      set (CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
-   else ()
-      # Fix it up the old-fashioned way
-      string (REPLACE "/MDd" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-      string (REPLACE "/MD" "" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-      string (REPLACE "/MDd" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-      string (REPLACE "/MD" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-      string (APPEND CMAKE_C_FLAGS_DEBUG " /MTd")
-      string (APPEND CMAKE_CXX_FLAGS_DEBUG " /MTd")
-      string (APPEND CMAKE_C_FLAGS_RELEASE " /MT")
-      string (APPEND CMAKE_CXX_FLAGS_RELEASE " /MT")
-   endif ()
+if (MINGW)
+   # MSVCRT-based mingw-w64 GCC requires this macro to enable C99 format specifiers. This does not apply to UCRT-based
+   # mingw-w64 GCC, but apply the workaround anyways until bson-compat.h no longer requires this.
+   add_compile_definitions ("__USE_MINGW_ANSI_STDIO=1")
 endif ()
 
 list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
@@ -108,6 +86,7 @@ set (MONGOCRYPT_SOURCES
    src/mc-fle2-encryption-placeholder.c
    src/mc-fle2-find-equality-payload.c
    src/mc-fle2-find-equality-payload-v2.c
+   src/mc-fle2-find-text-payload.c
    src/mc-fle2-payload-iev.c
    src/mc-fle2-payload-iev-v2.c
    src/mc-fle2-payload-uev.c
@@ -115,10 +94,12 @@ set (MONGOCRYPT_SOURCES
    src/mc-fle2-payload-uev-v2.c
    src/mc-fle2-rfds.c
    src/mc-fle2-tag-and-encrypted-metadata-block.c
+   src/mc-parse-utils.c
    src/mc-range-edge-generation.c
    src/mc-range-mincover.c
    src/mc-range-encoding.c
    src/mc-rangeopts.c
+   src/mc-textopts.c
    src/mc-reader.c
    src/mc-schema-broker.c
    src/mc-str-encode-string-sets.c
@@ -199,12 +180,6 @@ else ()
    message (FATAL_ERROR "Unknown crypto provider ${MONGOCRYPT_CRYPTO}")
 endif ()
 
-set (MONGOCRYPT_ENABLE_TRACE 0)
-if (ENABLE_TRACE)
-   message (WARNING "Building with trace logging. This is highly insecure. Do not use in a production environment")
-   set (MONGOCRYPT_ENABLE_TRACE 1)
-endif ()
-
 set (BUILD_VERSION "0.0.0" CACHE STRING "Library version")
 if (BUILD_VERSION STREQUAL "0.0.0")
    if (EXISTS ${CMAKE_BINARY_DIR}/VERSION_CURRENT)
@@ -213,10 +188,10 @@ if (BUILD_VERSION STREQUAL "0.0.0")
       file (STRINGS ${PROJECT_SOURCE_DIR}/VERSION_CURRENT BUILD_VERSION)
       message (STATUS "File VERSION_CURRENT contained BUILD_VERSION ${BUILD_VERSION}")
    else ()
-      find_package (PythonInterp)
-      if (PYTHONINTERP_FOUND)
+      find_package (Python COMPONENTS Interpreter)
+      if (TARGET Python::Interpreter)
          execute_process (
-            COMMAND ${PYTHON_EXECUTABLE} etc/calc_release_version.py
+            COMMAND "${Python_EXECUTABLE}" etc/calc_release_version.py
             WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
             OUTPUT_VARIABLE CALC_RELEASE_VERSION
             RESULT_VARIABLE CALC_RELEASE_VERSION_RESULT
@@ -254,22 +229,22 @@ configure_file (
    "${PROJECT_BINARY_DIR}/src/mongocrypt-config.h"
 )
 
-# Define the mlib target, which is private and header-only. It is not exported
+# Define the mc-mlib target, which is private and header-only. It is not exported
 # nor are its headers installed.
-add_library (_mongo-mlib INTERFACE)
-add_library (mongo::mlib ALIAS _mongo-mlib)
-list (APPEND MLIB_DEFINITIONS MLIB_USER)
+add_library (_mongo-mc-mlib INTERFACE)
+add_library (mongo::mc-mlib ALIAS _mongo-mc-mlib)
+list (APPEND MCMLIB_DEFINITIONS MLIB_USER)
 CHECK_INCLUDE_FILE (strings.h HAVE_STRINGS_H)
 if (HAVE_STRINGS_H)
-   list (APPEND MLIB_DEFINITIONS MLIB_HAVE_STRINGS_H)
+   list (APPEND MCMLIB_DEFINITIONS MLIB_HAVE_STRINGS_H)
 endif ()
 set_property(
-   TARGET _mongo-mlib
+   TARGET _mongo-mc-mlib
    APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS
-   ${MLIB_DEFINITIONS}
+   ${MCMLIB_DEFINITIONS}
    )
 set_property(
-   TARGET _mongo-mlib
+   TARGET _mongo-mc-mlib
    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
    )
@@ -292,7 +267,7 @@ target_link_libraries (
    PRIVATE
       _mongocrypt::libbson_for_shared
       kms_message_static
-      $<BUILD_INTERFACE:mongo::mlib>
+      $<BUILD_INTERFACE:mongo::mc-mlib>
    PUBLIC
       mongocrypt::platform
       ${maybe_dfp_library}
@@ -326,7 +301,7 @@ add_library (mongocrypt_static STATIC ${MONGOCRYPT_SOURCES})
 # the common case that users are setting -DCMAKE_C_FLAGS='-fPIC'
 string (FIND "${CMAKE_C_FLAGS}" "-fPIC" FPIC_LOCATION)
 if (NOT WIN32 AND ENABLE_PIC AND "${FPIC_LOCATION}" EQUAL "-1")
-   target_compile_options (mongocrypt_static PUBLIC -fPIC)
+   set_property (TARGET mongocrypt_static PROPERTY POSITION_INDEPENDENT_CODE TRUE)
    message ("Adding -fPIC to compilation of mongocrypt_static components")
 endif ()
 target_include_directories (
@@ -348,7 +323,7 @@ target_link_libraries (
    PRIVATE
       _mongocrypt::libbson_for_static
       kms_message_static
-      $<BUILD_INTERFACE:mongo::mlib>
+      $<BUILD_INTERFACE:mongo::mc-mlib>
    PUBLIC
       mongocrypt::platform
       ${maybe_dfp_library}
@@ -469,6 +444,7 @@ set (TEST_MONGOCRYPT_SOURCES
    test/test-mc-fle2-encryption-placeholder.c
    test/test-mc-fle2-find-equality-payload-v2.c
    test/test-mc-fle2-find-range-payload-v2.c
+   test/test-mc-fle2-find-text-payload.c
    test/test-mc-fle2-payload-iev.c
    test/test-mc-fle2-payload-iev-v2.c
    test/test-mc-fle2-payload-iup.c
@@ -480,6 +456,7 @@ set (TEST_MONGOCRYPT_SOURCES
    test/test-mc-range-edge-generation.c
    test/test-mc-range-mincover.c
    test/test-mc-rangeopts.c
+   test/test-mc-textopts.c
    test/test-mc-reader.c
    test/test-mc-text-search-str-encode.c
    test/test-mc-schema-broker.c
@@ -522,17 +499,21 @@ set (TEST_MONGOCRYPT_SOURCES
    test/test-unicode-fold.c
    )
 
+if (BUILD_TESTING)
+
 # Define test-mongocrypt
 add_executable (test-mongocrypt ${TEST_MONGOCRYPT_SOURCES})
 # Use the static version since it allows the test binary to use private symbols
 target_include_directories (test-mongocrypt PRIVATE ./src "${CMAKE_CURRENT_SOURCE_DIR}/kms-message/src")
-target_link_libraries (test-mongocrypt PRIVATE _mongocrypt::libbson_for_static mongocrypt_static mongo::mlib)
+target_link_libraries (test-mongocrypt PRIVATE _mongocrypt::libbson_for_static mongocrypt_static mongo::mc-mlib)
 target_include_directories (test-mongocrypt PRIVATE "${CMAKE_CURRENT_LIST_DIR}/test")
 target_compile_definitions (test-mongocrypt PRIVATE
    # Set a definition so that testcases can know where test-mongocrypt.exe was written to
    "TEST_MONGOCRYPT_OUTPUT_PATH=\"$<TARGET_FILE:test-mongocrypt>\""
    # Tell test-mongocrypt whether we have a real csfle library for testing
    TEST_MONGOCRYPT_HAVE_REAL_CRYPT_SHARED_LIB=$<BOOL:${MONGOCRYPT_TESTING_CRYPT_SHARED_FILE}>
+   # Tell test-mongocrypt the path of the libmongocrypt shared library for testing.
+   "TEST_MONGOCRYPT_MONGOCRYPT_SHARED_PATH=\"$<TARGET_FILE:mongocrypt>\""
    )
 
 add_test (
@@ -542,9 +523,9 @@ add_test (
    )
 
 foreach (test IN ITEMS path str)
-   add_executable (mlib.${test}.test src/mlib/${test}.test.c)
+   add_executable (mlib.${test}.test src/mc-mlib/${test}.test.c)
    add_test (mlib.${test} mlib.${test}.test)
-   target_link_libraries (mlib.${test}.test PRIVATE mongo::mlib)
+   target_link_libraries (mlib.${test}.test PRIVATE mongo::mc-mlib)
 endforeach ()
 
 if ("cxx_relaxed_constexpr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
@@ -562,7 +543,7 @@ if ("cxx_relaxed_constexpr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
       target_compile_features ("${exe_name}" PRIVATE cxx_relaxed_constexpr)
       target_link_libraries ("${exe_name}" PRIVATE
          mongocrypt
-         mongo::mlib
+         mongo::mc-mlib
          ${maybe_dfp_library}
          _mongocrypt::libbson_for_static
          )
@@ -570,9 +551,11 @@ if ("cxx_relaxed_constexpr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
    endforeach ()
 endif ()
 
+endif () # BUILD_TESTING
+
 if ("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
    add_executable (csfle-markup src/csfle-markup.cpp)
-   target_link_libraries (csfle-markup PRIVATE mongocrypt_static _mongocrypt::libbson_for_static mongo::mlib)
+   target_link_libraries (csfle-markup PRIVATE mongocrypt_static _mongocrypt::libbson_for_static mongo::mc-mlib)
    target_compile_features (csfle-markup PRIVATE cxx_std_20)
 endif ()
 
@@ -623,8 +606,8 @@ install (
    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
 )
 
-# This export set is not installed, and is only to allow export() of the mlib-using targets
-install (TARGETS _mongo-mlib EXPORT _exports_for_export)
+# This export set is not installed, and is only to allow export() of the mc-mlib-using targets
+install (TARGETS _mongo-mc-mlib EXPORT _exports_for_export)
 export (EXPORT _exports_for_export)
 
 install (
@@ -639,11 +622,11 @@ install (
 set (PROJECT_VERSION "${BUILD_VERSION}")
 set (PROJECT_DESCRIPTION "The libmongocrypt client-side field level encryption library.")
 if (NOT ENABLE_BUILD_FOR_PPA)
-   set (PKG_CONFIG_STATIC_REQUIRES "libbson-static-1.0")
+   set (PKG_CONFIG_STATIC_REQUIRES "bson2-static")
 endif ()
 if (USE_SHARED_LIBBSON)
-   set (PKG_CONFIG_REQUIRES "libbson-1.0")
-   set (PKG_CONFIG_STATIC_REQUIRES "libbson-1.0")
+   set (PKG_CONFIG_REQUIRES "bson2")
+   set (PKG_CONFIG_STATIC_REQUIRES "bson2")
 endif ()
 set (PKG_CONFIG_LIBDIR "\${prefix}/${CMAKE_INSTALL_LIBDIR}")
 set (PKG_CONFIG_INCLUDEDIR "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}/mongocrypt")
@@ -712,4 +695,3 @@ install (
    COMPONENT
       Devel
 )
-

data/ext/libmongocrypt/libmongocrypt/CODEOWNERS

@@ -1,4 +1,10 @@
 # Code Owners will automatically be added as reviewers on PRs
 
+# Listing code owners is required by DRIVERS-3098
+* @mongodb/dbx-c-cxx
+
 # Python Bindings
-bindings/python @mongodb/dbx-python
+bindings/python @mongodb/dbx-python
+
+# GitHub actions (currently only used by Python Bindings)
+.github @mongodb/dbx-python