libmongocrypt-helper 1.11.0.0.1001 → 1.13.2.0.1001

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d52da7e268e39f57d0f06e5056eac9ca78cbc90d7f4088a4c905d72e3f8997e2
-  data.tar.gz: 5d68d759ad42dc16bd8c3818850561ce294bd08615c2938d5ade40a8b755d5d6
+  metadata.gz: baf822be923fbdd64028517f349c49776bcd49fc71a20b2625bb0e7f947db6ee
+  data.tar.gz: d54d214ba2f0bbab4ad98adb1eb36ec4f1bd301eda8835e02a8f211c787a925a
 SHA512:
-  metadata.gz: 01a3dbefc3f7621c0acf918e2651f19057334f4acbdc20246e7e8dac7c2119269208202716fd19738a087d8688f38befad44ef85b1594da237f3bfd9be4c9744
-  data.tar.gz: 53c3fc9028f38a3a42844989e6783d36db4f714bd5eb0b837120ae9fb25d51dfad3b1e8f2ab7e69d027ed57648daeaf7c6781370e0021c300bec2cdcd37ba48e
+  metadata.gz: d834c0a45d8f3bdd61e6031f9bb9ef2f66dee31c1155c8ac15b33b22cba6267b6cfc714235c0a93e010a701535ee3e8615276af62239e30d764d4adac10b69f6
+  data.tar.gz: 63e6f9acb70f94690bd11edd415fbfffabb5051c8c5c59b6ddaeeb809e0f423f24297f0541ca3f1e8e3e496b66beaae2fea7b05add2d4dd16af44aa1615b398a

data/ext/libmongocrypt/libmongocrypt/CHANGELOG.md

@@ -1,4 +1,30 @@
 # ChangeLog
+## 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.
+## 1.13.1
+### Fixed
+- Fix possible double free on parse error of malformed payload.
+- Fix build failure when configuring with `ENABLE_TRACE=ON`.
+- Fix possible redefinition of `_GNU_SOURCE`.
+
+## 1.13.0
+### New features
+- Support automatic encryption for `$lookup` stages in `aggregate` pipelines on MongoDB server 8.1+.
+### Fixed
+- Restore default behavior to disable extra alignment when importing libbson. This was the default behavior in 1.11. This can be overridden by setting the CMake option `ENABLE_EXTRA_ALIGNMENT=ON`.
+### Removed
+- Support for macOS versions older than 11. libmongocrypt is supported and tested with macOS 11+.
+
+## 1.12.0
+### New features
+- Add option to configure Data Encryption Key cache lifetime (`mongocrypt_setopt_key_expiration`)
+- Add opt-in retry behavior for KMS operations (`mongocrypt_setopt_retry_kms`)
+### Removed
+- libmongocrypt is no longer published in the MongoDB package repository for RHEL 6. libmongocrypt may instead be built from source on RHEL 6, but support for RHEL 6 will be dropped in a future release.
+### Notes
+- This release unintentionally changes the default behavior of extra alignment with importing libbson. See 1.13.0 release notes.
+
 ## 1.11.0
 ### New features
 - Support `range` algorithm as stable.
@@ -75,7 +101,7 @@ This release makes backwards breaking changes to Queryable Encryption (QE) behav
 - Set context error state during KMS provider validation.
 ## 1.6.1
 ## Fixed
-- Fix libbson dependency in pkg-config for PPA.
+- Fix libbson dependency in pkg-config for MongoDB repository package.
 ## 1.6.0
 ## New Features
 - Support accessToken to authenticate with Azure.

data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt

@@ -83,8 +83,6 @@ if (ENABLE_MORE_WARNINGS_AS_ERRORS)
       )
 endif ()
 
-add_subdirectory (bindings/cs)
-
 include (GenerateExportHeader)
 
 include (CTest)
