Skip to content
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

Jump to bottom

PYTHON-4604 Bundle libmongocrypt 1.11.0 #876

Merged
merged 4 commits into from
Aug 12, 2024
Merged

PYTHON-4604 Bundle libmongocrypt 1.11.0 #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b44fa5e
PYTHON-4604 Bundle libmongocrypt 1.11.0
blink1073 Aug 8, 2024
c526010
update release branch
blink1073 Aug 8, 2024
444b580
update bindings
blink1073 Aug 9, 2024
5493e14
fix spelling
blink1073 Aug 9, 2024
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
2 changes: 1 addition & 1 deletion bindings/python/libmongocrypt-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.10.1
1.11.0
6 changes: 0 additions & 6 deletions bindings/python/pymongocrypt/binding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,6 @@ 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: "Range" is currently unstable API and subject to backwards breaking changes.

/**
* Identify the AWS KMS master key to use for creating a data key.
Expand Down Expand Up @@ -849,8 +848,6 @@ def _parse_version(version):
* Contexts created for explicit encryption will not go through mongocryptd.
* Requires query_type to be "range".
*
* NOTE: "range" is currently unstable API and subject to backwards breaking changes.
*
* This method expects the passed-in BSON to be of the form:
* { "v" : FLE2RangeFindDriverSpec }
*
Expand Down Expand Up @@ -1360,7 +1357,6 @@ def _parse_version(version):

/**
* DEPRECATED: Use of `mongocrypt_setopt_use_range_v2` is deprecated. Range V2 is always enabled.
* NOTE: "range" is currently unstable API and subject to backwards breaking changes.
*
* @param[in] crypt The @ref mongocrypt_t object.
*
Expand Down Expand Up @@ -1412,7 +1408,6 @@ def _parse_version(version):

/**
* Set options for explicit encryption with the "range" algorithm.
* NOTE: "range" is currently unstable API and subject to backwards breaking changes.
*
* @p opts is a BSON document of the form:
* {
Expand All @@ -1433,7 +1428,6 @@ def _parse_version(version):

/// String constants for setopt_query_type
// DEPRECATED: Support "rangePreview" has been removed in favor of "range".
/// NOTE: "range" is currently unstable API and subject to backwards breaking changes.
"""
)

Expand Down
2 changes: 1 addition & 1 deletion bindings/python/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -o errexit # Exit the script with error if any of the commands fail
LIBMONGOCRYPT_VERSION=$(cat ./libmongocrypt-version.txt)
REVISION=$(git rev-list -n 1 $LIBMONGOCRYPT_VERSION)
# The libmongocrypt release branch.
BRANCH="r1.10"
BRANCH="r1.11"
# The python executable to use.
PYTHON=${PYTHON:-python}

Expand Down
19 changes: 10 additions & 9 deletions bindings/python/sbom.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{
"components": [
{
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.10.1",
"bom-ref": "pkg:github/mongodb/libmongocrypt@1.11.0",
"externalReferences": [
{
"type": "distribution",
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.10.1.tar.gz"
"url": "https://github.com/mongodb/libmongocrypt/archive/refs/tags/1.11.0.tar.gz"
},
{
"type": "website",
"url": "https://github.com/mongodb/libmongocrypt/tree/1.10.1"
"url": "https://github.com/mongodb/libmongocrypt/tree/1.11.0"
}
],
"group": "mongodb",
"name": "libmongocrypt",
"purl": "pkg:github/mongodb/libmongocrypt@1.10.1",
"purl": "pkg:github/mongodb/libmongocrypt@1.11.0",
"type": "library",
"version": "1.10.1"
"version": "1.11.0"
}
],
"dependencies": [
{
"ref": "pkg:github/mongodb/libmongocrypt@1.10.1"
"ref": "pkg:github/mongodb/libmongocrypt@1.11.0"
}
],
"metadata": {
"timestamp": "2024-06-28T19:11:17.100829+00:00",
"timestamp": "2024-08-08T02:35:36.986098+00:00",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this always going to be hardcoded?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file is auto-generated by Silk

"tools": [
{
"externalReferences": [
Expand Down Expand Up @@ -68,9 +68,10 @@
}
]
},
"serialNumber": "urn:uuid:b09e93cf-eb1b-4d38-add5-86b01139769f",
"serialNumber": "urn:uuid:14e22848-7554-4f82-bcd1-76d2891b4c66",
"version": 1,
"$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json",
"bomFormat": "CycloneDX",
"specVersion": "1.5"
"specVersion": "1.5",
"vulnerabilities": []
}
10 changes: 5 additions & 5 deletions src/mongocrypt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ const char *mongocrypt_crypt_shared_lib_version_string(const mongocrypt_t *crypt
* @brief Obtain a 64-bit constant encoding the version of the loaded
* crypt_shared library, if available.
*
* @param[in] crypt The mongocrypt_t object after a successul call to
* @param[in] crypt The mongocrypt_t object after a successful call to
* mongocrypt_init.
*
* @return A 64-bit encoded version number, with the version encoded as four
Expand Down Expand Up @@ -1264,7 +1264,7 @@ void mongocrypt_ctx_destroy(mongocrypt_ctx_t *ctx);
* @param[out] status An optional status to pass error messages. See @ref
* mongocrypt_status_set.
* @returns A boolean indicating success. If returning false, set @p status
* with a message indiciating the error using @ref mongocrypt_status_set.
* with a message indicating the error using @ref mongocrypt_status_set.
*/
typedef bool (*mongocrypt_crypto_fn)(void *ctx,
mongocrypt_binary_t *key,
Expand All @@ -1289,7 +1289,7 @@ typedef bool (*mongocrypt_crypto_fn)(void *ctx,
* @param[out] status An optional status to pass error messages. See @ref
* mongocrypt_status_set.
* @returns A boolean indicating success. If returning false, set @p status
* with a message indiciating the error using @ref mongocrypt_status_set.
* with a message indicating the error using @ref mongocrypt_status_set.
*/
typedef bool (*mongocrypt_hmac_fn)(void *ctx,
mongocrypt_binary_t *key,
Expand All @@ -1308,7 +1308,7 @@ typedef bool (*mongocrypt_hmac_fn)(void *ctx,
* @param[out] status An optional status to pass error messages. See @ref
* mongocrypt_status_set.
* @returns A boolean indicating success. If returning false, set @p status
* with a message indiciating the error using @ref mongocrypt_status_set.
* with a message indicating the error using @ref mongocrypt_status_set.
*/
typedef bool (*mongocrypt_hash_fn)(void *ctx,
mongocrypt_binary_t *in,
Expand All @@ -1326,7 +1326,7 @@ typedef bool (*mongocrypt_hash_fn)(void *ctx,
* @param[out] status An optional status to pass error messages. See @ref
* mongocrypt_status_set.
* @returns A boolean indicating success. If returning false, set @p status
* with a message indiciating the error using @ref mongocrypt_status_set.
* with a message indicating the error using @ref mongocrypt_status_set.
*/
typedef bool (*mongocrypt_random_fn)(void *ctx, mongocrypt_binary_t *out, uint32_t count, mongocrypt_status_t *status);

Expand Down
Loading