libmongocrypt-helper 1.7.4.0.1002 → 1.8.0.0.1001

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c28cbfbd91e043ddfd42777c19330e7a3c5c8d3d0915793d2fc69d8f641dd5d8
-  data.tar.gz: 0fe816908825594f1728ae973604f0d3cc5e2288a3f8fad99ccfbaaca4511fa3
+  metadata.gz: 3ae10db4e420e2a2ec71ccedbb7024d15a87141ce15c0af424045482558aff11
+  data.tar.gz: 87fd8a2506d70a72f870c1be0e26c409d3e8e1b4ec11353faf275a2d467dab5a
 SHA512:
-  metadata.gz: 57d347930b4799a794eae40254cbc2a9b00b359ea52f55ebdf60b90cd37890aafb46f594d6b4a174f10f50ec102c4de7e0c1eb0d0f36b2777fcfbd0ba80c850a
-  data.tar.gz: 75e290bf291fbcae5043dbd8ed4885cf28ca808672940722e0cc355570aacb186c31d01b9db70ed9b260be7fb80404febfd8bff0f8b447254b60419281924711
+  metadata.gz: e962ba2224249acd36da0a9957e7dc2adabb7194253e0340461f7fde40e48a3ff5ee4bca30b642464479aacbb99121d2c9e8655e51bd630ec1395700ae87f625
+  data.tar.gz: 77f27ffb1c4277c9c9d45d967af1d7dafadcb8c4127b1691e6ecfe4c22c6e9a3cd7e258bcad334fe36baaa4f010f0dfa7a4c41f4f189f097b2e578acdaf0f50a

data/ext/libmongocrypt/libmongocrypt/CHANGELOG.md

@@ -1,11 +1,13 @@
 # ChangeLog
-## 1.7.4
-### Fixed
-- Fix build on macOS Ventura.
-## 1.7.3
-### Fixed
-- Fix KMIP Register request for versions 1.12-1.13.0 of Hashicorp Vault.
-- Fix possible memory leak when encrypting malformed BSON with Queryable Encryption.
+## 1.8.0
+This release adds stable support of the Queryable Encryption (QE) feature for the "Indexed" and "Unindexed" algorithms.
+## 1.8.0-alpha1
+This release makes backwards breaking changes to Queryable Encryption (QE) behavior added in the 1.8.0-alpha0 release:
+- Do not apply default to min/max values for int/long/date.
+- Enable the QEv2 protocol by default. Remove function to enable QEv2.
+## 1.8.0-alpha0
+### Improvements
+- Support Queryable Encryption v2 protocol.
 ## 1.7.2
 ### Improvements
 - Add toggle for Decimal128 Range Support.

data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt

@@ -78,13 +78,13 @@ if (ENABLE_MORE_WARNINGS_AS_ERRORS)
       )
 endif ()
 
-find_package (Threads REQUIRED)
-
 add_subdirectory (bindings/cs)
 
 include (GenerateExportHeader)
 
 include (CTest)