@@ -116,11 +114,15 @@ set (MONGOCRYPT_SOURCES
    src/mc-fle2-payload-uev-common.c
    src/mc-fle2-payload-uev-v2.c
    src/mc-fle2-rfds.c
+   src/mc-fle2-tag-and-encrypted-metadata-block.c
    src/mc-range-edge-generation.c
    src/mc-range-mincover.c
    src/mc-range-encoding.c
    src/mc-rangeopts.c
    src/mc-reader.c
+   src/mc-schema-broker.c
+   src/mc-str-encode-string-sets.c
+   src/mc-text-search-str-encode.c
    src/mc-tokens.c
    src/mc-writer.c
    src/mongocrypt-binary.c
@@ -152,6 +154,9 @@ set (MONGOCRYPT_SOURCES
    src/os_posix/os_mutex.c
    src/os_win/os_dll.c
    src/os_posix/os_dll.c
+   src/unicode/case-fold-map.c
+   src/unicode/diacritic-fold-map.c
+   src/unicode/fold.c
    )
 
 # If MONGOCRYPT_CRYPTO is not set, choose a system default.
@@ -459,7 +464,9 @@ endif ()
 
 set (TEST_MONGOCRYPT_SOURCES
    test/test-gcp-auth.c
+   test/test-mc-cmp.c
    test/test-mc-efc.c
+   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-payload-iev.c
@@ -469,10 +476,13 @@ set (TEST_MONGOCRYPT_SOURCES
    test/test-mc-fle2-payload-uev.c
    test/test-mc-fle2-payload-uev-v2.c
    test/test-mc-fle2-rfds.c
+   test/test-mc-fle2-tag-and-encrypted-metadata-block.c
    test/test-mc-range-edge-generation.c
    test/test-mc-range-mincover.c
    test/test-mc-rangeopts.c
    test/test-mc-reader.c
+   test/test-mc-text-search-str-encode.c
+   test/test-mc-schema-broker.c
    test/test-mc-tokens.c
    test/test-mc-range-encoding.c
    test/test-mc-writer.c
@@ -509,6 +519,7 @@ set (TEST_MONGOCRYPT_SOURCES
    test/test-mongocrypt-util.c
    test/test-mongocrypt.c
    test/test-named-kms-providers.c
+   test/test-unicode-fold.c
    )
 
 # Define test-mongocrypt

data/ext/libmongocrypt/libmongocrypt/CODEOWNERS

@@ -1,10 +1,4 @@
 # Code Owners will automatically be added as reviewers on PRs
 
 # Python Bindings
-bindings/python @mongodb/dbx-python
-
-# Java Bindings
-bindings/java @jyemin @rozza
-
-# CSharp Bindings
-bindings/cs @DmitryLukyanov
+bindings/python @mongodb/dbx-python

data/ext/libmongocrypt/libmongocrypt/CONTRIBUTING.md

@@ -0,0 +1,14 @@
+# Formatting
+
+To format, install `pipx` and run:
+```bash
+./etc/format-all.sh
+```
+
+To use a specified python install, set `MONGOCRYPT_PYTHON`:
+
+```bash
+# Set MONGOCRYPT_PYTHON to a python install with pipx installed.
+export MONGOCRYPT_PYTHON=python
+./etc/format-all.sh
+```

data/ext/libmongocrypt/libmongocrypt/Earthfile

@@ -54,11 +54,11 @@
     #   • DO NOT: "ubuntu"
     #   • DO NOT: "ubuntu:latest"
     #   • DO NOT: "ubuntu:22.10"
-    #   • DO: "docker.io/library/ubuntu:22.10"
+    #   • DO: "artifactory.corp.mongodb.com/dockerhub/library/ubuntu:22.10"
 # ###
 
 VERSION --use-cache-command 0.6
-FROM docker.io/library/alpine:3.16
+FROM artifactory.corp.mongodb.com/dockerhub/library/alpine:3.16
 WORKDIR /s
 
 init:
@@ -125,24 +125,24 @@ ALPINE_SETUP:
 
 env.c6:
     # A CentOS 6 environment.
-    FROM +init --base=docker.io/library/centos:6
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/library/centos:6
     DO +CENTOS6_SETUP
 
 env.c7:
     # A CentOS 7 environment.
-    FROM +init --base=docker.io/library/centos:7
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/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
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/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
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/library/ubuntu:$version
     DO +DEBIAN_SETUP
 
 env.u14:
@@ -167,19 +167,19 @@ env.u22:
 
 env.amzn1:
     # An Amazon "1" environment. (AmazonLinux 2018)
-    FROM +init --base=docker.io/library/amazonlinux:2018.03
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/library/amazonlinux:2018.03
     DO +AMZ_SETUP
 
 env.amzn2:
     # An AmazonLinux 2 environment
-    FROM +init --base=docker.io/library/amazonlinux:2
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/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
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/library/debian:$version
     IF [ $version = "9.2" ]
         # Update source list for archived Debian stretch packages.
         # Refer: https://unix.stackexchange.com/a/743865/260858
@@ -208,11 +208,11 @@ env.deb12:
 
 env.sles15:
     # An OpenSUSE Leap 15.0 environment.
-    FROM +init --base=docker.io/opensuse/leap:15.0
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/opensuse/leap:15.0
     DO +SLES_SETUP
 
 env.alpine:
-    FROM +init --base=docker.io/library/alpine:3.18
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/library/alpine:3.18
     DO +ALPINE_SETUP
 
 # Utility: Warm-up obtaining CMake and Ninja for the build. This is usually
@@ -259,7 +259,7 @@ BUILD_EXAMPLE_STATE_MACHINE:
     RUN cd /s && /s/example-state-machine
 
 rpm-build:
-    FROM +init --base fedora:38
+    FROM +init --base artifactory.corp.mongodb.com/dockerhub/fedora:38
     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) \
@@ -275,7 +275,7 @@ rpm-build:
 
 rpm-install-runtime:
     # Install the runtime RPM
-    FROM +init --base fedora:38
+    FROM +init --base artifactory.corp.mongodb.com/dockerhub/fedora:38
     COPY +rpm-build/RPMS /tmp/libmongocrypt-rpm/
     RUN dnf makecache
     RUN __install $(find /tmp/libmongocrypt-rpm/ -name 'libmongocrypt-1.*.rpm')
@@ -325,7 +325,7 @@ deb-build:
 
 deb-install-runtime:
     # Install the runtime deb package
-    FROM +init --base=docker.io/library/debian:unstable
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/library/debian:unstable
     COPY +deb-build/debs/libmongocrypt0*.deb /tmp/lmc.deb
     RUN __install /tmp/lmc.deb
 
@@ -354,7 +354,8 @@ packaging-full-test:
     BUILD +rpm-runtime-test
 
 check-format:
-    FROM python:3.11.2-slim-buster
+    FROM +init --base=artifactory.corp.mongodb.com/dockerhub/python:3.11.2-slim-buster
+    RUN __install build-essential # To install `make` to install clang-format.
     RUN pip install pipx
     COPY etc/format* /X/etc/
     COPY .evergreen/init.sh /X/.evergreen/
@@ -461,16 +462,15 @@ sign:
 #
 # See https://docs.devprod.prod.corp.mongodb.com/mms/python/src/sbom/silkbomb/ for documentation of silkbomb.
 silkbomb:
-    FROM artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:1.0
-    # Alias the silkbom executable to a simpler name:
+    FROM artifactory.corp.mongodb.com/release-tools-container-registry-public-local/silkbomb:2.0
+    # Alias the silkbomb executable to a simpler name:
     RUN ln -s /python/src/sbom/silkbomb/bin /usr/local/bin/silkbomb
 
 # sbom-generate:
 #   Generate/update the etc/cyclonedx.sbom.json file from the etc/purls.txt file.
 #
 # This target will update the existing etc/cyclonedx.sbom.json file in-place based
-# on the content of etc/purls.txt.
-#
+# on the content of etc/purls.txt and etc/cyclonedx.sbom.json.
 sbom-generate:
     FROM +silkbomb
     # Copy in the relevant files:
@@ -478,45 +478,44 @@ sbom-generate:
     COPY etc/purls.txt etc/cyclonedx.sbom.json /s/
     # Update the SBOM file:
     RUN silkbomb update \
+        --refresh \
+        --no-update-sbom-version \
         --purls purls.txt \
         --sbom-in cyclonedx.sbom.json \
         --sbom-out cyclonedx.sbom.json
     # Save the result back to the host:
     SAVE ARTIFACT /s/cyclonedx.sbom.json AS LOCAL etc/cyclonedx.sbom.json
 
-# sbom-download:
-#   Download the Augmented SBOM file from Silk.
-#
-# See https://wiki.corp.mongodb.com/display/DRIVERS/Using+AWS+Secrets+Manager+to+Store+Testing+Secrets for instructions to get secrets from AWS Secrets Manager. Secrets are available under `drivers/libmongocrypt`.
+# sbom-generate-new-serial-number:
+#   Equivalent to +sbom-generate but includes the --generate-new-serial-number
+#   flag to generate a new unique serial number and reset the SBOM version to 1.
 #
-sbom-download:
-    ARG --required out
-    ARG --required branch
+# This target will update the existing etc/cyclonedx.sbom.json file in-place based
+# on the content of etc/purls.txt and etc/cyclonedx.sbom.json.
+sbom-generate-new-serial-number:
     FROM +silkbomb
+    # Copy in the relevant files:
     WORKDIR /s
-    # Download the Augmented SBOM file:
-    RUN --no-cache --secret silk_client_id --secret silk_client_secret \
-        SILK_CLIENT_ID=${silk_client_id} \
-        SILK_CLIENT_SECRET=${silk_client_secret} \
-        silkbomb download \
-        --sbom-out cyclonedx.augmented.sbom.json \
-        --silk-asset-group libmongocrypt-${branch}
+    COPY etc/purls.txt etc/cyclonedx.sbom.json /s/
+    # Update the SBOM file:
+    RUN silkbomb update \
+        --refresh \
+        --generate-new-serial-number \
+        --purls purls.txt \
+        --sbom-in cyclonedx.sbom.json \
+        --sbom-out cyclonedx.sbom.json
     # Save the result back to the host:
-    SAVE ARTIFACT /s/cyclonedx.augmented.sbom.json AS LOCAL ${out}
-    RUN echo "Augmented SBOM saved to ${out}"
+    SAVE ARTIFACT /s/cyclonedx.sbom.json AS LOCAL etc/cyclonedx.sbom.json
 
-# silk-create-asset-group:
-#   Create an asset group for Silk.
-#
-# See https://wiki.corp.mongodb.com/display/DRIVERS/Using+AWS+Secrets+Manager+to+Store+Testing+Secrets for instructions to get secrets from AWS Secrets Manager. Secrets are available under `drivers/libmongocrypt`.
-#
-silk-create-asset-group:
-    ARG --required branch
-    FROM +env.alpine
-    RUN __install curl jq
-    COPY etc/silk-create-asset-group.sh /s/silk-create-asset-group.sh
-    RUN --no-cache --secret silk_client_id --secret silk_client_secret \
-        silk_client_id=${silk_client_id} \
-        silk_client_secret=${silk_client_secret} \
-        branch=${branch} \
-            /s/silk-create-asset-group.sh
+# sbom-validate:
+#   Validate the SBOM Lite for the given branch.
+sbom-validate:
+    FROM +silkbomb
+    # Copy in the relevant files:
+    WORKDIR /s
+    COPY etc/purls.txt etc/cyclonedx.sbom.json /s/
+    # Run the SilkBomb tool to download the artifact that matches the requested branch
+    RUN silkbomb validate \
+        --purls purls.txt \
+        --sbom-in cyclonedx.sbom.json \
+        --exclude jira

data/ext/libmongocrypt/libmongocrypt/README.md

@@ -95,15 +95,6 @@ If there are errors with cmake configuration, send the set of steps you performe
 
 If there are compilation or linker errors, run `make` again, setting `VERBOSE=1` in the environment or on the command line (which shows exact compile and link commands), and send the output to the maintainers of this project.
 
-### Design Principles ###
-The design of libmongocrypt adheres to these principles.
-
-#### Easy to integrate ####
-The main reason behind creating a C library is to make it easier for drivers to support FLE. Some consequences of this principle: the API is minimal, structs are opaque, and global initialization is lazy.
-
-#### Lightweight ####
-We decided against the "have libmongocrypt do everything" approach because it complicated integration, especially with async drivers. Because of this we decided no I/O occurs in libmongocrypt.
-
 ### Releasing ###
 
 See [releasing](./doc/releasing.md).
@@ -112,10 +103,38 @@ See [releasing](./doc/releasing.md).
 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.11` to `development` in the package URLs listed in the subsequent instructions. For example, `https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.11` 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.13` to `development` in the package URLs listed in the subsequent instructions. For example, `https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.13` 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) ###
 
+The repository containing the Debian and Ubuntu .deb packages can be configured automatically, using extrepo, or manually. Once the repository is configured then the packages can be installed.
+
+#### Repository configuration with extrepo ####
+
+Extrepo is available on Debian 11 and newer, as well as Ubuntu 20.04 and newer.
+
+First, install the extrepo package:
+
+```
+sudo apt install extrepo
+```
+
+If you would like to see the information about the repository, it can be viewed with the search command:
+
+```
+extrepo search libmongocrypt
+```
+
+In order to enable the repository, execute this command:
+
+```
+sudo extrepo enable libmongocrypt
+```
+
+Once the repository is configured, continue with package installation.
+
+#### Manual repository configuration ####
+
 First, import the public key used to sign the package repositories:
 
 ```
@@ -125,24 +144,21 @@ sudo sh -c 'curl -s --location https://pgp.mongodb.com/libmongocrypt.asc | gpg -
 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.11 universe" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
+echo "deb https://libmongocrypt.s3.amazonaws.com/apt/ubuntu <release>/libmongocrypt/1.13 universe" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
 ```
 
 For Debian systems (be sure to change `<release>` to `stretch`, `buster`, `bullseye`, or `bookworm` as appropriate to your system):
 
 ```
-echo "deb https://libmongocrypt.s3.amazonaws.com/apt/debian <release>/libmongocrypt/1.11 main" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
+echo "deb https://libmongocrypt.s3.amazonaws.com/apt/debian <release>/libmongocrypt/1.13 main" | sudo tee /etc/apt/sources.list.d/libmongocrypt.list
 ```
 
-Third, update the package cache:
+#### Package installation ####
 
-```
-sudo apt-get update
-```
-
-Finally, install the libmongocrypt packages:
+Finally, update the package cache and install the libmongocrypt packages:
 
 ```
+sudo apt-get update
 sudo apt-get install -y libmongocrypt-dev
 ```
 
@@ -156,7 +172,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.11/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/redhat/$releasever/libmongocrypt/1.13/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://pgp.mongodb.com/libmongocrypt.asc
@@ -175,7 +191,7 @@ Create the file `/etc/yum.repos.d/libmongocrypt.repo` with contents:
 ```
 [libmongocrypt]
 name=libmongocrypt repository
-baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2023/libmongocrypt/1.11/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2023/libmongocrypt/1.13/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://pgp.mongodb.com/libmongocrypt.asc
@@ -194,7 +210,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.11/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2/libmongocrypt/1.13/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://pgp.mongodb.com/libmongocrypt.asc
@@ -213,7 +229,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.11/x86_64
+baseurl=https://libmongocrypt.s3.amazonaws.com/yum/amazon/2013.03/libmongocrypt/1.13/x86_64
 gpgcheck=1
 enabled=1
 gpgkey=https://pgp.mongodb.com/libmongocrypt.asc
@@ -236,7 +252,7 @@ sudo rpm --import https://pgp.mongodb.com/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.11/x86_64" libmongocrypt
+sudo zypper addrepo --gpgcheck "https://libmongocrypt.s3.amazonaws.com/zypper/suse/<release>/libmongocrypt/1.13/x86_64" libmongocrypt
 ```
 
 Finally, install the libmongocrypt packages:

data/ext/libmongocrypt/libmongocrypt/bindings/cs/README.md

@@ -1,69 +1,6 @@
-# Requirements
+### The C# bindings have been moved!
 
-__All__
-
-CMake 3.12 or later
-
-__Windows__
-
-Visual Studio 2017 15.9+
-
-__Linux, macOS__
-
-dotnet 2.1+
-
-
-# Quick Instructions
-
-*Requires:* Cygwin
-```
-1. bash ./libmongocrypt/.evergreen/compile.sh
-```
-*Note*: You must call this from the parent directory of the libmongocrypt repo. It will not work within the repo directory
-
-
-## Developer Instructions
-
-### Windows
-To build libmongocrypt on Windows. This example assumes kms-message and the c driver are installed to "d:/usr"
-
-```
-1. mkdir build
-2. "C:\Program Files\CMake\bin\cmake.exe" -Thost=x64 -G "Visual Studio 15 2017 Win64" -DCMAKE_INSTALL_PREFIX=d:/usr -DCMAKE_PREFIX_PATH=d:/usr -DCMAKE_BUILD_TYPE=Debug "-DCMAKE_C_FLAGS=-Id:/usr/include" ..
-3. msbuild libmongocrypt.sln
-4. cd bindings/cs
-5. msbuild cs.sln
-```
-
-### Troubleshooting
-
-If you see `Windows Error: 126` during tests, like the example below, it means that `libbson-1.0.dll` is not in your path.
-
-```
- System.TypeInitializationException : The type initializer for 'MongoDB.Libmongocrypt.Library' threw an exception.
----- System.IO.FileNotFoundException : D:\repo\libmongocrypt\build\bindings\cs\MongoDB.Libmongocrypt.Test\bin\x64\Debug\netcoreapp2.1\mongocrypt.dll, Windows Error: 126
-```
-
-
-### Linux and macOS
-
-*Note* Only building from the cmake build directory is supported
-
-```
-1. Build libmongocrypt with CMake
-2. cd <build>/bindings/cs
-3. dotnet build cs.build
-```
-*Note*: You can use the ```LIBMONGOCRYPT_PATH``` environment variable to load a locally installed
-libmongocrypt build. You should specify the absolute path to the libmongocrypt library itself, not just the containing folder. For example on Linux:
-```$ export LIBMONGOCRYPT_PATH='/path/to/libmongocrypt.so'```.
-
-# Testing
-Do not modify xunit.runner.json
-- Be wary of https://github.com/xunit/xunit/issues/1654
-
-### Debugging on Linux
-To attach to a unit test with lldb, print the PID in the process and then attach.
-
-Tests always run in child processes and lldb, as of 7.0, cannot follow child processes.
+#### https://github.com/mongodb/mongo-csharp-driver/tree/main/src/MongoDB.Driver.Encryption
 
+They have been renamed from ```MongoDB.Libmongocrypt``` to ```MongoDB.Driver.Encryption``` 
+and can be found on nuget here: https://www.nuget.org/packages/MongoDB.Driver.Encryption/

data/ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst

@@ -1,8 +1,21 @@
 Changelog
 =========
 
+Changes in Version 1.12.0
+-------------------------
+
+- Bundle libmongocrypt 1.12.0 in release wheels.
+- Add support for kms retries.
+
+Changes in Version 1.11.0
+-------------------------
+
+- Bundle libmongocrypt 1.11.0 in release wheels.
+- Add support for Python 3.13.
+- Fix bug in Python async support for ``AsyncMongoCryptCallback.fetch_keys``.
+
 Changes in Version 1.10.1
-------------------------
+-------------------------
 
 - Bundle libmongocrypt 1.10.1 in release wheels.
 

data/ext/libmongocrypt/libmongocrypt/bindings/python/README.rst

@@ -34,7 +34,7 @@ Please open a case in our issue management tool, JIRA:
 - Navigate to `the PYTHON project <https://jira.mongodb.org/browse/PYTHON>`_.
 - Click **Create Issue** - Please provide as much information as possible about the issue type and how to reproduce it.
 
-Bug reports in JIRA for all driver projects (i.e. PYTHON, CSHARP, JAVA) and the
+Bug reports in JIRA for all driver projects (i.e. PYTHON, CSHARP) and the
 Core Server (i.e. SERVER) project are **public**.
 
 How To Ask For Help

data/ext/libmongocrypt/libmongocrypt/bindings/python/libmongocrypt-version.txt

@@ -1 +1 @@
-1.10.1
+1.12.0

data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/state_machine.py

@@ -134,7 +134,7 @@ async def run_state_machine(ctx, callback):
             ctx.complete_mongo_operation()
         elif state == lib.MONGOCRYPT_CTX_NEED_MONGO_KEYS:
             key_filter = ctx.mongo_operation()
-            for key in await callback.fetch_keys(key_filter):
+            async for key in callback.fetch_keys(key_filter):
                 ctx.add_mongo_operation_result(key)
             ctx.complete_mongo_operation()
         elif state == lib.MONGOCRYPT_CTX_NEED_KMS: