libmongocrypt-helper 1.7.4.0.1001 → 1.8.0.0.1001

data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/compat.py

@@ -14,7 +14,6 @@
 
 """Utility functions and definitions for Python compatibility."""
 
-import base64
 import sys
 
 PY3 = sys.version_info[0] == 3
@@ -33,29 +32,3 @@ def str_to_bytes(string):
     if isinstance(string, bytes):
         return string
     return string.encode('utf-8')
-
-
-def safe_bytearray_or_base64(data):
-    """Convert the given value to a type that, when BSON-encoded can be safely
-    passed to libmongocrypt functions that expect a BSON document containing
-    BSON Binary data or a base64-encoded string.
-
-    pymongo.bson encodes bytes to BSON string in Python 2, while the
-    libmongocrypt API expects BSON Binary or a base64 encoded string.
-    To avoid needing to import bson.Binary, we return a base64 encoded string
-    when using Python 2.
-    """
-    # On Python 3 byte-arrays are encoded as BSON Binary and
-    # base64 encoded strings can be passed as-is.
-    if PY3:
-        return data
-
-    # On Python 2 unicode literals are assumed to contain base64-encoded
-    # strings that can be passed to libmongocrypt as-is.
-    if isinstance(data, unicode_type):
-        return data
-
-    # On Python 2, all other types are assumed to contain raw bytes.
-    # To avoid importing bson.binary.Binary, we convert these to
-    # base64 strings.
-    return unicode_type(base64.b64encode(data))

data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/explicit_encrypter.py

@@ -55,7 +55,7 @@ class ExplicitEncryptOpts(object):
         self.contention_factor = contention_factor
         if range_opts is not None and not isinstance(range_opts, bytes):
             raise TypeError(
-                'range_opts must be an bytes or None, not: %r' % (type(contention_factor),))
+                'range_opts must be an bytes or None, not: %r' % (type(range_opts),))
         self.range_opts = range_opts
         self.is_expression = is_expression
 

data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/mongocrypt.py

@@ -18,8 +18,7 @@ import copy
 from pymongocrypt.binary import (MongoCryptBinaryIn,
                                  MongoCryptBinaryOut)
 from pymongocrypt.binding import ffi, lib, _to_string
-from pymongocrypt.compat import (safe_bytearray_or_base64, str_to_bytes,
-                                 unicode_type)
+from pymongocrypt.compat import str_to_bytes, unicode_type
 from pymongocrypt.credentials import _ask_for_kms_credentials
 from pymongocrypt.errors import MongoCryptError
 from pymongocrypt.state_machine import MongoCryptCallback
@@ -48,12 +47,10 @@ class MongoCryptOptions(object):
                  and optionally a "sessionToken" for temporary credentials.
               - `azure`: Map with "clientId" and "clientSecret" as strings.
               - `gcp`: Map with "email" as a string and "privateKey" as
-                a byte array or a base64-encoded string. On Python 2,
-                base64-encoded strings must be passed as unicode literals.
+                a byte array or a base64-encoded string.
               - `kmip`: Map with "endpoint" as a string.
               - `local`: Map with "key" as a 96-byte array or the equivalent
-                base64-encoded string. On Python 2, base64-encoded strings
-                must be passed as unicode literals.
+                base64-encoded string.
           - `schema_map`: Optional map of collection namespace ("db.coll") to
             JSON Schema.  By default, a collection's JSONSchema is periodically
             polled with the listCollections command. But a JSONSchema may be
@@ -125,8 +122,7 @@ class MongoCryptOptions(object):
                 if not isinstance(kms_providers['gcp']['privateKey'],
                                   (bytes, unicode_type)):
                     raise TypeError("kms_providers['gcp']['privateKey'] must "
-                                    "be an instance of bytes or str "
-                                    "(unicode in Python 2)")
+                                    "be an instance of bytes or str")
 
         if 'kmip' in kms_providers:
             kmip = kms_providers['kmip']
@@ -149,8 +145,7 @@ class MongoCryptOptions(object):
             if not isinstance(kms_providers['local']['key'],
                               (bytes, unicode_type)):
                 raise TypeError("kms_providers['local']['key'] must be an "
-                                "instance of bytes or str (unicode in "
-                                "Python 2)")
+                                "instance of bytes or str")
 
         if schema_map is not None and not isinstance(schema_map, bytes):
             raise TypeError("schema_map must be bytes or None")
