libmongocrypt-helper 1.7.4.0.1001 → 1.8.0.0.1001
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/ext/libmongocrypt/extconf.rb +2 -2
- data/ext/libmongocrypt/libmongocrypt/CHANGELOG.md +9 -7
- data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt +17 -23
- data/ext/libmongocrypt/libmongocrypt/Earthfile +374 -0
- data/ext/libmongocrypt/libmongocrypt/README.md +7 -7
- data/ext/libmongocrypt/libmongocrypt/VERSION_CURRENT +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClient.cs +25 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Library.cs +25 -3
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Example/MongoDB.Libmongocrypt.Example.csproj +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test/BasicTests.cs +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.cake +3 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/cs/cs.sln +79 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/build.gradle.kts +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/java/com/mongodb/crypt/capi/MongoCryptTest.java +6 -4
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/encrypted-payload.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/CHANGELOG.md +24 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/README.md +134 -5
- data/ext/libmongocrypt/libmongocrypt/bindings/node/etc/build-static.sh +3 -6
- data/ext/libmongocrypt/libmongocrypt/bindings/node/index.d.ts +203 -77
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/autoEncrypter.js +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/clientEncryption.js +165 -43
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/common.js +12 -14
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/errors.js +75 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/index.js +34 -3
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/aws.js +26 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/azure.js +178 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/gcp.js +24 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/index.js +54 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/utils.js +39 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/stateMachine.js +9 -4
- data/ext/libmongocrypt/libmongocrypt/bindings/node/package-lock.json +4440 -5189
- data/ext/libmongocrypt/libmongocrypt/bindings/node/package.json +27 -8
- data/ext/libmongocrypt/libmongocrypt/bindings/node/src/mongocrypt.cc +65 -38
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/autoEncrypter.test.js +4 -7
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/clientEncryption.test.js +434 -42
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/common.test.js +94 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/cryptoCallbacks.test.js +1 -45
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/index.test.js +45 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/mongocryptdManager.test.js +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/providers/credentialsProvider.test.js +551 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/release.test.js +10 -3
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/requirements.helper.js +23 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/stateMachine.test.js +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/tools/chai-addons.js +8 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/types/index.test-d.ts +63 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst +26 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/README.rst +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/python/build-manylinux-wheel.sh +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/binding.py +128 -238
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/compat.py +0 -27
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/explicit_encrypter.py +1 -1
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/mongocrypt.py +5 -21
- data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/version.py +2 -2
- data/ext/libmongocrypt/libmongocrypt/bindings/python/release.sh +5 -5
- data/ext/libmongocrypt/libmongocrypt/bindings/python/setup.py +14 -9
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/__init__.py +1 -10
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit-v2/int32/encrypted-payload.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/test_mongocrypt.py +5 -5
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test-requirements.txt +4 -12
- data/ext/libmongocrypt/libmongocrypt/cmake/ImportBSON.cmake +8 -6
- data/ext/libmongocrypt/libmongocrypt/cmake/IntelDFP.cmake +2 -1
- data/ext/libmongocrypt/libmongocrypt/cmake/Platform.cmake +50 -0
- data/ext/libmongocrypt/libmongocrypt/cmake/mongocrypt-config.cmake +21 -0
- data/ext/libmongocrypt/libmongocrypt/debian/gbp.conf +2 -2
- data/ext/libmongocrypt/libmongocrypt/etc/c6-vault.repo +39 -0
- data/ext/libmongocrypt/libmongocrypt/etc/fle2_aead_generate_tests.py +15 -24
- data/ext/libmongocrypt/libmongocrypt/etc/fle2_crypto.py +66 -54
- data/ext/libmongocrypt/libmongocrypt/etc/fle2_generate_tests.py +14 -23
- data/ext/libmongocrypt/libmongocrypt/etc/fle2v2_aead_generate_tests.py +32 -0
- data/ext/libmongocrypt/libmongocrypt/etc/format-all.sh +12 -0
- data/ext/libmongocrypt/libmongocrypt/etc/format.sh +16 -0
- data/ext/libmongocrypt/libmongocrypt/etc/install-package.sh +48 -0
- data/ext/libmongocrypt/libmongocrypt/etc/mongo-inteldfp-libmongocrypt-pr-625.patch +13 -0
- data/ext/libmongocrypt/libmongocrypt/src/crypto/cng.c +381 -436
- data/ext/libmongocrypt/libmongocrypt/src/crypto/commoncrypto.c +162 -227
- data/ext/libmongocrypt/libmongocrypt/src/crypto/libcrypto.c +180 -248
- data/ext/libmongocrypt/libmongocrypt/src/crypto/none.c +33 -55
- data/ext/libmongocrypt/libmongocrypt/src/csfle-markup.cpp +175 -205
- data/ext/libmongocrypt/libmongocrypt/src/mc-array-private.h +10 -21
- data/ext/libmongocrypt/libmongocrypt/src/mc-array.c +44 -56
- data/ext/libmongocrypt/libmongocrypt/src/mc-check-conversions-private.h +4 -8
- data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.h +351 -463
- data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.test.cpp +59 -66
- data/ext/libmongocrypt/libmongocrypt/src/mc-efc-private.h +7 -11
- data/ext/libmongocrypt/libmongocrypt/src/mc-efc.c +80 -92
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle-blob-subtype-private.h +18 -10
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder-private.h +59 -70
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder.c +384 -439
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private-v2.h +41 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private.h +11 -18
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-v2.c +135 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload.c +109 -126
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private-v2.h +88 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private.h +24 -27
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-v2.c +137 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload.c +106 -125
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private-v2.h +117 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private.h +28 -36
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-v2.c +294 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload.c +237 -278
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-private-v2.h +133 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-private.h +67 -56
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-v2.c +437 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev.c +476 -325
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-common-private.h +69 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-common.c +182 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-private.h +23 -31
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-v2-private.h +85 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-v2.c +142 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev.c +104 -231
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-range-operator-private.h +8 -7
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds-private.h +55 -56
- data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds.c +517 -580
- data/ext/libmongocrypt/libmongocrypt/src/mc-optional-private.h +36 -66
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation-private.h +57 -76
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation.c +158 -189
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding-private.h +36 -42
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding.c +515 -558
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-generator.template.h +155 -191
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-private.h +43 -53
- data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover.c +170 -240
- data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts-private.h +29 -34
- data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts.c +289 -338
- data/ext/libmongocrypt/libmongocrypt/src/mc-reader-private.h +36 -71
- data/ext/libmongocrypt/libmongocrypt/src/mc-reader.c +111 -164
- data/ext/libmongocrypt/libmongocrypt/src/mc-tokens-private.h +55 -49
- data/ext/libmongocrypt/libmongocrypt/src/mc-tokens.c +109 -125
- data/ext/libmongocrypt/libmongocrypt/src/mc-writer-private.h +66 -0
- data/ext/libmongocrypt/libmongocrypt/src/mc-writer.c +141 -0
- data/ext/libmongocrypt/libmongocrypt/src/mlib/check.hpp +37 -55
- data/ext/libmongocrypt/libmongocrypt/src/mlib/endian.h +11 -11
- data/ext/libmongocrypt/libmongocrypt/src/mlib/error.h +27 -32
- data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.h +444 -499
- data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.test.cpp +251 -334
- data/ext/libmongocrypt/libmongocrypt/src/mlib/macros.h +4 -5
- data/ext/libmongocrypt/libmongocrypt/src/mlib/path.h +196 -231
- data/ext/libmongocrypt/libmongocrypt/src/mlib/path.test.c +56 -79
- data/ext/libmongocrypt/libmongocrypt/src/mlib/str.h +411 -530
- data/ext/libmongocrypt/libmongocrypt/src/mlib/str.test.c +116 -131
- data/ext/libmongocrypt/libmongocrypt/src/mlib/thread.h +17 -26
- data/ext/libmongocrypt/libmongocrypt/src/mlib/user-check.h +2 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary-private.h +3 -6
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary.c +31 -48
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer-private.h +55 -131
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer.c +444 -565
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-collinfo-private.h +1 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-collinfo.c +28 -45
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key-private.h +11 -17
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key.c +103 -132
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth-private.h +8 -14
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth.c +78 -90
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-private.h +26 -45
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache.c +220 -273
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ciphertext-private.h +13 -25
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ciphertext.c +147 -166
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-compat.h +2 -2
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto-private.h +110 -204
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto.c +1137 -1565
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-datakey.c +425 -472
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-decrypt.c +817 -694
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-encrypt.c +2394 -2697
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-private.h +166 -186
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-rewrap-many-datakey.c +308 -351
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx.c +921 -1138
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-dll-private.h +16 -24
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endian-private.h +44 -58
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endpoint-private.h +21 -25
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endpoint.c +167 -181
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek-private.h +37 -43
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek.c +215 -253
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker-private.h +73 -108
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker.c +889 -1034
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-private.h +27 -44
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key.c +349 -402
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx-private.h +92 -120
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx.c +1397 -1612
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log-private.h +35 -67
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log.c +49 -83
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking-private.h +30 -36
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking.c +1821 -1470
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-mutex-private.h +7 -12
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts-private.h +80 -108
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts.c +354 -424
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-private.h +101 -117
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-status-private.h +3 -8
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-status.c +92 -119
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-traverse-util-private.h +19 -29
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-traverse-util.c +136 -176
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util-private.h +11 -21
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util.c +96 -135
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.c +1092 -1320
- data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.h +130 -295
- data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_dll.c +66 -78
- data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_mutex.c +20 -28
- data/ext/libmongocrypt/libmongocrypt/src/os_win/os_dll.c +60 -73
- data/ext/libmongocrypt/libmongocrypt/src/os_win/os_mutex.c +8 -16
- data/ext/libmongocrypt/libmongocrypt/test/crypt_shared-stub.cpp +57 -87
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-delete/empty/encrypted-payload-v2.json +60 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-delete/success/encrypted-payload-v2.json +67 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explain/with-csfle/encrypted-payload.json +2 -2
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/find-indexed-contentionFactor1-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/find-indexed-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-contentionFactor1-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-same-user-and-index-key-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/cmd.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/encrypted-field-map.json +22 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/encrypted-payload.json +40 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/mongocryptd-reply.json +19 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/cmd.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/cmd.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/encrypted-payload.json +50 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/mongocryptd-reply.json +58 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/cmd.json +6 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/cmd.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/encrypted-payload.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/double/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/double-precision/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload-v2.json +26 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-openinterval/encrypted-payload-v2.json +16 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert/cmd.json +1 -1
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date/RNG_DATA.h +65 -65
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/cmd.json +13 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128/RNG_DATA.h +132 -132
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision/RNG_DATA.h +71 -71
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/encrypted-payload.json +53 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/mongocryptd-reply.json +61 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double/RNG_DATA.h +68 -68
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision/RNG_DATA.h +19 -19
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/encrypted-field-map.json +30 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/encrypted-payload.json +47 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/mongocryptd-reply.json +55 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32/RNG_DATA.h +25 -25
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64/RNG_DATA.h +65 -65
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/cmd.json +11 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/encrypted-field-map.json +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/encrypted-payload.json +44 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/mongocryptd-reply.json +52 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double/RNG_DATA.h +68 -68
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double-precision/RNG_DATA.h +19 -19
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double-precision/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32/RNG_DATA.h +25 -25
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/sparsity-2/RNG_DATA.h +15 -15
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/sparsity-2/encrypted-payload-v2.json +8 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/encrypted-field-map.json +18 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/encrypted-payload.json +14 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/mongocryptd-reply.json +41 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/cmd.json +9 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/encrypted-field-map.json +22 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/encrypted-payload.json +39 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/mongocryptd-reply.json +49 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/iev-v2/FLECrudTest-insertOneRangeV2.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/iev-v2/FLECrudTest-insertOneV2.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/README.md +17 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/aes-ctr.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2-fixed.json +10 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2-generated.json +38 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-decrypt.json +35 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-fixed.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-generated.json +122 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2v2-aead-fixed.json +29 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2v2-aead-generated.json +122 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/mcgrew.json +12 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/nist.json +20 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/README.md +27 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/mc.json +21 -0
- data/ext/libmongocrypt/libmongocrypt/test/data/tokens/server.json +21 -0
- data/ext/libmongocrypt/libmongocrypt/test/example-no-bson.c +4 -4
- data/ext/libmongocrypt/libmongocrypt/test/example-state-machine.c +278 -323
- data/ext/libmongocrypt/libmongocrypt/test/fuzz_kms.c +8 -7
- data/ext/libmongocrypt/libmongocrypt/test/test-dll.cpp +6 -7
- data/ext/libmongocrypt/libmongocrypt/test/test-gcp-auth.c +221 -283
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-efc.c +58 -73
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-equality-payload-v2.c +78 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-range-payload-v2.c +89 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev-v2.c +248 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev.c +467 -414
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup-v2.c +172 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup.c +141 -159
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-uev-v2.c +338 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-uev.c +238 -176
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-rfds.c +373 -474
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-edge-generation.c +346 -388
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-encoding.c +708 -825
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-mincover.c +417 -481
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-rangeopts.c +110 -144
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-reader.c +124 -207
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-tokens.c +223 -213
- data/ext/libmongocrypt/libmongocrypt/test/test-mc-writer.c +176 -0
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.c +634 -807
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.h +1 -2
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert.h +168 -189
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-buffer.c +187 -211
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache-oauth.c +34 -36
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache.c +210 -233
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ciphertext.c +185 -220
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-compact.c +331 -445
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-hooks.c +670 -814
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.c +102 -135
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.h +54 -71
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto.c +394 -846
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-csfle-lib.c +159 -183
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-decrypt.c +867 -1045
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-encrypt.c +4349 -4713
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-rewrap-many-datakey.c +750 -964
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-setopt.c +991 -1178
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-datakey.c +342 -419
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-dll.c +23 -30
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-endpoint.c +98 -111
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kek.c +49 -52
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key-broker.c +770 -920
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key-cache.c +354 -407
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key.c +197 -245
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-ctx.c +286 -370
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-responses.c +147 -166
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-local-kms.c +50 -61
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-log.c +85 -100
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-marking.c +656 -692
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-status.c +46 -58
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-traverse-util.c +377 -451
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.c +48 -67
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.h +4 -10
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.c +827 -918
- data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.h +111 -172
- data/ext/libmongocrypt/libmongocrypt/test/util/csfle.c +508 -559
- data/ext/libmongocrypt/libmongocrypt/test/util/util.c +735 -881
- data/ext/libmongocrypt/libmongocrypt/test/util/util.h +33 -55
- data/lib/libmongocrypt_helper/version.rb +2 -2
- data/lib/libmongocrypt_helper.rb +2 -2
- data.tar.gz.sig +0 -0
- metadata +154 -26
- metadata.gz.sig +0 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/encrypted-payload.json +0 -26
- data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/key-document.json +0 -0
- data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/credentialsProvider.js +0 -33
- data/ext/libmongocrypt/libmongocrypt/bindings/node/test/credentialsProvider.test.js +0 -163
- data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit/int32/encrypted-payload.json +0 -26
- data/ext/libmongocrypt/libmongocrypt/test/data/aes-ctr.cstructs +0 -359
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-aead.cstructs +0 -109
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload.json +0 -26
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/rangeopts.json +0 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/value-to-encrypt.json +0 -20
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/RNG_DATA.h +0 -70
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload.json +0 -8
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/rangeopts.json +0 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/value-to-encrypt.json +0 -5
- data/ext/libmongocrypt/libmongocrypt/test/data/fle2.cstructs +0 -33
- /data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/key-filter.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/rangeopts.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/value-to-encrypt.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/rangeopts.json +0 -0
- /data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/value-to-encrypt.json +0 -0
@@ -14,372 +14,523 @@
|
|
14
14
|
* limitations under the License.
|
15
15
|
*/
|
16
16
|
|
17
|
+
#include "mongocrypt-buffer-private.h"
|
17
18
|
#include "mongocrypt-private.h"
|
18
19
|
|
19
20
|
#include "mc-fle-blob-subtype-private.h"
|
20
21
|
#include "mc-fle2-payload-iev-private.h"
|
21
|
-
#include "mc-tokens-private.h"
|
22
22
|
#include "mc-reader-private.h"
|
23
|
+
#include "mc-tokens-private.h"
|
24
|
+
#include "mc-writer-private.h"
|
23
25
|
#include <stdint.h>
|
24
26
|
|
25
|
-
#define CHECK_AND_RETURN(x)
|
26
|
-
|
27
|
-
|
28
|
-
|
27
|
+
#define CHECK_AND_RETURN(x) \
|
28
|
+
if (!(x)) { \
|
29
|
+
return false; \
|
30
|
+
}
|
31
|
+
|
29
32
|
struct _mc_FLE2IndexedEqualityEncryptedValue_t {
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
33
|
+
_mongocrypt_buffer_t S_KeyId;
|
34
|
+
_mongocrypt_buffer_t InnerEncrypted;
|
35
|
+
_mongocrypt_buffer_t Inner;
|
36
|
+
_mongocrypt_buffer_t K_KeyId;
|
37
|
+
_mongocrypt_buffer_t ClientValue;
|
38
|
+
_mongocrypt_buffer_t ClientEncryptedValue;
|
39
|
+
uint8_t original_bson_type;
|
40
|
+
uint8_t fle_blob_subtype;
|
41
|
+
bool parsed;
|
42
|
+
bool inner_decrypted;
|
43
|
+
bool client_value_decrypted;
|
41
44
|
};
|
42
45
|
|
43
|
-
mc_FLE2IndexedEncryptedValue_t *
|
44
|
-
|
45
|
-
{
|
46
|
-
return bson_malloc0 (sizeof (mc_FLE2IndexedEncryptedValue_t));
|
46
|
+
mc_FLE2IndexedEncryptedValue_t *mc_FLE2IndexedEncryptedValue_new(void) {
|
47
|
+
return bson_malloc0(sizeof(mc_FLE2IndexedEncryptedValue_t));
|
47
48
|
}
|
48
49
|
|
49
|
-
mc_FLE2IndexedEqualityEncryptedValueTokens *
|
50
|
-
|
51
|
-
{
|
52
|
-
return bson_malloc0 (sizeof (mc_FLE2IndexedEqualityEncryptedValueTokens));
|
50
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *mc_FLE2IndexedEqualityEncryptedValueTokens_new(void) {
|
51
|
+
return bson_malloc0(sizeof(mc_FLE2IndexedEqualityEncryptedValueTokens));
|
53
52
|
}
|
54
53
|
|
55
|
-
bool
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
mc_reader_read_u8 (&reader, &iev->fle_blob_subtype, status));
|
74
|
-
|
75
|
-
if (iev->fle_blob_subtype != MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue &&
|
76
|
-
iev->fle_blob_subtype != MC_SUBTYPE_FLE2IndexedRangeEncryptedValue) {
|
77
|
-
CLIENT_ERR ("mc_FLE2IndexedEncryptedValue_parse expected "
|
78
|
-
"fle_blob_subtype %d or %d got: %" PRIu8,
|
79
|
-
MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue,
|
80
|
-
MC_SUBTYPE_FLE2IndexedRangeEncryptedValue,
|
81
|
-
iev->fle_blob_subtype);
|
82
|
-
return false;
|
83
|
-
}
|
84
|
-
|
85
|
-
/* Read S_KeyId. */
|
86
|
-
CHECK_AND_RETURN (
|
87
|
-
mc_reader_read_uuid_buffer (&reader, &iev->S_KeyId, status));
|
88
|
-
|
89
|
-
/* Read original_bson_type. */
|
90
|
-
CHECK_AND_RETURN (
|
91
|
-
mc_reader_read_u8 (&reader, &iev->original_bson_type, status));
|
92
|
-
|
93
|
-
/* Read InnerEncrypted. */
|
94
|
-
CHECK_AND_RETURN (
|
95
|
-
mc_reader_read_buffer_to_end (&reader, &iev->InnerEncrypted, status));
|
96
|
-
|
97
|
-
iev->parsed = true;
|
98
|
-
return true;
|
54
|
+
bool mc_FLE2IndexedEqualityEncryptedValueTokens_init_from_buffer(mc_FLE2IndexedEqualityEncryptedValueTokens *tokens,
|
55
|
+
_mongocrypt_buffer_t *buf,
|
56
|
+
mongocrypt_status_t *status) {
|
57
|
+
BSON_ASSERT_PARAM(tokens);
|
58
|
+
BSON_ASSERT_PARAM(buf);
|
59
|
+
|
60
|
+
mc_reader_t reader;
|
61
|
+
mc_reader_init_from_buffer(&reader, buf, __FUNCTION__);
|
62
|
+
|
63
|
+
CHECK_AND_RETURN(mc_reader_read_u64(&reader, &tokens->counter, status));
|
64
|
+
|
65
|
+
CHECK_AND_RETURN(mc_reader_read_prfblock_buffer(&reader, &tokens->edc, status));
|
66
|
+
|
67
|
+
CHECK_AND_RETURN(mc_reader_read_prfblock_buffer(&reader, &tokens->esc, status));
|
68
|
+
|
69
|
+
CHECK_AND_RETURN(mc_reader_read_prfblock_buffer(&reader, &tokens->ecc, status));
|
70
|
+
|
71
|
+
return true;
|
99
72
|
}
|
100
73
|
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
74
|
+
static bool mc_fle2IndexedEncryptedValue_encrypt(_mongocrypt_crypto_t *crypto,
|
75
|
+
const _mongocrypt_buffer_t *ClientEncryptedValue,
|
76
|
+
mc_ServerDataEncryptionLevel1Token_t *token,
|
77
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *index_tokens,
|
78
|
+
_mongocrypt_buffer_t *out,
|
79
|
+
mongocrypt_status_t *status);
|
80
|
+
|
81
|
+
bool safe_uint32_t_sum(const uint32_t a, const uint32_t b, uint32_t *out, mongocrypt_status_t *status) {
|
82
|
+
if (a > UINT32_MAX - b) {
|
83
|
+
CLIENT_ERR("safe_uint32_t_sum overflow, %" PRIu32 ", %" PRIu32, a, b);
|
84
|
+
return false;
|
85
|
+
}
|
86
|
+
*out = a + b;
|
87
|
+
return true;
|
88
|
+
}
|
89
|
+
|
90
|
+
bool mc_FLE2IndexedEncryptedValue_write(_mongocrypt_crypto_t *crypto,
|
91
|
+
const bson_type_t original_bson_type,
|
92
|
+
const _mongocrypt_buffer_t *S_KeyId,
|
93
|
+
const _mongocrypt_buffer_t *ClientEncryptedValue,
|
94
|
+
mc_ServerDataEncryptionLevel1Token_t *token,
|
95
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *index_tokens,
|
96
|
+
_mongocrypt_buffer_t *buf,
|
97
|
+
mongocrypt_status_t *status) {
|
98
|
+
#define CHECK_AND_GOTO(x) \
|
99
|
+
if (!(x)) { \
|
100
|
+
goto cleanup; \
|
101
|
+
}
|
102
|
+
|
103
|
+
const _mongocrypt_value_encryption_algorithm_t *fle2alg = _mcFLE2Algorithm();
|
104
|
+
bool ok = false;
|
105
|
+
|
106
|
+
BSON_ASSERT_PARAM(crypto);
|
107
|
+
BSON_ASSERT_PARAM(index_tokens);
|
108
|
+
BSON_ASSERT_PARAM(S_KeyId);
|
109
|
+
BSON_ASSERT_PARAM(ClientEncryptedValue);
|
110
|
+
BSON_ASSERT_PARAM(token);
|
111
|
+
BSON_ASSERT_PARAM(index_tokens);
|
112
|
+
BSON_ASSERT_PARAM(buf);
|
113
|
+
|
114
|
+
if (ClientEncryptedValue->len == 0) {
|
115
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_write iev must have an encrypted value");
|
116
|
+
return ok;
|
117
|
+
}
|
118
|
+
|
119
|
+
if (S_KeyId->len == 0) {
|
120
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_write iev SKeyId must have value");
|
121
|
+
return ok;
|
122
|
+
}
|
123
|
+
|
124
|
+
_mongocrypt_buffer_t encryption_out;
|
125
|
+
_mongocrypt_buffer_init(&encryption_out);
|
126
|
+
|
127
|
+
CHECK_AND_GOTO(mc_fle2IndexedEncryptedValue_encrypt(crypto,
|
128
|
+
ClientEncryptedValue,
|
129
|
+
token,
|
130
|
+
index_tokens,
|
131
|
+
&encryption_out,
|
132
|
+
status));
|
133
|
+
uint32_t expected_plaintext_size = 0;
|
134
|
+
CHECK_AND_GOTO(safe_uint32_t_sum(ClientEncryptedValue->len,
|
135
|
+
(uint32_t)(sizeof(uint64_t) * 2 + sizeof(uint32_t) * 3),
|
136
|
+
&expected_plaintext_size,
|
137
|
+
status));
|
138
|
+
|
139
|
+
uint32_t expected_cipher_size = fle2alg->get_ciphertext_len(expected_plaintext_size, status);
|
140
|
+
|
141
|
+
if (expected_cipher_size == 0) {
|
142
|
+
CHECK_AND_GOTO(false);
|
143
|
+
}
|
144
|
+
|
145
|
+
uint32_t expected_buf_size = 0;
|
146
|
+
CHECK_AND_RETURN(
|
147
|
+
safe_uint32_t_sum(expected_cipher_size, (uint32_t)(1 + sizeof(S_KeyId)), &expected_buf_size, status));
|
148
|
+
|
149
|
+
if (buf->len < expected_buf_size) {
|
150
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_write buf is not large enough for iev");
|
151
|
+
CHECK_AND_GOTO(false);
|
152
|
+
}
|
153
|
+
|
154
|
+
mc_writer_t writer;
|
155
|
+
mc_writer_init_from_buffer(&writer, buf, __FUNCTION__);
|
156
|
+
|
157
|
+
const uint8_t subtype = (uint8_t)MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue;
|
158
|
+
|
159
|
+
if (((int)original_bson_type < 0) || ((int)original_bson_type > 0xFF)) {
|
160
|
+
CLIENT_ERR("Field 't' must be a valid BSON type, got: %d", original_bson_type);
|
161
|
+
CHECK_AND_GOTO(false);
|
162
|
+
}
|
163
|
+
|
164
|
+
const uint8_t bson_type = (uint8_t)original_bson_type;
|
165
|
+
|
166
|
+
CHECK_AND_GOTO(mc_writer_write_u8(&writer, subtype, status));
|
167
|
+
CHECK_AND_GOTO(mc_writer_write_buffer(&writer, S_KeyId, S_KeyId->len, status));
|
168
|
+
CHECK_AND_GOTO(mc_writer_write_u8(&writer, bson_type, status));
|
169
|
+
|
170
|
+
CHECK_AND_GOTO(mc_writer_write_buffer(&writer, &encryption_out, encryption_out.len, status));
|
171
|
+
|
172
|
+
ok = true;
|
173
|
+
|
174
|
+
cleanup:
|
175
|
+
_mongocrypt_buffer_cleanup(&encryption_out);
|
176
|
+
return ok;
|
177
|
+
#undef CHECK_AND_GOTO
|
114
178
|
}
|
115
179
|
|
116
|
-
static bool
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
180
|
+
static bool mc_fle2IndexedEncryptedValue_encrypt(_mongocrypt_crypto_t *crypto,
|
181
|
+
const _mongocrypt_buffer_t *ClientEncryptedValue,
|
182
|
+
mc_ServerDataEncryptionLevel1Token_t *token,
|
183
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *index_tokens,
|
184
|
+
_mongocrypt_buffer_t *out,
|
185
|
+
mongocrypt_status_t *status) {
|
186
|
+
#define CHECK_AND_GOTO(x) \
|
187
|
+
if (!(x)) { \
|
188
|
+
goto cleanup; \
|
189
|
+
}
|
190
|
+
|
191
|
+
const _mongocrypt_value_encryption_algorithm_t *fle2alg = _mcFLE2Algorithm();
|
192
|
+
bool ok = false;
|
193
|
+
_mongocrypt_buffer_t in;
|
194
|
+
_mongocrypt_buffer_t iv;
|
195
|
+
|
196
|
+
_mongocrypt_buffer_init(&in);
|
197
|
+
_mongocrypt_buffer_init_size(&iv, MONGOCRYPT_IV_LEN);
|
198
|
+
|
199
|
+
uint32_t expected_buf_size = 0;
|
200
|
+
CHECK_AND_GOTO(safe_uint32_t_sum(ClientEncryptedValue->len,
|
201
|
+
(uint32_t)(sizeof(uint64_t) * 2 + (32 * 3)),
|
202
|
+
&expected_buf_size,
|
203
|
+
status));
|
204
|
+
|
205
|
+
_mongocrypt_buffer_resize(&in, expected_buf_size);
|
206
|
+
|
207
|
+
uint32_t ciphertext_len = fle2alg->get_ciphertext_len(expected_buf_size, status);
|
208
|
+
|
209
|
+
if (ciphertext_len == 0) {
|
210
|
+
return false;
|
211
|
+
}
|
212
|
+
|
213
|
+
_mongocrypt_buffer_resize(out, ciphertext_len);
|
214
|
+
|
215
|
+
mc_writer_t writer;
|
216
|
+
mc_writer_init_from_buffer(&writer, &in, __FUNCTION__);
|
217
|
+
|
218
|
+
uint64_t length;
|
219
|
+
length = ClientEncryptedValue->len;
|
220
|
+
CHECK_AND_GOTO(mc_writer_write_u64(&writer, length, status));
|
221
|
+
|
222
|
+
CHECK_AND_GOTO(mc_writer_write_buffer(&writer, ClientEncryptedValue, ClientEncryptedValue->len, status));
|
223
|
+
|
224
|
+
CHECK_AND_GOTO(mc_writer_write_u64(&writer, index_tokens->counter, status));
|
225
|
+
|
226
|
+
CHECK_AND_GOTO(mc_writer_write_prfblock_buffer(&writer, &index_tokens->edc, status));
|
227
|
+
|
228
|
+
CHECK_AND_GOTO(mc_writer_write_prfblock_buffer(&writer, &index_tokens->esc, status));
|
229
|
+
|
230
|
+
CHECK_AND_GOTO(mc_writer_write_prfblock_buffer(&writer, &index_tokens->ecc, status));
|
231
|
+
|
232
|
+
const _mongocrypt_buffer_t *token_buf = mc_ServerDataEncryptionLevel1Token_get(token);
|
233
|
+
|
234
|
+
uint32_t bytes_written;
|
235
|
+
|
236
|
+
CHECK_AND_GOTO(_mongocrypt_random(crypto, &iv, MONGOCRYPT_IV_LEN, status));
|
237
|
+
|
238
|
+
CHECK_AND_GOTO(fle2alg->do_encrypt(crypto, &iv, NULL /* aad */, token_buf, &in, out, &bytes_written, status));
|
239
|
+
|
240
|
+
ok = true;
|
241
|
+
|
242
|
+
cleanup:
|
243
|
+
_mongocrypt_buffer_cleanup(&iv);
|
244
|
+
_mongocrypt_buffer_cleanup(&in);
|
245
|
+
return ok;
|
246
|
+
#undef CHECK_AND_GOTO
|
247
|
+
}
|
248
|
+
|
249
|
+
bool mc_FLE2IndexedEncryptedValue_parse(mc_FLE2IndexedEncryptedValue_t *iev,
|
250
|
+
const _mongocrypt_buffer_t *buf,
|
251
|
+
mongocrypt_status_t *status) {
|
252
|
+
BSON_ASSERT_PARAM(iev);
|
253
|
+
BSON_ASSERT_PARAM(buf);
|
254
|
+
|
255
|
+
if (iev->parsed) {
|
256
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_parse must not be called twice");
|
257
|
+
return false;
|
258
|
+
}
|
259
|
+
|
260
|
+
mc_reader_t reader;
|
261
|
+
mc_reader_init_from_buffer(&reader, buf, __FUNCTION__);
|
262
|
+
|
263
|
+
CHECK_AND_RETURN(mc_reader_read_u8(&reader, &iev->fle_blob_subtype, status));
|
264
|
+
|
265
|
+
if (iev->fle_blob_subtype != MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue
|
266
|
+
&& iev->fle_blob_subtype != MC_SUBTYPE_FLE2IndexedRangeEncryptedValue) {
|
267
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_parse expected "
|
268
|
+
"fle_blob_subtype %d or %d got: %" PRIu8,
|
269
|
+
MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue,
|
270
|
+
MC_SUBTYPE_FLE2IndexedRangeEncryptedValue,
|
271
|
+
iev->fle_blob_subtype);
|
272
|
+
return false;
|
273
|
+
}
|
274
|
+
|
275
|
+
/* Read S_KeyId. */
|
276
|
+
CHECK_AND_RETURN(mc_reader_read_uuid_buffer(&reader, &iev->S_KeyId, status));
|
277
|
+
|
278
|
+
/* Read original_bson_type. */
|
279
|
+
CHECK_AND_RETURN(mc_reader_read_u8(&reader, &iev->original_bson_type, status));
|
280
|
+
|
281
|
+
/* Read InnerEncrypted. */
|
282
|
+
CHECK_AND_RETURN(mc_reader_read_buffer_to_end(&reader, &iev->InnerEncrypted, status));
|
283
|
+
|
284
|
+
iev->parsed = true;
|
285
|
+
return true;
|
286
|
+
}
|
287
|
+
|
288
|
+
const _mongocrypt_buffer_t *mc_FLE2IndexedEncryptedValue_get_S_KeyId(const mc_FLE2IndexedEncryptedValue_t *iev,
|
289
|
+
mongocrypt_status_t *status) {
|
290
|
+
BSON_ASSERT_PARAM(iev);
|
291
|
+
|
292
|
+
if (!iev->parsed) {
|
293
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_get_S_KeyId must be "
|
294
|
+
"called after mc_FLE2IndexedEncryptedValue_parse");
|
295
|
+
return NULL;
|
296
|
+
}
|
297
|
+
|
298
|
+
return &iev->S_KeyId;
|
299
|
+
}
|
300
|
+
|
301
|
+
static bool mc_FLE2IndexedEncryptedValue_decrypt(_mongocrypt_crypto_t *crypto,
|
302
|
+
mc_FLE2IndexedEncryptedValue_t *iev,
|
303
|
+
mc_ServerDataEncryptionLevel1Token_t *token,
|
304
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *indexed_tokens,
|
305
|
+
mongocrypt_status_t *status);
|
306
|
+
|
307
|
+
bool mc_FLE2IndexedEncryptedValue_add_S_Key(_mongocrypt_crypto_t *crypto,
|
308
|
+
mc_FLE2IndexedEncryptedValue_t *iev,
|
309
|
+
const _mongocrypt_buffer_t *S_Key,
|
310
|
+
mongocrypt_status_t *status) {
|
311
|
+
BSON_ASSERT_PARAM(crypto);
|
312
|
+
BSON_ASSERT_PARAM(iev);
|
313
|
+
BSON_ASSERT_PARAM(S_Key);
|
314
|
+
|
315
|
+
/* Attempt to decrypt InnerEncrypted */
|
316
|
+
if (S_Key->len != MONGOCRYPT_KEY_LEN) {
|
317
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_add_S_Key expected "
|
318
|
+
"S_Key to be %d bytes, got: %" PRIu32,
|
319
|
+
MONGOCRYPT_KEY_LEN,
|
320
|
+
S_Key->len);
|
321
|
+
return false;
|
322
|
+
}
|
323
|
+
|
324
|
+
/* Get the TokenKey from the last 32 bytes of S_Key */
|
325
|
+
_mongocrypt_buffer_t TokenKey;
|
326
|
+
if (!_mongocrypt_buffer_from_subrange(&TokenKey,
|
146
327
|
S_Key,
|
147
328
|
S_Key->len - MONGOCRYPT_TOKEN_KEY_LEN,
|
148
329
|
MONGOCRYPT_TOKEN_KEY_LEN)) {
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
330
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_add_S_Key unable to "
|
331
|
+
"parse TokenKey from S_Key");
|
332
|
+
return false;
|
333
|
+
}
|
153
334
|
|
154
|
-
|
155
|
-
|
335
|
+
/* Use TokenKey to create ServerDataEncryptionLevel1Token and decrypt
|
336
|
+
* InnerEncrypted. */
|
156
337
|
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
}
|
338
|
+
mc_ServerDataEncryptionLevel1Token_t *token = mc_ServerDataEncryptionLevel1Token_new(crypto, &TokenKey, status);
|
339
|
+
if (!token) {
|
340
|
+
return false;
|
341
|
+
}
|
162
342
|
|
163
|
-
|
164
|
-
mc_FLE2IndexedEncryptedValue_decrypt (crypto, iev, token, NULL, status);
|
343
|
+
bool ret = mc_FLE2IndexedEncryptedValue_decrypt(crypto, iev, token, NULL, status);
|
165
344
|
|
166
|
-
|
345
|
+
mc_ServerDataEncryptionLevel1Token_destroy(token);
|
167
346
|
|
168
|
-
|
347
|
+
return ret;
|
169
348
|
}
|
170
349
|
|
171
|
-
static bool
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
mc_reader_read_u64 (&reader, &indexed_tokens->counter, status));
|
245
|
-
|
246
|
-
CHECK_AND_RETURN (mc_reader_read_prfblock_buffer (
|
247
|
-
&reader, &indexed_tokens->edc, status));
|
248
|
-
|
249
|
-
CHECK_AND_RETURN (mc_reader_read_prfblock_buffer (
|
250
|
-
&reader, &indexed_tokens->esc, status));
|
251
|
-
|
252
|
-
CHECK_AND_RETURN (mc_reader_read_prfblock_buffer (
|
253
|
-
&reader, &indexed_tokens->ecc, status));
|
254
|
-
}
|
255
|
-
|
256
|
-
iev->inner_decrypted = true;
|
257
|
-
return true;
|
350
|
+
static bool mc_FLE2IndexedEncryptedValue_decrypt(_mongocrypt_crypto_t *crypto,
|
351
|
+
mc_FLE2IndexedEncryptedValue_t *iev,
|
352
|
+
mc_ServerDataEncryptionLevel1Token_t *token,
|
353
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *indexed_tokens,
|
354
|
+
mongocrypt_status_t *status) {
|
355
|
+
const _mongocrypt_value_encryption_algorithm_t *fle2alg = _mcFLE2Algorithm();
|
356
|
+
BSON_ASSERT_PARAM(crypto);
|
357
|
+
BSON_ASSERT_PARAM(iev);
|
358
|
+
BSON_ASSERT_PARAM(token);
|
359
|
+
|
360
|
+
if (!iev->parsed) {
|
361
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_decrypt must be "
|
362
|
+
"called after mc_FLE2IndexedEncryptedValue_parse");
|
363
|
+
return false;
|
364
|
+
}
|
365
|
+
|
366
|
+
if (iev->inner_decrypted) {
|
367
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_decrypt must not be "
|
368
|
+
"called twice");
|
369
|
+
return false;
|
370
|
+
}
|
371
|
+
|
372
|
+
const _mongocrypt_buffer_t *token_buf = mc_ServerDataEncryptionLevel1Token_get(token);
|
373
|
+
uint32_t bytes_written;
|
374
|
+
|
375
|
+
_mongocrypt_buffer_resize(&iev->Inner, fle2alg->get_plaintext_len(iev->InnerEncrypted.len, status));
|
376
|
+
|
377
|
+
/* Decrypt InnerEncrypted. */
|
378
|
+
if (!fle2alg->do_decrypt(crypto,
|
379
|
+
NULL /* aad */,
|
380
|
+
token_buf,
|
381
|
+
&iev->InnerEncrypted,
|
382
|
+
&iev->Inner,
|
383
|
+
&bytes_written,
|
384
|
+
status)) {
|
385
|
+
return false;
|
386
|
+
}
|
387
|
+
|
388
|
+
mc_reader_t reader;
|
389
|
+
mc_reader_init_from_buffer(&reader, &iev->Inner, __FUNCTION__);
|
390
|
+
|
391
|
+
/* Parse Inner for K_KeyId. */
|
392
|
+
uint64_t length; /* length is sizeof(K_KeyId) + ClientEncryptedValue_length. */
|
393
|
+
CHECK_AND_RETURN(mc_reader_read_u64(&reader, &length, status));
|
394
|
+
|
395
|
+
/* Read K_KeyId. */
|
396
|
+
CHECK_AND_RETURN(mc_reader_read_uuid_buffer(&reader, &iev->K_KeyId, status));
|
397
|
+
|
398
|
+
/* Read ClientEncryptedValue. */
|
399
|
+
uint64_t expected_length = mc_reader_get_consumed_length(&reader) + length - 16;
|
400
|
+
if (length > iev->Inner.len || expected_length > iev->Inner.len) {
|
401
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_decrypt expected "
|
402
|
+
"byte length >= %" PRIu64 " got: %" PRIu32,
|
403
|
+
expected_length,
|
404
|
+
iev->Inner.len);
|
405
|
+
return false;
|
406
|
+
}
|
407
|
+
|
408
|
+
CHECK_AND_RETURN(mc_reader_read_buffer(&reader, &iev->ClientEncryptedValue, length - 16, status));
|
409
|
+
|
410
|
+
// Caller has asked us to parse the other tokens
|
411
|
+
if (indexed_tokens != NULL) {
|
412
|
+
CHECK_AND_RETURN(mc_reader_read_u64(&reader, &indexed_tokens->counter, status));
|
413
|
+
|
414
|
+
CHECK_AND_RETURN(mc_reader_read_prfblock_buffer(&reader, &indexed_tokens->edc, status));
|
415
|
+
|
416
|
+
CHECK_AND_RETURN(mc_reader_read_prfblock_buffer(&reader, &indexed_tokens->esc, status));
|
417
|
+
|
418
|
+
CHECK_AND_RETURN(mc_reader_read_prfblock_buffer(&reader, &indexed_tokens->ecc, status));
|
419
|
+
}
|
420
|
+
|
421
|
+
iev->inner_decrypted = true;
|
422
|
+
return true;
|
258
423
|
}
|
259
424
|
|
260
|
-
bool
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
BSON_ASSERT (iev->fle_blob_subtype ==
|
269
|
-
MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue);
|
270
|
-
|
271
|
-
return mc_FLE2IndexedEncryptedValue_decrypt (
|
272
|
-
crypto, iev, token, indexed_tokens, status);
|
425
|
+
bool mc_FLE2IndexedEncryptedValue_decrypt_equality(_mongocrypt_crypto_t *crypto,
|
426
|
+
mc_FLE2IndexedEncryptedValue_t *iev,
|
427
|
+
mc_ServerDataEncryptionLevel1Token_t *token,
|
428
|
+
mc_FLE2IndexedEqualityEncryptedValueTokens *indexed_tokens,
|
429
|
+
mongocrypt_status_t *status) {
|
430
|
+
BSON_ASSERT(iev->fle_blob_subtype == MC_SUBTYPE_FLE2IndexedEqualityEncryptedValue);
|
431
|
+
|
432
|
+
return mc_FLE2IndexedEncryptedValue_decrypt(crypto, iev, token, indexed_tokens, status);
|
273
433
|
}
|
274
434
|
|
275
|
-
const _mongocrypt_buffer_t *
|
276
|
-
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
}
|
286
|
-
return &iev->K_KeyId;
|
435
|
+
const _mongocrypt_buffer_t *mc_FLE2IndexedEncryptedValue_get_K_KeyId(const mc_FLE2IndexedEncryptedValue_t *iev,
|
436
|
+
mongocrypt_status_t *status) {
|
437
|
+
BSON_ASSERT_PARAM(iev);
|
438
|
+
|
439
|
+
if (!iev->inner_decrypted) {
|
440
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_get_K_KeyId must be called "
|
441
|
+
"after mc_FLE2IndexedEncryptedValue_add_S_Key");
|
442
|
+
return NULL;
|
443
|
+
}
|
444
|
+
return &iev->K_KeyId;
|
287
445
|
}
|
288
446
|
|
289
|
-
bool
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
|
297
|
-
|
298
|
-
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
308
|
-
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
status)) {
|
323
|
-
return false;
|
324
|
-
}
|
325
|
-
iev->client_value_decrypted = true;
|
326
|
-
return true;
|
447
|
+
bool mc_FLE2IndexedEncryptedValue_add_K_Key(_mongocrypt_crypto_t *crypto,
|
448
|
+
mc_FLE2IndexedEncryptedValue_t *iev,
|
449
|
+
const _mongocrypt_buffer_t *K_Key,
|
450
|
+
mongocrypt_status_t *status) {
|
451
|
+
const _mongocrypt_value_encryption_algorithm_t *fle2aead = _mcFLE2AEADAlgorithm();
|
452
|
+
BSON_ASSERT_PARAM(crypto);
|
453
|
+
BSON_ASSERT_PARAM(iev);
|
454
|
+
BSON_ASSERT_PARAM(K_Key);
|
455
|
+
|
456
|
+
if (!iev->inner_decrypted) {
|
457
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_add_K_Key must be called after "
|
458
|
+
"mc_FLE2IndexedEncryptedValue_add_S_Key");
|
459
|
+
return false;
|
460
|
+
}
|
461
|
+
if (iev->client_value_decrypted) {
|
462
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_add_K_Key must not be "
|
463
|
+
"called twice");
|
464
|
+
return false;
|
465
|
+
}
|
466
|
+
/* Attempt to decrypt ClientEncryptedValue */
|
467
|
+
_mongocrypt_buffer_resize(&iev->ClientValue, fle2aead->get_plaintext_len(iev->ClientEncryptedValue.len, status));
|
468
|
+
uint32_t bytes_written;
|
469
|
+
if (!fle2aead->do_decrypt(crypto,
|
470
|
+
&iev->K_KeyId,
|
471
|
+
K_Key,
|
472
|
+
&iev->ClientEncryptedValue,
|
473
|
+
&iev->ClientValue,
|
474
|
+
&bytes_written,
|
475
|
+
status)) {
|
476
|
+
return false;
|
477
|
+
}
|
478
|
+
iev->client_value_decrypted = true;
|
479
|
+
return true;
|
327
480
|
}
|
328
481
|
|
329
482
|
const _mongocrypt_buffer_t *
|
330
|
-
|
331
|
-
|
332
|
-
|
333
|
-
|
334
|
-
|
335
|
-
if (!iev->client_value_decrypted) {
|
336
|
-
CLIENT_ERR (
|
337
|
-
"mc_FLE2IndexedEqualityEncryptedValue_getClientValue must be called "
|
338
|
-
"after mc_FLE2IndexedEqualityEncryptedValue_add_K_Key");
|
339
|
-
return NULL;
|
340
|
-
}
|
341
|
-
return &iev->ClientValue;
|
483
|
+
mc_FLE2IndexedEncryptedValue_get_ClientEncryptedValue(const mc_FLE2IndexedEncryptedValue_t *iev,
|
484
|
+
mongocrypt_status_t *status) {
|
485
|
+
BSON_ASSERT_PARAM(iev);
|
486
|
+
|
487
|
+
return &iev->ClientEncryptedValue;
|
342
488
|
}
|
343
489
|
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
|
350
|
-
|
351
|
-
|
352
|
-
|
353
|
-
|
354
|
-
_mongocrypt_buffer_cleanup (&iev->ClientValue);
|
355
|
-
_mongocrypt_buffer_cleanup (&iev->ClientEncryptedValue);
|
356
|
-
bson_free (iev);
|
490
|
+
const _mongocrypt_buffer_t *mc_FLE2IndexedEncryptedValue_get_ClientValue(const mc_FLE2IndexedEncryptedValue_t *iev,
|
491
|
+
mongocrypt_status_t *status) {
|
492
|
+
BSON_ASSERT_PARAM(iev);
|
493
|
+
|
494
|
+
if (!iev->client_value_decrypted) {
|
495
|
+
CLIENT_ERR("mc_FLE2IndexedEqualityEncryptedValue_getClientValue must be called "
|
496
|
+
"after mc_FLE2IndexedEncryptedValue_add_K_Key");
|
497
|
+
return NULL;
|
498
|
+
}
|
499
|
+
return &iev->ClientValue;
|
357
500
|
}
|
358
501
|
|
359
|
-
void
|
360
|
-
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
|
365
|
-
|
366
|
-
|
367
|
-
|
368
|
-
|
369
|
-
|
370
|
-
bson_free (tokens);
|
502
|
+
void mc_FLE2IndexedEncryptedValue_destroy(mc_FLE2IndexedEncryptedValue_t *iev) {
|
503
|
+
if (!iev) {
|
504
|
+
return;
|
505
|
+
}
|
506
|
+
_mongocrypt_buffer_cleanup(&iev->S_KeyId);
|
507
|
+
_mongocrypt_buffer_cleanup(&iev->InnerEncrypted);
|
508
|
+
_mongocrypt_buffer_cleanup(&iev->Inner);
|
509
|
+
_mongocrypt_buffer_cleanup(&iev->K_KeyId);
|
510
|
+
_mongocrypt_buffer_cleanup(&iev->ClientValue);
|
511
|
+
_mongocrypt_buffer_cleanup(&iev->ClientEncryptedValue);
|
512
|
+
bson_free(iev);
|
371
513
|
}
|
372
514
|
|
373
|
-
|
374
|
-
|
375
|
-
|
376
|
-
|
377
|
-
|
378
|
-
|
379
|
-
|
380
|
-
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
515
|
+
void mc_FLE2IndexedEqualityEncryptedValueTokens_destroy(mc_FLE2IndexedEqualityEncryptedValueTokens *tokens) {
|
516
|
+
if (!tokens) {
|
517
|
+
return;
|
518
|
+
}
|
519
|
+
|
520
|
+
_mongocrypt_buffer_cleanup(&tokens->edc);
|
521
|
+
_mongocrypt_buffer_cleanup(&tokens->esc);
|
522
|
+
_mongocrypt_buffer_cleanup(&tokens->ecc);
|
523
|
+
bson_free(tokens);
|
524
|
+
}
|
525
|
+
|
526
|
+
bson_type_t mc_FLE2IndexedEncryptedValue_get_original_bson_type(const mc_FLE2IndexedEncryptedValue_t *iev,
|
527
|
+
mongocrypt_status_t *status) {
|
528
|
+
BSON_ASSERT_PARAM(iev);
|
529
|
+
|
530
|
+
if (!iev->parsed) {
|
531
|
+
CLIENT_ERR("mc_FLE2IndexedEncryptedValue_get_original_bson_type must be "
|
532
|
+
"called after mc_FLE2IndexedEncryptedValue_parse");
|
533
|
+
return 0;
|
534
|
+
}
|
535
|
+
return iev->original_bson_type;
|
385
536
|
}
|