From 0cfdf2596df107f934f685a56c7f6c758b4a477e Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Mon, 29 Jun 2026 09:45:47 -0400 Subject: [PATCH 1/5] PYTHON-5896 - [pymongocrypt] Bundle libmongocrypt 1.19.2 --- bindings/python/scripts/libmongocrypt-version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/python/scripts/libmongocrypt-version.txt b/bindings/python/scripts/libmongocrypt-version.txt index b57fc7228..836ae4eda 100644 --- a/bindings/python/scripts/libmongocrypt-version.txt +++ b/bindings/python/scripts/libmongocrypt-version.txt @@ -1 +1 @@ -1.18.2 +1.19.2 From 11075c05c8829cbf0bff60510a5c8bb28f31e7e7 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Mon, 29 Jun 2026 13:47:06 -0400 Subject: [PATCH 2/5] Update binding + sbom --- bindings/python/pymongocrypt/binding.py | 22 ++++++++++++++-------- bindings/python/sbom.json | 16 ++++++++-------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/bindings/python/pymongocrypt/binding.py b/bindings/python/pymongocrypt/binding.py index 4f1975e50..f8b3f576b 100644 --- a/bindings/python/pymongocrypt/binding.py +++ b/bindings/python/pymongocrypt/binding.py @@ -31,7 +31,7 @@ def _parse_version(version): # Start embedding from update_binding.py ffi.cdef( - """ +""" /* * Copyright 2019-present MongoDB, Inc. * @@ -431,6 +431,10 @@ def _parse_version(version): * the path string is literal "$SYSTEM", then libmongocrypt will defer to the * system's library resolution mechanism to find the crypt_shared library. * + * @warning Use of "$SYSTEM" will search system directories for the + * mongo_crypt_v1.(dll,so,dylib) following the search behavior of LoadLibrary + * on Windows and dlopen on Unix. Ensure secure deployment of the library. + * * @note If no crypt_shared dynamic library is found in any of the directories * specified by the search paths loaded here, @ref mongocrypt_init() will still * succeed and continue to operate without crypt_shared. @@ -687,7 +691,8 @@ def _parse_version(version): /// String constant for setopt_algorithm "Indexed" explicit encryption /// String constant for setopt_algorithm "Unindexed" explicit encryption // DEPRECATED: support "RangePreview" has been removed in favor of "range". -/// NOTE: "textPreview" is experimental only and may be removed in a future non-major release. +/// DEPRECATED: "textPreview" has been removed. Use "string". +// String constant for setopt_algorithm "string" explicit encryption. /** * Identify the AWS KMS master key to use for creating a data key. @@ -1485,9 +1490,8 @@ def _parse_version(version): bool mongocrypt_ctx_setopt_algorithm_range(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *opts); /** - * Set options for explicit encryption with the "textPreview" algorithm. + * Set options for explicit encryption with the "string" algorithm. * - * NOTE: "textPreview" is experimental only and may be removed in a future non-major release. * @p opts is a BSON document of the form: * { * "caseSensitive": bool, @@ -1508,6 +1512,8 @@ def _parse_version(version): * } * * "prefix" and "suffix" can both be set. + * + * NOTE: Driver public APIs should use the name "string" rather than "text" to refer to options. */ bool mongocrypt_ctx_setopt_algorithm_text(mongocrypt_ctx_t *ctx, mongocrypt_binary_t *opts); @@ -1522,9 +1528,9 @@ def _parse_version(version): /// String constants for setopt_query_type // DEPRECATED: Support "rangePreview" has been removed in favor of "range". -/// NOTE: "substringPreview" is experimental and may be removed in a future non-major release. -/// NOTE: "suffixPreview" is experimental and may be removed in a future non-major release. -/// NOTE: "prefixPreview" is experimental and may be removed in a future non-major release. +/// DEPRECATED: Support for "substringPreview" has been removed in favor of "substring" +/// DEPRECATED: Support for "suffixPreview" has been removed in favor of "suffix" +/// DEPRECATED: Support for "prefixPreview" has been removed in favor of "suffix" """ ) @@ -1587,4 +1593,4 @@ def __getattr__(self, name): exc = RuntimeError( f"Expected libmongocrypt version %s or greater, found {_MIN_LIBMONGOCRYPT_VERSION, libmongocrypt_version()}" ) - lib = _Library(exc) + lib = _Library(exc) \ No newline at end of file diff --git a/bindings/python/sbom.json b/bindings/python/sbom.json index f0b61f340..90641a0f4 100644 --- a/bindings/python/sbom.json +++ b/bindings/python/sbom.json @@ -1,31 +1,31 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/libmongocrypt@1.18.2", + "bom-ref": "pkg:github/mongodb/libmongocrypt@1.19.2", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/libmongocrypt/archive/1.18.2.tar.gz" + "url": "https://github.com/mongodb/libmongocrypt/archive/1.19.2.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/libmongocrypt/tree/1.18.2" + "url": "https://github.com/mongodb/libmongocrypt/tree/1.19.2" } ], "group": "mongodb", "name": "libmongocrypt", - "purl": "pkg:github/mongodb/libmongocrypt@1.18.2", + "purl": "pkg:github/mongodb/libmongocrypt@1.19.2", "type": "library", - "version": "1.18.2" + "version": "1.19.2" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/libmongocrypt@1.18.2" + "ref": "pkg:github/mongodb/libmongocrypt@1.19.2" } ], "metadata": { - "timestamp": "2026-06-03T00:00:00.000000+00:00", + "timestamp": "2026-06-29T17:46:51.730092+00:00", "tools": [ { "externalReferences": [ @@ -68,7 +68,7 @@ } ] }, - "serialNumber": "urn:uuid:fb7d4662-fe2d-495c-944f-034982ccc517", + "serialNumber": "urn:uuid:d882082d-f7f7-45a6-a098-89a7e390681e", "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", From a0a75077d30c0bb19f3746bec5e2d8d5e44a468d Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Mon, 29 Jun 2026 13:49:24 -0400 Subject: [PATCH 3/5] Formatting --- bindings/python/pymongocrypt/binding.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/pymongocrypt/binding.py b/bindings/python/pymongocrypt/binding.py index f8b3f576b..0bcc7cfc0 100644 --- a/bindings/python/pymongocrypt/binding.py +++ b/bindings/python/pymongocrypt/binding.py @@ -31,7 +31,7 @@ def _parse_version(version): # Start embedding from update_binding.py ffi.cdef( -""" + """ /* * Copyright 2019-present MongoDB, Inc. * @@ -1593,4 +1593,4 @@ def __getattr__(self, name): exc = RuntimeError( f"Expected libmongocrypt version %s or greater, found {_MIN_LIBMONGOCRYPT_VERSION, libmongocrypt_version()}" ) - lib = _Library(exc) \ No newline at end of file + lib = _Library(exc) From cdae4197667545dff4dd33ceb9546c6a35b5c5c3 Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 30 Jun 2026 11:00:30 -0400 Subject: [PATCH 4/5] Bundle 1.20.0 --- bindings/python/sbom.json | 16 ++++++++-------- .../python/scripts/libmongocrypt-version.txt | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bindings/python/sbom.json b/bindings/python/sbom.json index 90641a0f4..b019869ec 100644 --- a/bindings/python/sbom.json +++ b/bindings/python/sbom.json @@ -1,31 +1,31 @@ { "components": [ { - "bom-ref": "pkg:github/mongodb/libmongocrypt@1.19.2", + "bom-ref": "pkg:github/mongodb/libmongocrypt@1.20.0", "externalReferences": [ { "type": "distribution", - "url": "https://github.com/mongodb/libmongocrypt/archive/1.19.2.tar.gz" + "url": "https://github.com/mongodb/libmongocrypt/archive/1.20.0.tar.gz" }, { "type": "website", - "url": "https://github.com/mongodb/libmongocrypt/tree/1.19.2" + "url": "https://github.com/mongodb/libmongocrypt/tree/1.20.0" } ], "group": "mongodb", "name": "libmongocrypt", - "purl": "pkg:github/mongodb/libmongocrypt@1.19.2", + "purl": "pkg:github/mongodb/libmongocrypt@1.20.0", "type": "library", - "version": "1.19.2" + "version": "1.20.0" } ], "dependencies": [ { - "ref": "pkg:github/mongodb/libmongocrypt@1.19.2" + "ref": "pkg:github/mongodb/libmongocrypt@1.20.0" } ], "metadata": { - "timestamp": "2026-06-29T17:46:51.730092+00:00", + "timestamp": "2026-06-30T14:59:51.878746+00:00", "tools": [ { "externalReferences": [ @@ -68,7 +68,7 @@ } ] }, - "serialNumber": "urn:uuid:d882082d-f7f7-45a6-a098-89a7e390681e", + "serialNumber": "urn:uuid:55acda1b-978b-4aac-8056-2069123df6c4", "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", diff --git a/bindings/python/scripts/libmongocrypt-version.txt b/bindings/python/scripts/libmongocrypt-version.txt index 836ae4eda..398935591 100644 --- a/bindings/python/scripts/libmongocrypt-version.txt +++ b/bindings/python/scripts/libmongocrypt-version.txt @@ -1 +1 @@ -1.19.2 +1.20.0 From 673bf7dc37941e386cec34bb2316450820660c3b Mon Sep 17 00:00:00 2001 From: Noah Stapp Date: Tue, 30 Jun 2026 14:18:11 -0400 Subject: [PATCH 5/5] SS review --- bindings/python/pymongocrypt/binding.py | 2 +- bindings/python/sbom.json | 4 ++-- src/mongocrypt.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bindings/python/pymongocrypt/binding.py b/bindings/python/pymongocrypt/binding.py index 0bcc7cfc0..10ca22d8c 100644 --- a/bindings/python/pymongocrypt/binding.py +++ b/bindings/python/pymongocrypt/binding.py @@ -1530,7 +1530,7 @@ def _parse_version(version): // DEPRECATED: Support "rangePreview" has been removed in favor of "range". /// DEPRECATED: Support for "substringPreview" has been removed in favor of "substring" /// DEPRECATED: Support for "suffixPreview" has been removed in favor of "suffix" -/// DEPRECATED: Support for "prefixPreview" has been removed in favor of "suffix" +/// DEPRECATED: Support for "prefixPreview" has been removed in favor of "prefix" """ ) diff --git a/bindings/python/sbom.json b/bindings/python/sbom.json index b019869ec..0b2bf5cc3 100644 --- a/bindings/python/sbom.json +++ b/bindings/python/sbom.json @@ -25,7 +25,7 @@ } ], "metadata": { - "timestamp": "2026-06-30T14:59:51.878746+00:00", + "timestamp": "2026-06-30T18:17:42.887189+00:00", "tools": [ { "externalReferences": [ @@ -68,7 +68,7 @@ } ] }, - "serialNumber": "urn:uuid:55acda1b-978b-4aac-8056-2069123df6c4", + "serialNumber": "urn:uuid:fecaed8a-4f6b-41bf-87b1-977d29e6f44b", "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", "bomFormat": "CycloneDX", diff --git a/src/mongocrypt.h b/src/mongocrypt.h index 7cd25693a..61f087b1c 100644 --- a/src/mongocrypt.h +++ b/src/mongocrypt.h @@ -1606,7 +1606,7 @@ bool mongocrypt_setopt_key_expiration(mongocrypt_t *crypt, uint64_t cache_expira /// DEPRECATED: Support for "suffixPreview" has been removed in favor of "suffix" #define MONGOCRYPT_QUERY_TYPE_SUFFIXPREVIEW_DEPRECATED_STR "suffixPreview" #define MONGOCRYPT_QUERY_TYPE_SUFFIX_STR "suffix" -/// DEPRECATED: Support for "prefixPreview" has been removed in favor of "suffix" +/// DEPRECATED: Support for "prefixPreview" has been removed in favor of "prefix" #define MONGOCRYPT_QUERY_TYPE_PREFIXPREVIEW_DEPRECATED_STR "prefixPreview" #define MONGOCRYPT_QUERY_TYPE_PREFIX_STR "prefix"