@@ -200,17 +195,6 @@ class MongoCrypt(object):
     def __init(self):
         """Internal init helper."""
         kms_providers = self.__opts.kms_providers
-
-        # Make fields that can be passed as binary or string safe to
-        # encode to BSON.
-        base64_or_bytes_fields = [("local", "key"), ("gcp", "privateKey")]
-        for f1, f2 in base64_or_bytes_fields:
-            value = kms_providers.get(f1, {}).get(f2, None)
-            if value is not None:
-                safe_value = safe_bytearray_or_base64(value)
-                if value != safe_value:
-                    kms_providers = copy.deepcopy(kms_providers)
-                    kms_providers[f1][f2] = safe_value
         with MongoCryptBinaryIn(
                 self.__callback.bson_encode(kms_providers)) as kmsopt:
             if not lib.mongocrypt_setopt_kms_providers(

data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/version.py

@@ -12,6 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.4.2.dev0'
+__version__ = '1.5.3.dev0'
 
-_MIN_LIBMONGOCRYPT_VERSION = '1.7.0-alpha1'
+_MIN_LIBMONGOCRYPT_VERSION = '1.7.0'

data/ext/libmongocrypt/libmongocrypt/bindings/python/release.sh

@@ -14,9 +14,9 @@ set -o xtrace   # Write all commands first to stderr
 set -o errexit  # Exit the script with error if any of the commands fail
 
 # The libmongocrypt git revision release to embed in our wheels.
-REVISION=$(git rev-list -n 1 1.7.0-alpha1)
+REVISION=$(git rev-list -n 1 1.7.3)
 # The libmongocrypt release branch.
-BRANCH="master"
+BRANCH="r1.7"
 MACOS_TARGET=${MACOS_TARGET:="macos"}
 
 if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
@@ -25,7 +25,7 @@ if [ "Windows_NT" = "$OS" ]; then # Magic variable in cygwin
 
     # Build the Windows wheel.
     rm -rf build libmongocrypt pymongocrypt/*.so pymongocrypt/*.dll pymongocrypt/*.dylib
-    curl -O https://s3.amazonaws.com/mciuploads/libmongocrypt/windows-test/${BRANCH}/${REVISION}/libmongocrypt.tar.gz
+    curl -O https://s3.amazonaws.com/mciuploads/libmongocrypt-release/windows-test/${BRANCH}/${REVISION}/libmongocrypt.tar.gz
     mkdir libmongocrypt
     tar xzf libmongocrypt.tar.gz -C ./libmongocrypt
     NOCRYPTO_SO=libmongocrypt/nocrypto/bin/mongocrypt.dll
@@ -51,7 +51,7 @@ elif [ "Darwin" = "$(uname -s)" ]; then
     # Install the sdist.
     $PYTHON setup.py sdist
 
-    curl -O https://s3.amazonaws.com/mciuploads/libmongocrypt/${MACOS_TARGET}/${BRANCH}/${REVISION}/libmongocrypt.tar.gz
+    curl -O https://s3.amazonaws.com/mciuploads/libmongocrypt-release/${MACOS_TARGET}/${BRANCH}/${REVISION}/libmongocrypt.tar.gz
     mkdir libmongocrypt
     tar xzf libmongocrypt.tar.gz -C ./libmongocrypt
     NOCRYPTO_SO=libmongocrypt/nocrypto/lib/libmongocrypt.dylib
@@ -67,7 +67,7 @@ fi
 if [ $(command -v docker) ]; then
     # Build the manylinux2010 wheels.
     rm -rf build libmongocrypt pymongocrypt/*.so pymongocrypt/*.dll pymongocrypt/*.dylib
-    curl -O https://s3.amazonaws.com/mciuploads/libmongocrypt/rhel-62-64-bit/${BRANCH}/${REVISION}/libmongocrypt.tar.gz
+    curl -O https://s3.amazonaws.com/mciuploads/libmongocrypt-release/rhel-62-64-bit/${BRANCH}/${REVISION}/libmongocrypt.tar.gz
     mkdir libmongocrypt
     tar xzf libmongocrypt.tar.gz -C ./libmongocrypt
     NOCRYPTO_SO=libmongocrypt/nocrypto/lib64/libmongocrypt.so

data/ext/libmongocrypt/libmongocrypt/bindings/python/setup.py

@@ -3,6 +3,9 @@ import sys
 
 from setuptools import setup, find_packages
 
+if sys.version_info[:3] < (3, 7):
+    raise RuntimeError("pymongocrypt requires Python version >= 3.7")
+
 # Make our Windows and macOS wheels platform specific because we embed
 # libmongocrypt. On Linux we ship manylinux2010 wheels which cannot do this or
 # else auditwheel raises the following error:
@@ -22,8 +25,8 @@ if sys.platform in ('win32', 'darwin'):
 
             def get_tag(self):
                 python, abi, plat = _bdist_wheel.get_tag(self)
-                # Our python source is py2/3 compatible.
-                python, abi = 'py2.py3', 'none'
+                # Our python source is py3 compatible.
+                python, abi = 'py3', 'none'
                 return python, abi, plat
 
         cmdclass['bdist_wheel'] = bdist_wheel
@@ -50,7 +53,13 @@ setup(
     package_data={'pymongocrypt': ['*.dll', '*.so', '*.dylib']},
     zip_safe=False,
     # Note cryptography is uncapped because it does not follow semver.
-    install_requires=["cffi>=1.12.0,<2", "cryptography>=2.0", "requests<3.0.0"],
+    install_requires=[
+        "cffi>=1.12.0,<2",
+        "cryptography>=2.0",
+        # cryptography 40 dropped support for PyPy <7.3.10.
+        "cryptography<40;platform_python_implementation=='PyPy' and implementation_version<'7.3.10'",
+        "requests<3.0.0"
+    ],
     author="Shane Harvey",
     author_email="mongodb-user@googlegroups.com",
     url="https://github.com/mongodb/libmongocrypt/tree/master/bindings/python",
@@ -58,7 +67,7 @@ setup(
               "bson"],
     test_suite="test",
     license="Apache License, Version 2.0",
-    python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
+    python_requires=">=3.7",
     classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
@@ -66,12 +75,8 @@ setup(
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: Microsoft :: Windows",
         "Operating System :: POSIX",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

data/ext/libmongocrypt/libmongocrypt/bindings/python/test/__init__.py

@@ -25,13 +25,4 @@ try:
 except ImportError:
     pass
 
-# Use assertRaisesRegex if available, otherwise use Python 2.7's
-# deprecated assertRaisesRegexp, with a 'p'.
-if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-try:
-    from unittest import mock
-except ImportError:  # python 2
-    import mock
-
+from unittest import mock

data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit-v2/int32/encrypted-payload.json

@@ -0,0 +1,26 @@
+{
+    "v": {
+        "$and": [
+            {
+                "age": {
+                    "$gte": {
+                        "$binary": {
+                            "base64": "Dd0BAAADcGF5bG9hZACZAQAABGcAhQEAAAMwAH0AAAAFZAAgAAAAAInd0noBhIiJMv8QTjcfgRqnnVhxRJRRACLfvgT+CTR/BXMAIAAAAADm0EjqF/T4EmR6Dw6NaPLrL0OuzS4AFvm90czFluAAygVsACAAAAAA5MXcYWjYlzhPFUDebBEa17B5z2bupmaW9uCdtLjc7RkAAzEAfQAAAAVkACAAAAAA7lkNtT6RLw91aJ07K/blwlFs5wi9pQjqUXDcaCTxe98FcwAgAAAAAPwySffuLQihmF70Ot93KtaUMNU8KpmA+niyPRcvarNMBWwAIAAAAACDv6fJXXwRqwZH3O2kO+hdeLZ36U6bMZSui8kv0PsPtAADMgB9AAAABWQAIAAAAACcMWVTbZC4ox5VdjWeYKLgf4oBjpPlbTTAkucm9JPK0wVzACAAAAAA3tIww4ZTytkxFsUKyJbc3zwQ2w7DhkOqaNvX9g8pi3gFbAAgAAAAAGs9XR3Q1JpxV+HPW8P2GvCuCBF5bGZ8Kl1zHqzZcd5/AAASY20ABAAAAAAAAAAAEHBheWxvYWRJZAAAAAAAEGZpcnN0T3BlcmF0b3IAAgAAABBzZWNvbmRPcGVyYXRvcgAEAAAAAA==",
+                            "subType": "06"
+                        }
+                    }
+                }
+            },
+            {
+                "age": {
+                    "$lte": {
+                        "$binary": {
+                            "base64": "DTsAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAAA",
+                            "subType": "06"
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}

data/ext/libmongocrypt/libmongocrypt/bindings/python/test/test_mongocrypt.py

@@ -137,11 +137,11 @@ class TestMongoCryptOptions(unittest.TestCase):
                 MongoCryptOptions(invalid_kms_providers)
         with self.assertRaisesRegex(
                 TypeError, r"kms_providers\['local'\]\['key'\] must be an "
-                           r"instance of bytes or str \(unicode in Python 2\)"):
+                           r"instance of bytes or str"):
             MongoCryptOptions({'local': {'key': None}})
         with self.assertRaisesRegex(
                 TypeError, r"kms_providers\['gcp'\]\['privateKey'\] must be an "
-                           r"instance of bytes or str \(unicode in Python 2\)"):
+                           r"instance of bytes or str"):
             MongoCryptOptions({'gcp': {'email': "foo@bar.baz",
                                        "privateKey": None}})
 
@@ -782,9 +782,9 @@ class TestExplicitEncryption(unittest.TestCase):
             kms_reply=http_data('kms-reply.txt')), self.mongo_crypt_opts())
         self.addCleanup(encrypter.close)
 
-        range_opts = bson_data("fle2-find-range-explicit/int32/rangeopts.json")
-        value = bson_data("fle2-find-range-explicit/int32/value-to-encrypt.json")
-        expected = json_data("fle2-find-range-explicit/int32/encrypted-payload.json")
+        range_opts = bson_data("fle2-find-range-explicit-v2/int32/rangeopts.json")
+        value = bson_data("fle2-find-range-explicit-v2/int32/value-to-encrypt.json")
+        expected = json_data("fle2-find-range-explicit-v2/int32/encrypted-payload.json")
         encrypted = encrypter.encrypt(
             value, "rangePreview", key_id=key_id, query_type="rangePreview",
             contention_factor=4, range_opts=range_opts, is_expression=True)

data/ext/libmongocrypt/libmongocrypt/bindings/python/test-requirements.txt

@@ -1,12 +1,4 @@
-pymongo[aws]>=3.11
-# cffi==1.14.3 was the last installable release on RHEL 6.3 with Python 3.4
-cffi==1.14.3;python_version=="3.4"
-cffi>=1.12.0,<2;python_version!="3.4"
-# We test PyPy on RHEL 6.2 which has OpenSSL 1.0.1e
-# Pin to cryptography 2.8.* until we figure our how to
-# install cryptography with PyPy with a newer OpenSSL.
-cryptography>=2,<2.9;platform_python_implementation=='PyPy'
-cryptography>=2;platform_python_implementation!='PyPy'
-mock;python_version=='2.7'
-six>=1.5;python_version=='2.7'
-requests_mock>=1.10
+pymongo[aws]>=4
+cffi>=1.12.0,<2
+cryptography>=2
+requests_mock>=1.10

data/ext/libmongocrypt/libmongocrypt/cmake/ImportBSON.cmake

@@ -149,12 +149,14 @@ function (_import_bson)
       else ()
          add_subdirectory ("${MONGOCRYPT_MONGOC_DIR}" _mongo-c-driver EXCLUDE_FROM_ALL)
       endif ()
-      # Workaround: Embedded mongoc_static does not set its INCLUDE_DIRECTORIES for user targets
-      target_include_directories (mongoc_static
-         PUBLIC
-            "$<BUILD_INTERFACE:${MONGOCRYPT_MONGOC_DIR}/src/libmongoc/src>"
-            "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/_mongo-c-driver/src/libmongoc/src/mongoc>"
-         )
+      if (TARGET mongoc_static)
+         # Workaround: Embedded mongoc_static does not set its INCLUDE_DIRECTORIES for user targets
+         target_include_directories (mongoc_static
+            PUBLIC
+               "$<BUILD_INTERFACE:${MONGOCRYPT_MONGOC_DIR}/src/libmongoc/src>"
+               "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/_mongo-c-driver/src/libmongoc/src/mongoc>"
+            )
+      endif ()
    endif ()
 endfunction ()
 

data/ext/libmongocrypt/libmongocrypt/cmake/IntelDFP.cmake

@@ -11,7 +11,7 @@ set (INTEL_DFP_LIBRARY_URL_HASH
      "SHA256=ac157e69c05556f3fa468ab34caeb1114a3b88ae18241bd41cc57b85a02dd314"
      CACHE STRING "The hash of the archive that lives at INTEL_DFP_LIBRARY_URL (Spelled: <ALGO>=<digest>)")
 option (INTEL_DFP_LIBRARY_PATCH_ENABLED
-        "Whether to apply the s390x compatibility patch to the Intel DFP library" ON)
+        "Whether to apply patches to the Intel DFP library" ON)
 
 set (_hash_arg)
 if (NOT INTEL_DFP_LIBRARY_URL_SHA256 STREQUAL "no-verify")
@@ -42,6 +42,7 @@ FetchContent_Declare (
             -p 4 # Strip four path components
             "${PROJECT_SOURCE_DIR}/etc/mongo-inteldfp-s390x.patch"
             "${PROJECT_SOURCE_DIR}/etc/mongo-inteldfp-MONGOCRYPT-571.patch"
+            "${PROJECT_SOURCE_DIR}/etc/mongo-inteldfp-libmongocrypt-pr-625.patch"
             --verbose
     )
 

data/ext/libmongocrypt/libmongocrypt/cmake/Platform.cmake

@@ -0,0 +1,50 @@
+#[[
+    Defines a platform-support target _mongocrypt::platform.
+
+    This target sets certain internal-only compile definitions, and defines
+    usage requirements on certain platform features required by libmongocrypt
+    (Threads, dlopen(), math)
+]]
+
+add_library (lmc-platform INTERFACE)
+add_library (mongocrypt::platform ALIAS lmc-platform)
+install (TARGETS lmc-platform EXPORT mongocrypt_targets)
+set_property (
+    TARGET lmc-platform
+    PROPERTY EXPORT_NAME mongocrypt::platform
+    )
+
+# Threads:
+find_package (Threads REQUIRED)
+
+# Special math:
+if (NOT APPLE)
+    find_library (M_LIBRARY m)
+endif ()
+
+# Special runtime:
+find_library (RT_LIBRARY rt)
+
+# Endian detection:
+if (DEFINED CMAKE_C_BYTE_ORDER)
+    # Newer CMake knows this immediately:
+    set (MONGOCRYPT_ENDIAN_DEF "MONGOCRYPT_${CMAKE_C_BYTE_ORDER}")
+else ()
+    include (TestBigEndian)
+    test_big_endian (_is_big)
+    set (MONGOCRYPT_ENDIAN_DEF "MONGOCRYPT_$<IF:${_is_big},BIG,LITTLE>_ENDIAN")
+endif ()
+
+target_compile_definitions (lmc-platform INTERFACE
+    "$<BUILD_INTERFACE:${MONGOCRYPT_ENDIAN_DEF}>"
+    )
+target_link_libraries (lmc-platform INTERFACE
+    Threads::Threads
+    # These are build-interface libs, but still required. These will be added
+    # to the platform library in mongocrypt-config.cmake using the same
+    # find_library() calls:
+    $<BUILD_INTERFACE:${CMAKE_DL_LIBS}>
+    $<BUILD_INTERFACE:$<$<BOOL:${M_LIBRARY}>:${M_LIBRARY}>>
+    $<BUILD_INTERFACE:$<$<BOOL:${RT_LIBRARY}>:${RT_LIBRARY}>>
+    )
+

data/ext/libmongocrypt/libmongocrypt/cmake/mongocrypt-config.cmake

@@ -40,3 +40,24 @@ if (_using_system_intel_dfp)
       PROPERTY IMPORTED_LOCATION "${_MONGOCRYPT_SYSTEM_INTEL_DFP_STATIC}"
       )
 endif ()
+
+find_dependency(Threads)
+
+# Link for dlopen():
+set_property (TARGET mongo::mongocrypt::platform APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${CMAKE_DL_LIBS})
+
+# Link for special math functions:
+if (NOT APPLE)
+    find_library (_MONGOCRYPT_M_LIBRARY m)
+    mark_as_advanced (_MONGOCRYPT_M_LIBRARY)
+    if (_MONGOCRYPT_M_LIBRARY)
+        set_property (TARGET mongo::mongocrypt::platform APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${_MONGOCRYPT_M_LIBRARY}")
+    endif ()
+endif ()
+
+# Special runtime:
+find_library (_MONGOCRYPT_RT_LIBRARY rt)
+mark_as_advanced (_MONGOCRYPT_RT_LIBRARY)
+if (_MONGOCRYPT_RT_LIBRARY)
+    set_property (TARGET mongo::mongocrypt::platform APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${_MONGOCRYPT_RT_LIBRARY}")
+endif ()

data/ext/libmongocrypt/libmongocrypt/debian/gbp.conf

@@ -18,6 +18,6 @@ prebuild = bash -c "
     rm -rf \$third_party_rm_files"
 
 upstream-tree = BRANCH
-upstream-branch = r1.7
+upstream-branch = master
 upstream-tag = %(version)s
-debian-branch = r1.7
+debian-branch = master

data/ext/libmongocrypt/libmongocrypt/etc/c6-vault.repo

@@ -0,0 +1,39 @@
+[C6.10-base]
+name=CentOS-6.10 - Base
+baseurl=http://vault.centos.org/6.10/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+metadata_expire=never
+
+[C6.10-updates]
+name=CentOS-6.10 - Updates
+baseurl=http://vault.centos.org/6.10/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+metadata_expire=never
+
+[C6.10-extras]
+name=CentOS-6.10 - Extras
+baseurl=http://vault.centos.org/6.10/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=1
+metadata_expire=never
+
+[C6.10-contrib]
+name=CentOS-6.10 - Contrib
+baseurl=http://vault.centos.org/6.10/contrib/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=0
+metadata_expire=never
+
+[C6.10-centosplus]
+name=CentOS-6.10 - CentOSPlus
+baseurl=http://vault.centos.org/6.10/centosplus/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+enabled=0
+metadata_expire=never

data/ext/libmongocrypt/libmongocrypt/etc/fle2_aead_generate_tests.py

@@ -1,4 +1,5 @@
-# fle2_aead_generate_tests.py is used to generate the test file: ./test/data/fle2-aead.cstructs
+# fle2_aead_generate_tests.py is used to generate the test file: ./test/data/roundtrip/fle2aead-generated.json
+import json
 import os
 import itertools
 import fle2_crypto
@@ -6,18 +7,7 @@ import fle2_crypto
 # Generate test cases by taking the cross-product of AD (associated data) and plaintext (M) lengths.
 AD_lens = [5, 10, 20]
 M_lens = [1, 16, 64, 100]
-
-tmpl = """{{
-    .testname = "{testname}",
-    .iv = "{iv}",
-    .associated_data = "{associated_data}",
-    .key = "{key}",
-    .plaintext = "{plaintext}",
-    .ciphertext = "{ciphertext}",
-    .bytes_written_expected = {bytes_written_expected}
-}},"""
-
-print("/* This file is generated by ./etc/fle2_aead_generate_tests.py. */")
+out = []
 for (AD_len, M_len) in itertools.product(AD_lens, M_lens):
     M = os.urandom(M_len)
     AD = os.urandom(AD_len)
@@ -28,14 +18,15 @@ for (AD_len, M_len) in itertools.product(AD_lens, M_lens):
 
     # Create the 96 byte data encryption key. The last 32 are unused.
     key = Ke + Km + (b"\x00" * 32)
-    args = {
-        "testname": "generated test. AD length={}, M length={}".format(AD_len, M_len),
-        "iv": IV.hex(),
-        "associated_data": AD.hex(),
-        "key": key.hex(),
-        "plaintext": M.hex(),
-        "ciphertext": C.hex(),
-        "bytes_written_expected": len(C)
-    }
-    testcase = tmpl.format(**args)
-    print(testcase)
+    out.append({
+      'name': "generated test. AD length={}, M length={}".format(AD_len, M_len),
+      'origin': "etc/fle2_aead_generate_tests.py",
+      'algo': 'AES-256-CTR/SHA-256',
+      'iv': IV.hex(),
+      'aad': AD.hex(),
+      'key': key.hex(),
+      'plaintext': M.hex(),
+      'ciphertext': C.hex()
+   })
+
+print(json.JSONEncoder(indent=3).encode(out))