+include (Platform)
+
 
 set (MONGOCRYPT_PUBLIC_HEADERS
    src/mongocrypt-compat.h
@@ -99,11 +99,17 @@ set (MONGOCRYPT_SOURCES
    src/mc-array.c
    src/mc-efc.c
    src/mc-fle2-find-range-payload.c
+   src/mc-fle2-find-range-payload-v2.c
    src/mc-fle2-insert-update-payload.c
+   src/mc-fle2-insert-update-payload-v2.c
    src/mc-fle2-encryption-placeholder.c
    src/mc-fle2-find-equality-payload.c
+   src/mc-fle2-find-equality-payload-v2.c
    src/mc-fle2-payload-iev.c
+   src/mc-fle2-payload-iev-v2.c
    src/mc-fle2-payload-uev.c
+   src/mc-fle2-payload-uev-common.c
+   src/mc-fle2-payload-uev-v2.c
    src/mc-fle2-rfds.c
    src/mc-range-edge-generation.c
    src/mc-range-mincover.c
@@ -111,6 +117,7 @@ set (MONGOCRYPT_SOURCES
    src/mc-rangeopts.c
    src/mc-reader.c
    src/mc-tokens.c
+   src/mc-writer.c
    src/mongocrypt-binary.c
    src/mongocrypt-buffer.c
    src/mongocrypt-cache.c
@@ -270,26 +277,15 @@ target_include_directories (
    PUBLIC
       "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>"
    )
-include (TestBigEndian)
-TEST_BIG_ENDIAN (MONGOCRYPT_BIG_ENDIAN)
-if (MONGOCRYPT_BIG_ENDIAN)
-   message ("Detected byte order: big endian")
-   list (APPEND MONGOCRYPT_DEFINITIONS MONGOCRYPT_BIG_ENDIAN)
-else ()
-   message ("Detected byte order: little endian")
-   list (APPEND MONGOCRYPT_DEFINITIONS MONGOCRYPT_LITTLE_ENDIAN)
-endif ()
-target_compile_definitions (mongocrypt PRIVATE ${MONGOCRYPT_DEFINITIONS})
 target_link_libraries (
    mongocrypt
    PRIVATE
       _mongocrypt::libbson_for_shared
-      Threads::Threads
       kms_message_static
       $<BUILD_INTERFACE:mongo::mlib>
    PUBLIC
+      mongocrypt::platform
       ${maybe_dfp_library}
-      ${CMAKE_DL_LIBS}
    )
 
 if (NOT USE_SHARED_LIBBSON)
@@ -333,8 +329,6 @@ target_include_directories (
    )
 target_compile_definitions (
    mongocrypt_static
-   PRIVATE
-      ${MONGOCRYPT_DEFINITIONS}
    PUBLIC
       MONGOCRYPT_STATIC_DEFINE
       KMS_MSG_STATIC
@@ -346,9 +340,8 @@ target_link_libraries (
       kms_message_static
       $<BUILD_INTERFACE:mongo::mlib>
    PUBLIC
+      mongocrypt::platform
       ${maybe_dfp_library}
-      ${CMAKE_THREAD_LIBS_INIT}
-      ${CMAKE_DL_LIBS}
    )
 set (PKG_CONFIG_STATIC_LIBS "\${prefix}/${CMAKE_INSTALL_LIBDIR}/libmongocrypt-static.a")
 set (PKG_CONFIG_STATIC_LIBS "${PKG_CONFIG_STATIC_LIBS} ${CMAKE_THREAD_LIBS_INIT}")
@@ -394,8 +387,6 @@ endif ()
 if (NOT APPLE)
    find_library (M_LIBRARY m)
    if (M_LIBRARY)
-      target_link_libraries (mongocrypt PRIVATE ${M_LIBRARY})
-      target_link_libraries (mongocrypt_static PRIVATE ${M_LIBRARY})
       set (PKG_CONFIG_STATIC_LIBS "${PKG_CONFIG_STATIC_LIBS} -lm")
    endif ()
 endif ()
@@ -461,9 +452,14 @@ endif ()
 set (TEST_MONGOCRYPT_SOURCES
    test/test-gcp-auth.c
    test/test-mc-efc.c
+   test/test-mc-fle2-find-equality-payload-v2.c
+   test/test-mc-fle2-find-range-payload-v2.c
    test/test-mc-fle2-payload-iev.c
+   test/test-mc-fle2-payload-iev-v2.c
    test/test-mc-fle2-payload-iup.c
+   test/test-mc-fle2-payload-iup-v2.c
    test/test-mc-fle2-payload-uev.c
+   test/test-mc-fle2-payload-uev-v2.c
    test/test-mc-fle2-rfds.c
    test/test-mc-range-edge-generation.c
    test/test-mc-range-mincover.c
@@ -471,6 +467,7 @@ set (TEST_MONGOCRYPT_SOURCES
    test/test-mc-reader.c
    test/test-mc-tokens.c
    test/test-mc-range-encoding.c
+   test/test-mc-writer.c
    test/test-mongocrypt-assert-match-bson.c
    test/test-mongocrypt-buffer.c
    test/test-mongocrypt-cache.c
@@ -510,8 +507,6 @@ target_include_directories (test-mongocrypt PRIVATE ./src "${CMAKE_CURRENT_SOURC
 target_link_libraries (test-mongocrypt PRIVATE _mongocrypt::libbson_for_static mongocrypt_static mongo::mlib)
 target_include_directories (test-mongocrypt PRIVATE "${CMAKE_CURRENT_LIST_DIR}/test")
 target_compile_definitions (test-mongocrypt PRIVATE
-   ${BSON_DEFINITIONS}
-   ${MONGOCRYPT_DEFINITIONS}
    # 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
@@ -547,7 +542,6 @@ if ("cxx_relaxed_constexpr" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
          mongocrypt
          mongo::mlib
          ${maybe_dfp_library}
-         Threads::Threads
          _mongocrypt::libbson_for_static
          )
       add_test ("${test_name}" "${exe_name}")

data/ext/libmongocrypt/libmongocrypt/Earthfile

@@ -0,0 +1,374 @@
+# Earthly Intro: https://docs.earthly.dev/
+# Earthfile Reference: https://docs.earthly.dev/docs/earthfile
+
+# Quick notes:
+    #   • The shell script at ".evergreen/earthly.sh" can be used to automatically
+    #     download and use a fixed version of Earthly that is compatible with
+    #     this file version. Execute the shell script as if it were the Earthly
+    #     executable itself.
+    #   • In this file, the convention is to copy the source tree into /s/libmongocrypt
+    #   • Earthly copies the "build context" (working directory) into the local buildkit
+    #     daemon before each build execution. (Similar to the Docker build context).
+    #     If you have a large amount of data in the working directory, this could be
+    #     slow. The ".earthlyignore" file specifies patterns of files and directories
+    #     to exclude from the context upload. Modify it to suite your needs, if necessary.
+    #   • Only a subset of the source tree is COPY'd into the build environment. Files
+    #     outside of this set will not be available in the build. See the COPY_SOURCE
+    #     command for the list.
+    #   • Modification at any layer will invalidate caching on all subsequent build
+    #     layers. This is important and by-design in Earthly. Push infrequently-modified
+    #     operations to earlier in the process the pipeline to make better use of
+    #     the cache.
+    #
+    # This file has a few major sections:
+    #   - Setup COMMANDs
+    #   - Utility COMMANDs
+    #   - Environment targets
+    #   - Build/test/CI targets
+    #
+    # All environment targets begin with "env.". All build targets (should) accept an "env"
+    # parameter that specifies the name of the environment to use for the task. The name
+    # of an environment is specified following the "env." prefix. For example, the
+    # Ubuntu 22.04 environment is named "u22", so its environment target is "env.u22",
+    # and can be used i.e. "earthly +build --env=u22"
+    #
+    # The following environment are defined in this file:
+    #   • u22 - Ubuntu 22.04
+    #   • u20 - Ubuntu 20.04
+    #   • u18 - Ubuntu 18.04
+    #   • u16 - Ubuntu 16.04
+    #   • u14 - Ubuntu 14.04
+    #   • rl8 - RockyLinux 8 - Stand-in for RHEL 8
+    #   • c7 - CentOS 7 - Stand-in for RHEL 7
+    #   • c6 - CentOS 6 - Stand-in for RHEL 6
+    #   • amzn1 - AmazonLinux (2018.03)
+    #   • amzn2 - AmazonLinux 2
+    #   • deb9 - Debian 9.2
+    #   • deb10 - Debian 10.0
+    #   • deb11 - Debian 11.0
+    #   • sles15 - OpenSUSE Leap 15.0
+    #   • alpine - Alpine Linux 3.18
+    #
+    # When adding new environments, always pull from a fully-qualified image ID:
+    #   • DO NOT: "ubuntu"
+    #   • DO NOT: "ubuntu:latest"
+    #   • DO NOT: "ubuntu:22.10"
+    #   • DO: "docker.io/library/ubuntu:22.10"
+# ###
+
+VERSION --use-cache-command 0.6
+FROM docker.io/library/alpine:3.16
+WORKDIR /s
+
+init:
+    # Special initializing target that sets up the base image and adds the "__install"
+    # script. This scripts abstracts around the underlying package manager interface
+    # to "do the right thing" when you want to install packages. Package names will
+    # still need to be spelled correctly for the respective system.
+    #
+    # Invoke +init with a "--base" parameter that specifies the base image to pull
+    ARG --required base
+    FROM $base
+    COPY etc/install-package.sh /usr/local/bin/__install
+    RUN chmod +x /usr/local/bin/__install
+    ENV USER_CACHES_DIR=/Cache
+
+# Environment setup commands below. Each provides the basic environment for a
+# libmongocrypt build. Additional packages and setup may be required for
+# individual tasks.
+
+DEBIAN_SETUP:
+    # Setup for a debian-like build environment. Used for both Debian and Ubuntu
+    COMMAND
+    RUN __install build-essential g++ libssl-dev curl unzip python3 pkg-config \
+                  git ccache findutils ca-certificates
+
+REDHAT_SETUP:
+    # Setup for a redhat-like build environment. Used for CentOS and RockyLinux.
+    COMMAND
+    RUN __install epel-release && \
+        __install gcc-c++ make openssl-devel curl unzip git ccache findutils \
+                  patch
+
+CENTOS6_SETUP:
+    # Special setup for CentOS6: The packages have been moved to the vault, so
+    # we need to enable the vault repos before we perform any __installs
+    COMMAND
+    RUN rm /etc/yum.repos.d/*.repo
+    COPY etc/c6-vault.repo /etc/yum.repos.d/CentOS-Base.repo
+    DO +REDHAT_SETUP
+
+AMZ_SETUP:
+    # Setup for Amazon Linux.
+    COMMAND
+    # amzn1 has "python38", but amzn2 has "python3." Try both
+    RUN __install python3 || __install python38
+    RUN __install gcc-c++ make openssl-devel curl unzip tar gzip \
+                  openssh-clients patch git
+
+SLES_SETUP:
+    # Setup for a SLES/SUSE build environment
+    COMMAND
+    RUN __install gcc-c++ make libopenssl-devel curl unzip tar gzip python3 \
+                  patch git xz which
+
+ALPINE_SETUP:
+    # Setup for an Alpine Linux build environment
+    COMMAND
+    RUN __install make bash gcc g++ unzip curl tar gzip git musl-dev \
+                  linux-headers openssl-dev python3
+
+# Environment targets are defined below. These do not have build outputs, but
+# are rather themselves the "outputs" to be used as the environment for subsequent
+# tasks
+
+env.c6:
+    # A CentOS 6 environment.
+    FROM +init --base=docker.io/library/centos:6
+    DO +CENTOS6_SETUP
+
+env.c7:
+    # A CentOS 7 environment.
+    FROM +init --base=docker.io/library/centos:7
+    DO +REDHAT_SETUP
+
+env.rl8:
+    # CentOS 8 is cancelled. Use RockyLinux 8 for our RHEL 8 environment.
+    FROM +init --base=docker.io/library/rockylinux:8
+    DO +REDHAT_SETUP
+
+# Utility command for Ubuntu environments
+ENV_UBUNTU:
+    COMMAND
+    ARG --required version
+    FROM +init --base=docker.io/library/ubuntu:$version
+    DO +DEBIAN_SETUP
+
+env.u14:
+    # An Ubuntu 14.04 environment
+    DO +ENV_UBUNTU --version 14.04
+
+env.u16:
+    # An Ubuntu 16.04 environment
+    DO +ENV_UBUNTU --version 16.04
+
+env.u18:
+    # An Ubuntu 18.04 environment
+    DO +ENV_UBUNTU --version 18.04
+
+env.u20:
+    # An Ubuntu 20.04 environment
+    DO +ENV_UBUNTU --version 20.04
+
+env.u22:
+    # An Ubuntu 22.04 environment
+    DO +ENV_UBUNTU --version 22.04
+
+env.amzn1:
+    # An Amazon "1" environment. (AmazonLinux 2018)
+    FROM +init --base=docker.io/library/amazonlinux:2018.03
+    DO +AMZ_SETUP
+
+env.amzn2:
+    # An AmazonLinux 2 environment
+    FROM +init --base=docker.io/library/amazonlinux:2
+    DO +AMZ_SETUP
+
+# Utility command for Debian setup
+ENV_DEBIAN:
+    COMMAND
+    ARG --required version
+    FROM +init --base=docker.io/library/debian:$version
+    DO +DEBIAN_SETUP
+
+env.deb9:
+    # A Debian 9.2 environment
+    DO +ENV_DEBIAN --version 9.2
+
+env.deb10:
+    # A Debian 10.0 environment
+    DO +ENV_DEBIAN --version 10.0
+
+env.deb-unstable:
+    DO +ENV_DEBIAN --version=unstable
+
+env.deb11:
+    # A Debian 11.0 environment
+    DO +ENV_DEBIAN --version 11.0
+
+env.sles15:
+    # An OpenSUSE Leap 15.0 environment.
+    FROM +init --base=docker.io/opensuse/leap:15.0
+    DO +SLES_SETUP
+
+env.alpine:
+    FROM +init --base=docker.io/library/alpine:3.17
+    DO +ALPINE_SETUP
+
+# Utility: Warm-up obtaining CMake and Ninja for the build. This is usually
+# very quick, but on some platforms we need to compile them from source.
+CACHE_WARMUP:
+    COMMAND
+    # Copy only the scripts that are strictly necessary for the operation, to
+    # avoid cache invalidation later on.
+    COPY .evergreen/setup-env.sh \
+         .evergreen/init.sh \
+         .evergreen/ensure-cmake.sh \
+         .evergreen/ensure-ninja.sh \
+         /T/
+    RUN bash /T/ensure-cmake.sh
+    RUN env NINJA_EXE=/usr/local/bin/ninja \
+        bash /T/ensure-ninja.sh
+
+COPY_SOURCE:
+    COMMAND
+    COPY --dir \
+        .git/ \
+        cmake/ \
+        kms-message/ \
+        test/ \
+        debian/ \
+        src/ \
+        doc/ \
+        etc/ \
+        LICENSE \
+        .evergreen/ \
+        third-party/ \
+        CMakeLists.txt \
+        "/s/libmongocrypt"
+    COPY --dir bindings/cs/ "/s/libmongocrypt/bindings/"
+
+BUILD_EXAMPLE_STATE_MACHINE:
+    COMMAND
+    COPY test/example-state-machine.c /s/
+    RUN pkg-config --exists libmongocrypt --print-errors && \
+        gcc /s/example-state-machine.c \
+            -o /s/example-state-machine \
+            $(pkg-config --cflags --libs libmongocrypt)
+    COPY --dir test/example /s/test/example
+    RUN cd /s && /s/example-state-machine
+
+rpm-build:
+    FROM +init --base fedora:rawhide
+    GIT CLONE https://src.fedoraproject.org/rpms/libmongocrypt.git /R
+    # Install the packages listed by "BuildRequires" and rpm-build:
+    RUN __install $(awk '/^BuildRequires:/ { print $2 }' /R/libmongocrypt.spec) \
+                  rpm-build
+    DO +COPY_SOURCE
+    RUN cp -r /s/libmongocrypt/. /R
+    RUN awk -f /R/etc/rpm/tweak.awk < /R/libmongocrypt.spec > /R/libmongocrypt.2.spec
+    RUN rpmbuild -ba /R/libmongocrypt.2.spec \
+        -D "_topdir /X" \
+        -D "_sourcedir /R"
+    SAVE ARTIFACT /X/RPMS /
+    SAVE ARTIFACT /X/SRPMS /
+
+rpm-install-runtime:
+    # Install the runtime RPM
+    FROM +init --base fedora:rawhide
+    COPY +rpm-build/RPMS /tmp/libmongocrypt-rpm/
+    RUN dnf makecache
+    RUN __install $(find /tmp/libmongocrypt-rpm/ -name 'libmongocrypt-1.*.rpm')
+
+rpm-install-dev:
+    # Install the development RPM
+    FROM +rpm-install-runtime
+    COPY +rpm-build/RPMS /tmp/libmongocrypt-rpm/
+    RUN dnf makecache
+    RUN __install $(find /tmp/libmongocrypt-rpm/ -name 'libmongocrypt-devel-*.rpm')
+
+rpm-devel-test:
+    # Attempt to build a small app using pkg-config and the dev RPM
+    FROM +rpm-install-dev
+    RUN __install gcc
+    DO +BUILD_EXAMPLE_STATE_MACHINE
+    SAVE ARTIFACT /s/example-state-machine /
+
+rpm-runtime-test:
+    # Attempt to run a libmongocrypt-using app with the runtime RPM installed
+    FROM +rpm-install-runtime
+    COPY +rpm-devel-test/example-state-machine /s/
+    COPY --dir test/example /s/test/example
+    RUN cd /s/ && /s/example-state-machine
+
+# A target to build the debian package. Options:
+#   • --env=[...] (default: deb-unstable)
+#     · Set the environment for the build. Affects which packages are available
+#       for build dependencies.
+# NOTE: Uncommited local changes will be ignored and not affect the result!
+deb-build:
+    ARG env=deb-unstable
+    FROM +env.$env
+    RUN __install git-buildpackage fakeroot debhelper cmake libbson-dev \
+                  libintelrdfpmath-dev
+    DO +COPY_SOURCE
+    WORKDIR /s/libmongocrypt
+    RUN git clean -fdx && git reset --hard
+    RUN python3 etc/calc_release_version.py > VERSION_CURRENT
+    RUN git add -f VERSION_CURRENT && \
+        git -c user.name=anon -c user.email=anon@localhost \
+            commit VERSION_CURRENT -m 'Set version' && \
+        env LANG=C bash debian/build_snapshot.sh && \
+        debc ../*.changes && \
+        dpkg -i ../*.deb
+    SAVE ARTIFACT /s/*.deb /debs/
+
+deb-install-runtime:
+    # Install the runtime deb package
+    FROM +init --base=docker.io/library/debian:unstable
+    COPY +deb-build/debs/libmongocrypt0*.deb /tmp/lmc.deb
+    RUN __install /tmp/lmc.deb
+
+deb-install-dev:
+    # Install the development deb package
+    FROM +deb-install-runtime
+    COPY +deb-build/debs/libmongocrypt-dev*.deb /tmp/lmc-dev.deb
+    RUN __install /tmp/lmc-dev.deb
+
+deb-dev-test:
+    # Attempt to build a small app using pkg-config and the dev deb package
+    FROM +deb-install-dev
+    RUN __install pkg-config gcc
+    DO +BUILD_EXAMPLE_STATE_MACHINE
+    SAVE ARTIFACT /s/example-state-machine /
+
+deb-runtime-test:
+    # Attempt to run a libmongocrypt-using app with the runtime DEB installed
+    FROM +deb-install-runtime
+    COPY +deb-dev-test/example-state-machine /s/
+    COPY --dir test/example /s/test/example
+    RUN cd /s/ && /s/example-state-machine
+
+packaging-full-test:
+    BUILD +deb-runtime-test
+    BUILD +rpm-runtime-test
+
+check-format:
+    FROM python:3.11.2-slim-buster
+    RUN pip install pipx
+    COPY etc/format* /X/etc/
+    COPY .evergreen/init.sh /X/.evergreen/
+    RUN /X/etc/format.sh  # Does nothing, but warms the cache
+    COPY --dir .clang-format src test /X/
+    RUN /X/etc/format-all.sh --dry-run -Werror --verbose
+
+# The main "build" target. Options:
+#   • --env=[...] (default "u22")
+#     · Set the environment for the build. Any name of and "env.<name>" targets
+#       can be used.
+#   • --persist_build={true,false} (default "true")
+#     · Persist the build directory between executions. Enables incremental
+#       compilation and reusing of configuration between builds. The build
+#       directory is NOT shared between different "--env" environments, only
+#       within a single environment.
+build:
+    ARG env=u22
+    FROM +env.$env
+    DO +CACHE_WARMUP
+    DO +COPY_SOURCE
+    WORKDIR /s
+    ARG persist_build=true
+    IF $persist_build
+        CACHE /s/libmongocrypt/cmake-build
+    END
+    RUN env USE_NINJA=1 bash libmongocrypt/.evergreen/build_all.sh

data/ext/libmongocrypt/libmongocrypt/README.md

@@ -135,7 +135,7 @@ Do the following when releasing:
 Distribution packages (i.e., .deb/.rpm) are built and published for several Linux distributions.  The installation of these packages for supported platforms is documented here.
 
 ### Unstable Development Distribution Packages ###
-To install the latest unstable development package, change `1.7` to `development` in the package URLs listed in the subsequent instructions. For example, `https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.7` in the instructions would become `https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/development`. Do not use the unstable version of libmongocrypt in a production environment.
+To install the latest unstable development package, change `1.8` to `development` in the package URLs listed in the subsequent instructions. For example, `https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.8` in the instructions would become `https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/development`. Do not use the unstable version of libmongocrypt in a production environment.
 
 ### .deb Packages (Debian and Ubuntu) ###
 
@@ -148,13 +148,13 @@ sudo sh -c 'curl -s --location https://www.mongodb.org/static/pgp/libmongocrypt.
 Second, create a list entry for the repository.  For Ubuntu systems (be sure to change `<release>` to `xenial`, `bionic`, `focal`, or `jammy`, as appropriate to your system):
 
 ```
-echo "deb https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.7 universe" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
+echo "deb https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.8 universe" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
 ```
 
 For Debian systems (be sure to change `<release>` to `stretch`, `buster`, or `bullseye`, as appropriate to your system):
 
 ```
-echo "deb https://libmongocrypt.s3.amazonaws.com/apt/debian <release>/libmongocrypt/1.7 main" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
+echo "deb https://libmongocrypt.s3.amazonaws.com/apt/debian <release>/libmongocrypt/1.8 main" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
 ```
 
 Third, update the package cache:
@@ -179,7 +179,7 @@ Create the file `/etc/yum.repos.d/libmongocrypt.repo` with contents:
 ```
 [libmongocrypt]
 name=libmongocrypt repository
-baseurl=https://libmongocrypt.s3.amazonaws.com/yum/redhat/$releasever/libmongocrypt/1.7/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/redhat/$releasever/libmongocrypt/1.8/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://www.mongodb.org/static/pgp/libmongocrypt.asc
@@ -198,7 +198,7 @@ Create the file `/etc/yum.repos.d/libmongocrypt.repo` with contents:
 ```
 [libmongocrypt]
 name=libmongocrypt repository
-baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2/libmongocrypt/1.7/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2/libmongocrypt/1.8/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://www.mongodb.org/static/pgp/libmongocrypt.asc
@@ -217,7 +217,7 @@ Create the file `/etc/yum.repos.d/libmongocrypt.repo` with contents:
 ```
 [libmongocrypt]
 name=libmongocrypt repository
-baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2013.03/libmongocrypt/1.7/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2013.03/libmongocrypt/1.8/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://www.mongodb.org/static/pgp/libmongocrypt.asc
@@ -240,7 +240,7 @@ sudo rpm --import https://www.mongodb.org/static/pgp/libmongocrypt.asc
 Second, add the repository (be sure to change `<release>` to `12` or `15`, as appropriate to your system):
 
 ```
-sudo zypper addrepo --gpgcheck "https://libmongocrypt.s3.amazonaws.com/zypper/suse/<release>/libmongocrypt/1.7/x86_64" libmongocrypt
+sudo zypper addrepo --gpgcheck "https://libmongocrypt.s3.amazonaws.com/zypper/suse/<release>/libmongocrypt/1.8/x86_64" libmongocrypt
 ```
 
 Finally, install the libmongocrypt packages:

data/ext/libmongocrypt/libmongocrypt/VERSION_CURRENT

@@ -1 +1 @@
-1.7.4
+1.8.0

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClient.cs

@@ -105,11 +105,7 @@ namespace MongoDB.Libmongocrypt
         /// <summary>
         /// Starts an explicit encryption context.
         /// </summary>
-        /// <param name="key">The key id.</param>
-        /// <param name="encryptionAlgorithm">The encryption algorithm.</param>
-        /// <param name="message">The BSON message.</param>
-        /// <returns>A encryption context. </returns>
-        public CryptContext StartExplicitEncryptionContext(byte[] keyId, byte[] keyAltName, string queryType, long? contentionFactor, string encryptionAlgorithm, byte[] message)
+        public CryptContext StartExplicitEncryptionContext(byte[] keyId, byte[] keyAltName, string queryType, long? contentionFactor, string encryptionAlgorithm, byte[] message, byte[] rangeOptions, bool isExpressionMode = false)
         {
             var handle = Library.mongocrypt_ctx_new(_handle);
 
@@ -122,6 +118,11 @@ namespace MongoDB.Libmongocrypt
                 PinnedBinary.RunAsPinnedBinary(handle, keyAltName, _status, (h, pb) => Library.mongocrypt_ctx_setopt_key_alt_name(h, pb));
             }
 
+            if (rangeOptions != null)
+            {
+                PinnedBinary.RunAsPinnedBinary(handle, rangeOptions, _status, (h, pb) => Library.mongocrypt_ctx_setopt_algorithm_range(h, pb));
+            }
+
             handle.Check(_status, Library.mongocrypt_ctx_setopt_algorithm(handle, encryptionAlgorithm, -1));
 
             if (queryType != null)
@@ -135,7 +136,25 @@ namespace MongoDB.Libmongocrypt
                 handle.Check(_status, Library.mongocrypt_ctx_setopt_contention_factor(handle, contentionFactorInt));
             }
 
-            PinnedBinary.RunAsPinnedBinary(handle, message, _status, (h, pb) => Library.mongocrypt_ctx_explicit_encrypt_init(h, pb));
+            PinnedBinary.RunAsPinnedBinary(
+                handle, 
+                message, 
+                _status, 
+                (h, pb) =>
+                {
+                    if (isExpressionMode)
+                    {
+                        // mongocrypt_ctx_explicit_encrypt_expression_init shares the same code as mongocrypt_ctx_explicit_encrypt_init.
+                        // The only difference is the validation of the queryType argument:
+                        // * mongocrypt_ctx_explicit_encrypt_expression_init requires queryType of "rangePreview".
+                        // * mongocrypt_ctx_explicit_encrypt_init rejects queryType of "rangePreview".
+                        return Library.mongocrypt_ctx_explicit_encrypt_expression_init(h, pb);
+                    }
+                    else
+                    {
+                        return Library.mongocrypt_ctx_explicit_encrypt_init(h, pb);
+                    }
+                });
 
             return new CryptContext(handle);
         }