libmongocrypt-helper 1.7.4.0.1002 → 1.8.0.0.1001

Sign up to get free protection for your applications and to get access to all the features.
Files changed (396) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/ext/libmongocrypt/libmongocrypt/CHANGELOG.md +9 -7
  4. data/ext/libmongocrypt/libmongocrypt/CMakeLists.txt +17 -23
  5. data/ext/libmongocrypt/libmongocrypt/Earthfile +374 -0
  6. data/ext/libmongocrypt/libmongocrypt/README.md +7 -7
  7. data/ext/libmongocrypt/libmongocrypt/VERSION_CURRENT +1 -1
  8. data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClient.cs +25 -6
  9. data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Library.cs +25 -3
  10. data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Example/MongoDB.Libmongocrypt.Example.csproj +1 -1
  11. data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test/BasicTests.cs +1 -1
  12. data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.cake +3 -2
  13. data/ext/libmongocrypt/libmongocrypt/bindings/cs/cs.sln +79 -0
  14. data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/build.gradle.kts +2 -2
  15. data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/java/com/mongodb/crypt/capi/MongoCryptTest.java +6 -4
  16. data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit-v2/int32/encrypted-payload.json +26 -0
  17. data/ext/libmongocrypt/libmongocrypt/bindings/node/CHANGELOG.md +24 -0
  18. data/ext/libmongocrypt/libmongocrypt/bindings/node/README.md +134 -5
  19. data/ext/libmongocrypt/libmongocrypt/bindings/node/etc/build-static.sh +3 -6
  20. data/ext/libmongocrypt/libmongocrypt/bindings/node/index.d.ts +203 -77
  21. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/autoEncrypter.js +1 -1
  22. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/clientEncryption.js +165 -43
  23. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/common.js +12 -14
  24. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/errors.js +75 -0
  25. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/index.js +34 -3
  26. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/aws.js +26 -0
  27. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/azure.js +178 -0
  28. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/gcp.js +24 -0
  29. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/index.js +54 -0
  30. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/providers/utils.js +39 -0
  31. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/stateMachine.js +9 -4
  32. data/ext/libmongocrypt/libmongocrypt/bindings/node/package-lock.json +4440 -5189
  33. data/ext/libmongocrypt/libmongocrypt/bindings/node/package.json +27 -8
  34. data/ext/libmongocrypt/libmongocrypt/bindings/node/src/mongocrypt.cc +65 -38
  35. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/autoEncrypter.test.js +4 -7
  36. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/clientEncryption.test.js +434 -42
  37. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/common.test.js +94 -0
  38. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/cryptoCallbacks.test.js +1 -45
  39. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/index.test.js +45 -0
  40. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/mongocryptdManager.test.js +1 -1
  41. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/providers/credentialsProvider.test.js +551 -0
  42. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/release.test.js +10 -3
  43. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/requirements.helper.js +23 -1
  44. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/stateMachine.test.js +1 -1
  45. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/tools/chai-addons.js +8 -0
  46. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/types/index.test-d.ts +63 -0
  47. data/ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst +26 -0
  48. data/ext/libmongocrypt/libmongocrypt/bindings/python/README.rst +2 -2
  49. data/ext/libmongocrypt/libmongocrypt/bindings/python/build-manylinux-wheel.sh +1 -1
  50. data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/binding.py +128 -238
  51. data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/compat.py +0 -27
  52. data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/explicit_encrypter.py +1 -1
  53. data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/mongocrypt.py +5 -21
  54. data/ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/version.py +2 -2
  55. data/ext/libmongocrypt/libmongocrypt/bindings/python/release.sh +5 -5
  56. data/ext/libmongocrypt/libmongocrypt/bindings/python/setup.py +14 -9
  57. data/ext/libmongocrypt/libmongocrypt/bindings/python/test/__init__.py +1 -10
  58. data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit-v2/int32/encrypted-payload.json +26 -0
  59. data/ext/libmongocrypt/libmongocrypt/bindings/python/test/test_mongocrypt.py +5 -5
  60. data/ext/libmongocrypt/libmongocrypt/bindings/python/test-requirements.txt +4 -12
  61. data/ext/libmongocrypt/libmongocrypt/cmake/ImportBSON.cmake +8 -6
  62. data/ext/libmongocrypt/libmongocrypt/cmake/IntelDFP.cmake +2 -1
  63. data/ext/libmongocrypt/libmongocrypt/cmake/Platform.cmake +50 -0
  64. data/ext/libmongocrypt/libmongocrypt/cmake/mongocrypt-config.cmake +21 -0
  65. data/ext/libmongocrypt/libmongocrypt/debian/gbp.conf +2 -2
  66. data/ext/libmongocrypt/libmongocrypt/etc/c6-vault.repo +39 -0
  67. data/ext/libmongocrypt/libmongocrypt/etc/fle2_aead_generate_tests.py +15 -24
  68. data/ext/libmongocrypt/libmongocrypt/etc/fle2_crypto.py +66 -54
  69. data/ext/libmongocrypt/libmongocrypt/etc/fle2_generate_tests.py +14 -23
  70. data/ext/libmongocrypt/libmongocrypt/etc/fle2v2_aead_generate_tests.py +32 -0
  71. data/ext/libmongocrypt/libmongocrypt/etc/format-all.sh +12 -0
  72. data/ext/libmongocrypt/libmongocrypt/etc/format.sh +16 -0
  73. data/ext/libmongocrypt/libmongocrypt/etc/install-package.sh +48 -0
  74. data/ext/libmongocrypt/libmongocrypt/etc/mongo-inteldfp-libmongocrypt-pr-625.patch +13 -0
  75. data/ext/libmongocrypt/libmongocrypt/src/crypto/cng.c +381 -436
  76. data/ext/libmongocrypt/libmongocrypt/src/crypto/commoncrypto.c +162 -227
  77. data/ext/libmongocrypt/libmongocrypt/src/crypto/libcrypto.c +180 -248
  78. data/ext/libmongocrypt/libmongocrypt/src/crypto/none.c +33 -55
  79. data/ext/libmongocrypt/libmongocrypt/src/csfle-markup.cpp +175 -205
  80. data/ext/libmongocrypt/libmongocrypt/src/mc-array-private.h +10 -21
  81. data/ext/libmongocrypt/libmongocrypt/src/mc-array.c +44 -56
  82. data/ext/libmongocrypt/libmongocrypt/src/mc-check-conversions-private.h +4 -8
  83. data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.h +351 -463
  84. data/ext/libmongocrypt/libmongocrypt/src/mc-dec128.test.cpp +59 -66
  85. data/ext/libmongocrypt/libmongocrypt/src/mc-efc-private.h +7 -11
  86. data/ext/libmongocrypt/libmongocrypt/src/mc-efc.c +80 -92
  87. data/ext/libmongocrypt/libmongocrypt/src/mc-fle-blob-subtype-private.h +18 -10
  88. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder-private.h +59 -70
  89. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-encryption-placeholder.c +384 -439
  90. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private-v2.h +41 -0
  91. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-private.h +11 -18
  92. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload-v2.c +135 -0
  93. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-equality-payload.c +109 -126
  94. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private-v2.h +88 -0
  95. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private.h +24 -27
  96. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-v2.c +137 -0
  97. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload.c +106 -125
  98. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private-v2.h +117 -0
  99. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private.h +28 -36
  100. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-v2.c +294 -0
  101. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload.c +237 -278
  102. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-private-v2.h +133 -0
  103. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-private.h +67 -56
  104. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev-v2.c +437 -0
  105. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-iev.c +476 -325
  106. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-common-private.h +69 -0
  107. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-common.c +182 -0
  108. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-private.h +23 -31
  109. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-v2-private.h +85 -0
  110. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev-v2.c +142 -0
  111. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-payload-uev.c +104 -231
  112. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-range-operator-private.h +8 -7
  113. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds-private.h +55 -56
  114. data/ext/libmongocrypt/libmongocrypt/src/mc-fle2-rfds.c +517 -580
  115. data/ext/libmongocrypt/libmongocrypt/src/mc-optional-private.h +36 -66
  116. data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation-private.h +57 -76
  117. data/ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation.c +158 -189
  118. data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding-private.h +36 -42
  119. data/ext/libmongocrypt/libmongocrypt/src/mc-range-encoding.c +515 -558
  120. data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-generator.template.h +155 -191
  121. data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover-private.h +43 -53
  122. data/ext/libmongocrypt/libmongocrypt/src/mc-range-mincover.c +170 -240
  123. data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts-private.h +29 -34
  124. data/ext/libmongocrypt/libmongocrypt/src/mc-rangeopts.c +289 -338
  125. data/ext/libmongocrypt/libmongocrypt/src/mc-reader-private.h +36 -71
  126. data/ext/libmongocrypt/libmongocrypt/src/mc-reader.c +111 -164
  127. data/ext/libmongocrypt/libmongocrypt/src/mc-tokens-private.h +55 -49
  128. data/ext/libmongocrypt/libmongocrypt/src/mc-tokens.c +109 -125
  129. data/ext/libmongocrypt/libmongocrypt/src/mc-writer-private.h +66 -0
  130. data/ext/libmongocrypt/libmongocrypt/src/mc-writer.c +141 -0
  131. data/ext/libmongocrypt/libmongocrypt/src/mlib/check.hpp +37 -55
  132. data/ext/libmongocrypt/libmongocrypt/src/mlib/endian.h +11 -11
  133. data/ext/libmongocrypt/libmongocrypt/src/mlib/error.h +27 -32
  134. data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.h +444 -499
  135. data/ext/libmongocrypt/libmongocrypt/src/mlib/int128.test.cpp +251 -334
  136. data/ext/libmongocrypt/libmongocrypt/src/mlib/macros.h +4 -5
  137. data/ext/libmongocrypt/libmongocrypt/src/mlib/path.h +196 -231
  138. data/ext/libmongocrypt/libmongocrypt/src/mlib/path.test.c +56 -79
  139. data/ext/libmongocrypt/libmongocrypt/src/mlib/str.h +411 -530
  140. data/ext/libmongocrypt/libmongocrypt/src/mlib/str.test.c +116 -131
  141. data/ext/libmongocrypt/libmongocrypt/src/mlib/thread.h +17 -26
  142. data/ext/libmongocrypt/libmongocrypt/src/mlib/user-check.h +2 -2
  143. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary-private.h +3 -6
  144. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-binary.c +31 -48
  145. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer-private.h +55 -131
  146. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-buffer.c +444 -565
  147. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-collinfo-private.h +1 -2
  148. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-collinfo.c +28 -45
  149. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key-private.h +11 -17
  150. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-key.c +103 -132
  151. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth-private.h +8 -14
  152. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-oauth.c +78 -90
  153. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache-private.h +26 -45
  154. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-cache.c +220 -273
  155. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ciphertext-private.h +13 -25
  156. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ciphertext.c +147 -166
  157. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-compat.h +2 -2
  158. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto-private.h +110 -204
  159. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-crypto.c +1137 -1565
  160. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-datakey.c +425 -472
  161. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-decrypt.c +817 -694
  162. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-encrypt.c +2394 -2697
  163. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-private.h +166 -186
  164. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-rewrap-many-datakey.c +308 -351
  165. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx.c +921 -1138
  166. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-dll-private.h +16 -24
  167. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endian-private.h +44 -58
  168. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endpoint-private.h +21 -25
  169. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-endpoint.c +167 -181
  170. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek-private.h +37 -43
  171. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kek.c +215 -253
  172. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker-private.h +73 -108
  173. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker.c +889 -1034
  174. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-private.h +27 -44
  175. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key.c +349 -402
  176. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx-private.h +92 -120
  177. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx.c +1397 -1612
  178. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log-private.h +35 -67
  179. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-log.c +49 -83
  180. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking-private.h +30 -36
  181. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking.c +1821 -1470
  182. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-mutex-private.h +7 -12
  183. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts-private.h +80 -108
  184. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-opts.c +354 -424
  185. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-private.h +101 -117
  186. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-status-private.h +3 -8
  187. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-status.c +92 -119
  188. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-traverse-util-private.h +19 -29
  189. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-traverse-util.c +136 -176
  190. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util-private.h +11 -21
  191. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-util.c +96 -135
  192. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.c +1092 -1320
  193. data/ext/libmongocrypt/libmongocrypt/src/mongocrypt.h +130 -295
  194. data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_dll.c +66 -78
  195. data/ext/libmongocrypt/libmongocrypt/src/os_posix/os_mutex.c +20 -28
  196. data/ext/libmongocrypt/libmongocrypt/src/os_win/os_dll.c +60 -73
  197. data/ext/libmongocrypt/libmongocrypt/src/os_win/os_mutex.c +8 -16
  198. data/ext/libmongocrypt/libmongocrypt/test/crypt_shared-stub.cpp +57 -87
  199. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-delete/empty/encrypted-payload-v2.json +60 -0
  200. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-delete/success/encrypted-payload-v2.json +67 -0
  201. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explain/with-csfle/encrypted-payload.json +2 -2
  202. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/find-indexed-contentionFactor1-v2.json +8 -0
  203. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/find-indexed-v2.json +8 -0
  204. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-contentionFactor1-v2.json +8 -0
  205. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-same-user-and-index-key-v2.json +8 -0
  206. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-explicit/insert-indexed-v2.json +8 -0
  207. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/cmd.json +6 -0
  208. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/encrypted-field-map.json +22 -0
  209. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/encrypted-payload.json +40 -0
  210. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-equality-v2/mongocryptd-reply.json +19 -0
  211. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/cmd.json +10 -0
  212. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/encrypted-field-map.json +27 -0
  213. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/encrypted-payload.json +41 -0
  214. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/date-v2/mongocryptd-reply.json +49 -0
  215. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/cmd.json +6 -0
  216. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/encrypted-field-map.json +30 -0
  217. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/encrypted-payload.json +50 -0
  218. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-precision-v2/mongocryptd-reply.json +58 -0
  219. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/cmd.json +6 -0
  220. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/encrypted-field-map.json +27 -0
  221. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/encrypted-payload.json +41 -0
  222. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/decimal128-v2/mongocryptd-reply.json +49 -0
  223. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/cmd.json +8 -0
  224. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/encrypted-field-map.json +30 -0
  225. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/encrypted-payload.json +44 -0
  226. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-precision-v2/mongocryptd-reply.json +52 -0
  227. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/cmd.json +8 -0
  228. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/encrypted-field-map.json +27 -0
  229. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/encrypted-payload.json +41 -0
  230. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/double-v2/mongocryptd-reply.json +49 -0
  231. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/cmd.json +8 -0
  232. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/encrypted-field-map.json +27 -0
  233. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/encrypted-payload.json +41 -0
  234. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int32-v2/mongocryptd-reply.json +49 -0
  235. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/cmd.json +8 -0
  236. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/encrypted-field-map.json +27 -0
  237. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/encrypted-payload.json +41 -0
  238. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range/int64-v2/mongocryptd-reply.json +49 -0
  239. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/double/encrypted-payload-v2.json +26 -0
  240. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/double-precision/encrypted-payload-v2.json +26 -0
  241. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32/encrypted-payload-v2.json +26 -0
  242. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload-v2.json +26 -0
  243. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-openinterval/encrypted-payload-v2.json +16 -0
  244. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert/cmd.json +1 -1
  245. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date/RNG_DATA.h +65 -65
  246. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/cmd.json +13 -0
  247. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/encrypted-field-map.json +27 -0
  248. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/encrypted-payload.json +44 -0
  249. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/date-v2/mongocryptd-reply.json +52 -0
  250. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128/RNG_DATA.h +132 -132
  251. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision/RNG_DATA.h +71 -71
  252. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/cmd.json +9 -0
  253. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/encrypted-field-map.json +30 -0
  254. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/encrypted-payload.json +53 -0
  255. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-precision-v2/mongocryptd-reply.json +61 -0
  256. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/cmd.json +9 -0
  257. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/encrypted-field-map.json +27 -0
  258. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/encrypted-payload.json +44 -0
  259. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/decimal128-v2/mongocryptd-reply.json +52 -0
  260. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double/RNG_DATA.h +68 -68
  261. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision/RNG_DATA.h +19 -19
  262. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/cmd.json +11 -0
  263. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/encrypted-field-map.json +30 -0
  264. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/encrypted-payload.json +47 -0
  265. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-precision-v2/mongocryptd-reply.json +55 -0
  266. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/cmd.json +11 -0
  267. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/encrypted-field-map.json +27 -0
  268. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/encrypted-payload.json +44 -0
  269. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/double-v2/mongocryptd-reply.json +52 -0
  270. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32/RNG_DATA.h +25 -25
  271. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/cmd.json +11 -0
  272. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/encrypted-field-map.json +27 -0
  273. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/encrypted-payload.json +44 -0
  274. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int32-v2/mongocryptd-reply.json +52 -0
  275. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64/RNG_DATA.h +65 -65
  276. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/cmd.json +11 -0
  277. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/encrypted-field-map.json +27 -0
  278. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/encrypted-payload.json +44 -0
  279. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range/int64-v2/mongocryptd-reply.json +52 -0
  280. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double/RNG_DATA.h +68 -68
  281. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double/encrypted-payload-v2.json +8 -0
  282. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double-precision/RNG_DATA.h +19 -19
  283. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/double-precision/encrypted-payload-v2.json +8 -0
  284. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32/RNG_DATA.h +25 -25
  285. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32/encrypted-payload-v2.json +8 -0
  286. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload-v2.json +8 -0
  287. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/sparsity-2/RNG_DATA.h +15 -15
  288. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/sparsity-2/encrypted-payload-v2.json +8 -0
  289. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/cmd.json +9 -0
  290. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/encrypted-field-map.json +18 -0
  291. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/encrypted-payload.json +14 -0
  292. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-unindexed-v2/mongocryptd-reply.json +41 -0
  293. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/cmd.json +9 -0
  294. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/encrypted-field-map.json +22 -0
  295. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/encrypted-payload.json +39 -0
  296. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-v2/mongocryptd-reply.json +49 -0
  297. data/ext/libmongocrypt/libmongocrypt/test/data/iev-v2/FLECrudTest-insertOneRangeV2.json +10 -0
  298. data/ext/libmongocrypt/libmongocrypt/test/data/iev-v2/FLECrudTest-insertOneV2.json +10 -0
  299. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/README.md +17 -0
  300. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/aes-ctr.json +29 -0
  301. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2-fixed.json +10 -0
  302. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2-generated.json +38 -0
  303. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-decrypt.json +35 -0
  304. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-fixed.json +29 -0
  305. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2aead-generated.json +122 -0
  306. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2v2-aead-fixed.json +29 -0
  307. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/fle2v2-aead-generated.json +122 -0
  308. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/mcgrew.json +12 -0
  309. data/ext/libmongocrypt/libmongocrypt/test/data/roundtrip/nist.json +20 -0
  310. data/ext/libmongocrypt/libmongocrypt/test/data/tokens/README.md +27 -0
  311. data/ext/libmongocrypt/libmongocrypt/test/data/tokens/mc.json +21 -0
  312. data/ext/libmongocrypt/libmongocrypt/test/data/tokens/server.json +21 -0
  313. data/ext/libmongocrypt/libmongocrypt/test/example-no-bson.c +4 -4
  314. data/ext/libmongocrypt/libmongocrypt/test/example-state-machine.c +278 -323
  315. data/ext/libmongocrypt/libmongocrypt/test/fuzz_kms.c +8 -7
  316. data/ext/libmongocrypt/libmongocrypt/test/test-dll.cpp +6 -7
  317. data/ext/libmongocrypt/libmongocrypt/test/test-gcp-auth.c +221 -283
  318. data/ext/libmongocrypt/libmongocrypt/test/test-mc-efc.c +58 -73
  319. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-equality-payload-v2.c +78 -0
  320. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-range-payload-v2.c +89 -0
  321. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev-v2.c +248 -0
  322. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev.c +467 -414
  323. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup-v2.c +172 -0
  324. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup.c +141 -159
  325. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-uev-v2.c +338 -0
  326. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-uev.c +238 -176
  327. data/ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-rfds.c +373 -474
  328. data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-edge-generation.c +346 -388
  329. data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-encoding.c +708 -825
  330. data/ext/libmongocrypt/libmongocrypt/test/test-mc-range-mincover.c +417 -481
  331. data/ext/libmongocrypt/libmongocrypt/test/test-mc-rangeopts.c +110 -144
  332. data/ext/libmongocrypt/libmongocrypt/test/test-mc-reader.c +124 -207
  333. data/ext/libmongocrypt/libmongocrypt/test/test-mc-tokens.c +223 -213
  334. data/ext/libmongocrypt/libmongocrypt/test/test-mc-writer.c +176 -0
  335. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.c +634 -807
  336. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert-match-bson.h +1 -2
  337. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-assert.h +168 -189
  338. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-buffer.c +187 -211
  339. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache-oauth.c +34 -36
  340. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-cache.c +210 -233
  341. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ciphertext.c +185 -220
  342. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-compact.c +331 -445
  343. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-hooks.c +670 -814
  344. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.c +102 -135
  345. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto-std-hooks.h +54 -71
  346. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-crypto.c +394 -846
  347. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-csfle-lib.c +159 -183
  348. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-decrypt.c +867 -1045
  349. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-encrypt.c +4349 -4713
  350. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-rewrap-many-datakey.c +750 -964
  351. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-ctx-setopt.c +991 -1178
  352. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-datakey.c +342 -419
  353. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-dll.c +23 -30
  354. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-endpoint.c +98 -111
  355. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kek.c +49 -52
  356. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key-broker.c +770 -920
  357. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key-cache.c +354 -407
  358. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-key.c +197 -245
  359. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-ctx.c +286 -370
  360. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-kms-responses.c +147 -166
  361. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-local-kms.c +50 -61
  362. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-log.c +85 -100
  363. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-marking.c +656 -692
  364. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-status.c +46 -58
  365. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-traverse-util.c +377 -451
  366. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.c +48 -67
  367. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-util.h +4 -10
  368. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.c +827 -918
  369. data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.h +111 -172
  370. data/ext/libmongocrypt/libmongocrypt/test/util/csfle.c +508 -559
  371. data/ext/libmongocrypt/libmongocrypt/test/util/util.c +735 -881
  372. data/ext/libmongocrypt/libmongocrypt/test/util/util.h +33 -55
  373. data/lib/libmongocrypt_helper/version.rb +2 -2
  374. data.tar.gz.sig +0 -0
  375. metadata +154 -26
  376. metadata.gz.sig +0 -0
  377. data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/encrypted-payload.json +0 -26
  378. data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/fle2-find-range-explicit/int32/key-document.json +0 -0
  379. data/ext/libmongocrypt/libmongocrypt/bindings/node/lib/credentialsProvider.js +0 -33
  380. data/ext/libmongocrypt/libmongocrypt/bindings/node/test/credentialsProvider.test.js +0 -163
  381. data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/fle2-find-range-explicit/int32/encrypted-payload.json +0 -26
  382. data/ext/libmongocrypt/libmongocrypt/test/data/aes-ctr.cstructs +0 -359
  383. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-aead.cstructs +0 -109
  384. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/encrypted-payload.json +0 -26
  385. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/rangeopts.json +0 -5
  386. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-find-range-explicit/int32-nominmax/value-to-encrypt.json +0 -20
  387. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/RNG_DATA.h +0 -70
  388. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/encrypted-payload.json +0 -8
  389. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/rangeopts.json +0 -5
  390. data/ext/libmongocrypt/libmongocrypt/test/data/fle2-insert-range-explicit/int32-nominmax/value-to-encrypt.json +0 -5
  391. data/ext/libmongocrypt/libmongocrypt/test/data/fle2.cstructs +0 -33
  392. /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
  393. /data/ext/libmongocrypt/libmongocrypt/bindings/java/mongocrypt/src/test/resources/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/rangeopts.json +0 -0
  394. /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
  395. /data/ext/libmongocrypt/libmongocrypt/bindings/python/test/data/{fle2-find-range-explicit → fle2-find-range-explicit-v2}/int32/rangeopts.json +0 -0
  396. /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,535 +14,461 @@
14
14
  * limitations under the License.
15
15
  */
16
16
 
17
- #include <bson/bson.h>
18
17
  #include "mongocrypt-traverse-util-private.h"
19
18
  #include "test-mongocrypt.h"
19
+ #include <bson/bson.h>
20
20
 
21
- static void
22
- _append_marking (bson_t *bson, const char *key, int key_len)
23
- {
24
- uint8_t *data;
25
- bson_t *marking_bson;
21
+ static void _append_marking(bson_t *bson, const char *key, int key_len) {
22
+ uint8_t *data;
23
+ bson_t *marking_bson;
26
24
 
27
- marking_bson = BCON_NEW ("a",
28
- BCON_INT32 (MONGOCRYPT_ENCRYPTION_ALGORITHM_RANDOM),
25
+ marking_bson = BCON_NEW("a",
26
+ BCON_INT32(MONGOCRYPT_ENCRYPTION_ALGORITHM_RANDOM),
29
27
  "v",
30
- BCON_UTF8 ("abc"),
28
+ BCON_UTF8("abc"),
31
29
  "ka",
32
- BCON_UTF8 ("Nancy"));
30
+ BCON_UTF8("Nancy"));
33
31
 
34
- data = bson_malloc0 (marking_bson->len + 1);
35
- BSON_ASSERT (data);
32
+ data = bson_malloc0(marking_bson->len + 1);
33
+ BSON_ASSERT(data);
36
34
 
37
- data[0] = 0;
38
- memcpy (data + 1, marking_bson, marking_bson->len);
35
+ data[0] = 0;
36
+ memcpy(data + 1, marking_bson, marking_bson->len);
39
37
 
40
- BSON_ASSERT (bson_append_binary (
41
- bson, key, key_len, 0x06, data, marking_bson->len + 1));
42
- bson_free (data);
43
- bson_destroy (marking_bson);
38
+ BSON_ASSERT(bson_append_binary(bson, key, key_len, 0x06, data, marking_bson->len + 1));
39
+ bson_free(data);
40
+ bson_destroy(marking_bson);
44
41
  }
45
42
 
46
- static void
47
- _append_ciphertext_with_subtype (bson_t *bson,
48
- const char *key,
49
- int key_len,
50
- int subtype,
51
- int first_byte,
52
- _mongocrypt_tester_t *tester)
53
- {
54
- uint8_t *data;
55
- char *utf8;
56
- int data_len;
57
- int key_id_len = 16;
58
-
59
- utf8 = "Mary";
60
- data_len = (int) (1 + key_id_len + 1 + strlen (utf8));
61
-
62
- data = bson_malloc0 (data_len);
63
- BSON_ASSERT (data);
64
-
65
- data[0] = first_byte;
66
- memcpy (data + 1, (TEST_BIN (16))->data, key_id_len);
67
- data[1 + key_id_len] = 0x02; /* BSON type UTF8 */
68
- memcpy (data + key_id_len + 2, utf8, strlen (utf8));
69
-
70
- BSON_ASSERT (
71
- bson_append_binary (bson, key, key_len, subtype, data, data_len));
72
-
73
- bson_free (data);
43
+ static void _append_ciphertext_with_subtype(bson_t *bson,
44
+ const char *key,
45
+ int key_len,
46
+ int subtype,
47
+ int first_byte,
48
+ _mongocrypt_tester_t *tester) {
49
+ uint8_t *data;
50
+ char *utf8;
51
+ int data_len;
52
+ int key_id_len = 16;
53
+
54
+ utf8 = "Mary";
55
+ data_len = (int)(1 + key_id_len + 1 + strlen(utf8));
56
+
57
+ data = bson_malloc0(data_len);
58
+ BSON_ASSERT(data);
59
+
60
+ data[0] = first_byte;
61
+ memcpy(data + 1, (TEST_BIN(16))->data, key_id_len);
62
+ data[1 + key_id_len] = 0x02; /* BSON type UTF8 */
63
+ memcpy(data + key_id_len + 2, utf8, strlen(utf8));
64
+
65
+ BSON_ASSERT(bson_append_binary(bson, key, key_len, subtype, data, data_len));
66
+
67
+ bson_free(data);
74
68
  }
75
69
 
76
70
  typedef enum { NEST_IN_NONE, NEST_IN_DOCUMENT, NEST_IN_ARRAY } _nesting_t;
77
71
 
78
72
  typedef struct {
79
- _mongocrypt_tester_t *tester;
80
- _nesting_t parent;
73
+ _mongocrypt_tester_t *tester;
74
+ _nesting_t parent;
81
75
  } _util_tester_t;
82
76
 
83
- static void
84
- _reset_nesting (bson_t *parent, bson_t *bson, _nesting_t nesting, char *name)
85
- {
86
- if (nesting == NEST_IN_DOCUMENT) {
87
- BSON_ASSERT (bson_append_document_end (parent, bson));
88
- bson_append_document_begin (parent, name, -1, bson);
89
- } else if (nesting == NEST_IN_ARRAY) {
90
- BSON_ASSERT (bson_append_array_end (parent, bson));
91
- bson_append_array_begin (parent, name, -1, bson);
92
- }
77
+ static void _reset_nesting(bson_t *parent, bson_t *bson, _nesting_t nesting, char *name) {
78
+ if (nesting == NEST_IN_DOCUMENT) {
79
+ BSON_ASSERT(bson_append_document_end(parent, bson));
80
+ bson_append_document_begin(parent, name, -1, bson);
81
+ } else if (nesting == NEST_IN_ARRAY) {
82
+ BSON_ASSERT(bson_append_array_end(parent, bson));
83
+ bson_append_array_begin(parent, name, -1, bson);
84
+ }
93
85
  }
94
86
 
95
- static int
96
- _field_count (bson_iter_t *iter)
97
- {
98
- int i = 0;
87
+ static int _field_count(bson_iter_t *iter) {
88
+ int i = 0;
99
89
 
100
- while (bson_iter_next (iter)) {
101
- i++;
102
- }
90
+ while (bson_iter_next(iter)) {
91
+ i++;
92
+ }
103
93
 
104
- return i;
94
+ return i;
105
95
  }
106
96
 
107
- static void
108
- _assert_correct_fields (bson_t *bson,
109
- int num_markings,
110
- int num_deterministic,
111
- int num_random,
112
- int num_binary,
113
- int num_other,
114
- _util_tester_t *tester)
115
- {
116
- char name[36];
117
- bson_iter_t iter;
118
- bson_iter_t child;
119
- int i;
120
-
121
- BSON_ASSERT (num_markings < 10);
122
- BSON_ASSERT (num_deterministic < 10);
123
- BSON_ASSERT (num_random < 10);
124
- BSON_ASSERT (num_binary < 10);
125
- BSON_ASSERT (num_other < 10);
126
-
127
- memset (name, 0, 36);
128
-
129
- if (tester->parent != NEST_IN_NONE) {
130
- for (i = 0; i < num_other; i++) {
131
- snprintf (name, 13, "other.field%d", i);
132
- bson_iter_init (&iter, bson);
133
- BSON_ASSERT (bson_iter_find_descendant (&iter, name, &child));
134
- }
135
-
136
- for (i = 0; i < num_markings; i++) {
137
- snprintf (name, 18, "markings.marking%d", i);
138
- bson_iter_init (&iter, bson);
139
- BSON_ASSERT (bson_iter_find_descendant (&iter, name, &child));
140
- }
141
- for (i = 0; i < num_random; i++) {
142
- snprintf (name, 15, "random.random%d", i);
143
- bson_iter_init (&iter, bson);
144
- BSON_ASSERT (bson_iter_find_descendant (&iter, name, &child));
145
- }
146
- for (i = 0; i < num_deterministic; i++) {
147
- snprintf (name, 29, "deterministic.deterministic%d", i);
148
- bson_iter_init (&iter, bson);
149
- BSON_ASSERT (bson_iter_find_descendant (&iter, name, &child));
150
- }
151
- for (i = 0; i < num_binary; i++) {
152
- snprintf (name, 15, "binary.binary%d", i);
153
- bson_iter_init (&iter, bson);
154
- BSON_ASSERT (bson_iter_find_descendant (&iter, name, &child));
155
- }
156
-
157
- } else {
158
- /* When there's no nesting, just count fields. */
159
- bson_iter_init (&iter, bson);
160
- BSON_ASSERT (_field_count (&iter) ==
161
- (num_other + num_binary + num_markings + num_deterministic +
162
- num_random));
163
- }
97
+ static void _assert_correct_fields(bson_t *bson,
98
+ int num_markings,
99
+ int num_deterministic,
100
+ int num_random,
101
+ int num_binary,
102
+ int num_other,
103
+ _util_tester_t *tester) {
104
+ char name[36];
105
+ bson_iter_t iter;
106
+ bson_iter_t child;
107
+ int i;
108
+
109
+ BSON_ASSERT(num_markings < 10);
110
+ BSON_ASSERT(num_deterministic < 10);
111
+ BSON_ASSERT(num_random < 10);
112
+ BSON_ASSERT(num_binary < 10);
113
+ BSON_ASSERT(num_other < 10);
114
+
115
+ memset(name, 0, 36);
116
+
117
+ if (tester->parent != NEST_IN_NONE) {
118
+ for (i = 0; i < num_other; i++) {
119
+ snprintf(name, 13, "other.field%d", i);
120
+ bson_iter_init(&iter, bson);
121
+ BSON_ASSERT(bson_iter_find_descendant(&iter, name, &child));
122
+ }
123
+
124
+ for (i = 0; i < num_markings; i++) {
125
+ snprintf(name, 18, "markings.marking%d", i);
126
+ bson_iter_init(&iter, bson);
127
+ BSON_ASSERT(bson_iter_find_descendant(&iter, name, &child));
128
+ }
129
+ for (i = 0; i < num_random; i++) {
130
+ snprintf(name, 15, "random.random%d", i);
131
+ bson_iter_init(&iter, bson);
132
+ BSON_ASSERT(bson_iter_find_descendant(&iter, name, &child));
133
+ }
134
+ for (i = 0; i < num_deterministic; i++) {
135
+ snprintf(name, 29, "deterministic.deterministic%d", i);
136
+ bson_iter_init(&iter, bson);
137
+ BSON_ASSERT(bson_iter_find_descendant(&iter, name, &child));
138
+ }
139
+ for (i = 0; i < num_binary; i++) {
140
+ snprintf(name, 15, "binary.binary%d", i);
141
+ bson_iter_init(&iter, bson);
142
+ BSON_ASSERT(bson_iter_find_descendant(&iter, name, &child));
143
+ }
144
+
145
+ } else {
146
+ /* When there's no nesting, just count fields. */
147
+ bson_iter_init(&iter, bson);
148
+ BSON_ASSERT(_field_count(&iter) == (num_other + num_binary + num_markings + num_deterministic + num_random));
149
+ }
164
150
  }
165
151
 
166
- static bson_t *
167
- _assemble_bson (int num_markings,
168
- int num_deterministic,
169
- int num_random,
170
- int num_binary,
171
- int num_other,
172
- _util_tester_t *tester)
173
- {
174
- char name[24];
175
- bson_t *parent = NULL;
176
- bson_t bson;
177
- int i;
178
-
179
- /* Field names only take single-digit add-ons, for now */
180
- BSON_ASSERT (num_markings < 10);
181
- BSON_ASSERT (num_deterministic < 10);
182
- BSON_ASSERT (num_random < 10);
183
- BSON_ASSERT (num_binary < 10);
184
- BSON_ASSERT (num_other < 10);
185
-
186
- memset (name, 0, 24);
187
-
188
- /* If we have a nesting type, nest each kind of field inside one */
189
- if (tester->parent == NEST_IN_DOCUMENT) {
190
- parent = bson_new ();
191
- bson_append_document_begin (parent, "other", -1, &bson);
192
- } else if (tester->parent == NEST_IN_ARRAY) {
193
- parent = bson_new ();
194
- bson_append_array_begin (parent, "other", -1, &bson);
195
- } else {
196
- bson_init (&bson);
197
- }
198
-
199
- /* Append some other filler fields */
200
- for (i = 0; i < num_other; i++) {
201
- snprintf (name, 7, "field%d", i);
202
- BSON_ASSERT (bson_append_utf8 (&bson, name, 6, "hi", -1));
203
- }
204
-
205
- _reset_nesting (parent, &bson, tester->parent, "markings");
206
-
207
- /* Append some number of markings */
208
- for (i = 0; i < num_markings; i++) {
209
- snprintf (name, 9, "marking%d", i);
210
- _append_marking (&bson, name, 8);
211
- }
212
-
213
- _reset_nesting (parent, &bson, tester->parent, "random");
214
-
215
- /* Append some number of random ciphertexts */
216
- for (i = 0; i < num_random; i++) {
217
- snprintf (name, 8, "random%d", i);
218
- _append_ciphertext_with_subtype (&bson,
219
- name,
220
- 7,
221
- 6,
222
- MONGOCRYPT_ENCRYPTION_ALGORITHM_RANDOM,
223
- tester->tester);
224
- }
225
-
226
- _reset_nesting (parent, &bson, tester->parent, "deterministic");
227
-
228
- /* Append some number of deterministic ciphertexts */
229
- for (i = 0; i < num_deterministic; i++) {
230
- snprintf (name, 15, "deterministic%d", i);
231
- _append_ciphertext_with_subtype (
232
- &bson,
233
- name,
234
- 14,
235
- 6,
236
- MONGOCRYPT_ENCRYPTION_ALGORITHM_DETERMINISTIC,
237
- tester->tester);
238
- }
239
-
240
- _reset_nesting (parent, &bson, tester->parent, "binary");
241
-
242
- /* Append some number of other bson subtype 6 fields */
243
- for (i = 0; i < num_binary; i++) {
244
- snprintf (name, 8, "binary%d", i);
245
- _append_ciphertext_with_subtype (&bson,
246
- name,
247
- 7,
248
- 5,
249
- MONGOCRYPT_ENCRYPTION_ALGORITHM_NONE,
250
- tester->tester);
251
- }
252
-
253
- if (tester->parent == NEST_IN_DOCUMENT) {
254
- BSON_ASSERT (bson_append_document_end (parent, &bson));
255
- return parent;
256
- } else if (tester->parent == NEST_IN_ARRAY) {
257
- BSON_ASSERT (bson_append_array_end (parent, &bson));
258
- return parent;
259
- }
260
-
261
- parent = bson_copy (&bson);
262
- bson_destroy (&bson);
263
- return parent;
152
+ static bson_t *_assemble_bson(int num_markings,
153
+ int num_deterministic,
154
+ int num_random,
155
+ int num_binary,
156
+ int num_other,
157
+ _util_tester_t *tester) {
158
+ char name[24];
159
+ bson_t *parent = NULL;
160
+ bson_t bson;
161
+ int i;
162
+
163
+ /* Field names only take single-digit add-ons, for now */
164
+ BSON_ASSERT(num_markings < 10);
165
+ BSON_ASSERT(num_deterministic < 10);
166
+ BSON_ASSERT(num_random < 10);
167
+ BSON_ASSERT(num_binary < 10);
168
+ BSON_ASSERT(num_other < 10);
169
+
170
+ memset(name, 0, 24);
171
+
172
+ /* If we have a nesting type, nest each kind of field inside one */
173
+ if (tester->parent == NEST_IN_DOCUMENT) {
174
+ parent = bson_new();
175
+ bson_append_document_begin(parent, "other", -1, &bson);
176
+ } else if (tester->parent == NEST_IN_ARRAY) {
177
+ parent = bson_new();
178
+ bson_append_array_begin(parent, "other", -1, &bson);
179
+ } else {
180
+ bson_init(&bson);
181
+ }
182
+
183
+ /* Append some other filler fields */
184
+ for (i = 0; i < num_other; i++) {
185
+ snprintf(name, 7, "field%d", i);
186
+ BSON_ASSERT(bson_append_utf8(&bson, name, 6, "hi", -1));
187
+ }
188
+
189
+ _reset_nesting(parent, &bson, tester->parent, "markings");
190
+
191
+ /* Append some number of markings */
192
+ for (i = 0; i < num_markings; i++) {
193
+ snprintf(name, 9, "marking%d", i);
194
+ _append_marking(&bson, name, 8);
195
+ }
196
+
197
+ _reset_nesting(parent, &bson, tester->parent, "random");
198
+
199
+ /* Append some number of random ciphertexts */
200
+ for (i = 0; i < num_random; i++) {
201
+ snprintf(name, 8, "random%d", i);
202
+ _append_ciphertext_with_subtype(&bson, name, 7, 6, MONGOCRYPT_ENCRYPTION_ALGORITHM_RANDOM, tester->tester);
203
+ }
204
+
205
+ _reset_nesting(parent, &bson, tester->parent, "deterministic");
206
+
207
+ /* Append some number of deterministic ciphertexts */
208
+ for (i = 0; i < num_deterministic; i++) {
209
+ snprintf(name, 15, "deterministic%d", i);
210
+ _append_ciphertext_with_subtype(&bson,
211
+ name,
212
+ 14,
213
+ 6,
214
+ MONGOCRYPT_ENCRYPTION_ALGORITHM_DETERMINISTIC,
215
+ tester->tester);
216
+ }
217
+
218
+ _reset_nesting(parent, &bson, tester->parent, "binary");
219
+
220
+ /* Append some number of other bson subtype 6 fields */
221
+ for (i = 0; i < num_binary; i++) {
222
+ snprintf(name, 8, "binary%d", i);
223
+ _append_ciphertext_with_subtype(&bson, name, 7, 5, MONGOCRYPT_ENCRYPTION_ALGORITHM_NONE, tester->tester);
224
+ }
225
+
226
+ if (tester->parent == NEST_IN_DOCUMENT) {
227
+ BSON_ASSERT(bson_append_document_end(parent, &bson));
228
+ return parent;
229
+ } else if (tester->parent == NEST_IN_ARRAY) {
230
+ BSON_ASSERT(bson_append_array_end(parent, &bson));
231
+ return parent;
232
+ }
233
+
234
+ parent = bson_copy(&bson);
235
+ bson_destroy(&bson);
236
+ return parent;
264
237
  }
265
238
 
266
- static bool
267
- test_traverse_cb (void *ctx,
268
- _mongocrypt_buffer_t *in,
269
- mongocrypt_status_t *status)
270
- {
271
- int *matched = (int *) ctx;
239
+ static bool test_traverse_cb(void *ctx, _mongocrypt_buffer_t *in, mongocrypt_status_t *status) {
240
+ int *matched = (int *)ctx;
272
241
 
273
- *matched += 1;
242
+ *matched += 1;
274
243
 
275
- return true;
244
+ return true;
276
245
  }
277
246
 
278
- static void
279
- test_traverse (int num_markings,
280
- int num_deterministic,
281
- int num_random,
282
- int num_binary,
283
- int num_other,
284
- traversal_match_t match,
285
- _util_tester_t *tester,
286
- int num_matches)
287
- {
288
- mongocrypt_status_t *status;
289
- bson_iter_t iter;
290
- bson_t *bson;
291
- int matched = 0;
292
-
293
- status = mongocrypt_status_new ();
294
- /* First, assemble the requested bson document */
295
- bson = _assemble_bson (num_markings,
296
- num_deterministic,
297
- num_random,
298
- num_binary,
299
- num_other,
300
- tester);
301
-
302
- /* Traverse */
303
- BSON_ASSERT (bson_iter_init (&iter, bson));
304
- BSON_ASSERT (_mongocrypt_traverse_binary_in_bson (
305
- test_traverse_cb, &matched, match, &iter, status));
306
-
307
- /* Count matches */
308
- BSON_ASSERT (matched == num_matches);
309
-
310
- bson_destroy (bson);
311
- mongocrypt_status_destroy (status);
247
+ static void test_traverse(int num_markings,
248
+ int num_deterministic,
249
+ int num_random,
250
+ int num_binary,
251
+ int num_other,
252
+ traversal_match_t match,
253
+ _util_tester_t *tester,
254
+ int num_matches) {
255
+ mongocrypt_status_t *status;
256
+ bson_iter_t iter;
257
+ bson_t *bson;
258
+ int matched = 0;
259
+
260
+ status = mongocrypt_status_new();
261
+ /* First, assemble the requested bson document */
262
+ bson = _assemble_bson(num_markings, num_deterministic, num_random, num_binary, num_other, tester);
263
+
264
+ /* Traverse */
265
+ BSON_ASSERT(bson_iter_init(&iter, bson));
266
+ BSON_ASSERT(_mongocrypt_traverse_binary_in_bson(test_traverse_cb, &matched, match, &iter, status));
267
+
268
+ /* Count matches */
269
+ BSON_ASSERT(matched == num_matches);
270
+
271
+ bson_destroy(bson);
272
+ mongocrypt_status_destroy(status);
312
273
  }
313
274
 
314
- static void
315
- test_mongocrypt_traverse_util_nesting (_util_tester_t *tester)
316
- {
317
- /* Empty document */
318
- test_traverse (0, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
319
- test_traverse (0, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
275
+ static void test_mongocrypt_traverse_util_nesting(_util_tester_t *tester) {
276
+ /* Empty document */
277
+ test_traverse(0, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
278
+ test_traverse(0, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
320
279
 
321
- /* Document with only non-binary fields */
322
- test_traverse (0, 0, 0, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
323
- test_traverse (0, 0, 0, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
280
+ /* Document with only non-binary fields */
281
+ test_traverse(0, 0, 0, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
282
+ test_traverse(0, 0, 0, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
324
283
 
325
- /* Document with only binary fields that aren't subtype 0x06 */
326
- test_traverse (0, 0, 0, 2, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
327
- test_traverse (0, 0, 0, 2, 0, TRAVERSE_MATCH_MARKING, tester, 0);
284
+ /* Document with only binary fields that aren't subtype 0x06 */
285
+ test_traverse(0, 0, 0, 2, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
286
+ test_traverse(0, 0, 0, 2, 0, TRAVERSE_MATCH_MARKING, tester, 0);
328
287
 
329
- /* Document with a single marking */
330
- test_traverse (1, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
331
- test_traverse (1, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 1);
288
+ /* Document with a single marking */
289
+ test_traverse(1, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
290
+ test_traverse(1, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 1);
332
291
 
333
- /* Document with multiple markings */
334
- test_traverse (3, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
335
- test_traverse (3, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 3);
292
+ /* Document with multiple markings */
293
+ test_traverse(3, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
294
+ test_traverse(3, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 3);
336
295
 
337
- /* Document with multiple markings and other fields */
338
- test_traverse (2, 0, 0, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
339
- test_traverse (2, 0, 0, 1, 1, TRAVERSE_MATCH_MARKING, tester, 2);
296
+ /* Document with multiple markings and other fields */
297
+ test_traverse(2, 0, 0, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
298
+ test_traverse(2, 0, 0, 1, 1, TRAVERSE_MATCH_MARKING, tester, 2);
340
299
 
341
- /* Document with a single random ciphertext */
342
- test_traverse (0, 0, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
343
- test_traverse (0, 0, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
300
+ /* Document with a single random ciphertext */
301
+ test_traverse(0, 0, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
302
+ test_traverse(0, 0, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
344
303
 
345
- /* Document with a single deterministic ciphertext */
346
- test_traverse (0, 1, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
347
- test_traverse (0, 1, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
304
+ /* Document with a single deterministic ciphertext */
305
+ test_traverse(0, 1, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
306
+ test_traverse(0, 1, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
348
307
 
349
- /* Document with multiple ciphertexts */
350
- test_traverse (0, 1, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
351
- test_traverse (0, 1, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
308
+ /* Document with multiple ciphertexts */
309
+ test_traverse(0, 1, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
310
+ test_traverse(0, 1, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
352
311
 
353
- /* Document with multiple ciphertexts and other fields */
354
- test_traverse (0, 1, 2, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 3);
355
- test_traverse (0, 1, 2, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
312
+ /* Document with multiple ciphertexts and other fields */
313
+ test_traverse(0, 1, 2, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 3);
314
+ test_traverse(0, 1, 2, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
356
315
 
357
- /* Documents with all types of fields */
358
- test_traverse (1, 1, 1, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
359
- test_traverse (1, 1, 1, 1, 1, TRAVERSE_MATCH_MARKING, tester, 1);
316
+ /* Documents with all types of fields */
317
+ test_traverse(1, 1, 1, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
318
+ test_traverse(1, 1, 1, 1, 1, TRAVERSE_MATCH_MARKING, tester, 1);
360
319
  }
361
320
 
362
- static bool
363
- post_transform_traverse_check (void *ctx,
364
- _mongocrypt_buffer_t *in,
365
- mongocrypt_status_t *status)
366
- {
367
- int *matches = (int *) ctx;
368
- uint8_t *message;
369
-
370
- message = in->data;
371
- message += 1;
372
- if (memcmp ("secretmessage", message, 13) == 0) {
373
- *matches += 1;
374
- }
375
-
376
- return true;
321
+ static bool post_transform_traverse_check(void *ctx, _mongocrypt_buffer_t *in, mongocrypt_status_t *status) {
322
+ int *matches = (int *)ctx;
323
+ uint8_t *message;
324
+
325
+ message = in->data;
326
+ message += 1;
327
+ if (memcmp("secretmessage", message, 13) == 0) {
328
+ *matches += 1;
329
+ }
330
+
331
+ return true;
377
332
  }
378
333
 
379
- static bool
380
- test_transform_cb (void *ctx,
381
- _mongocrypt_buffer_t *in,
382
- bson_value_t *out,
383
- mongocrypt_status_t *status)
384
- {
385
- int *matches = (int *) ctx;
334
+ static bool test_transform_cb(void *ctx, _mongocrypt_buffer_t *in, bson_value_t *out, mongocrypt_status_t *status) {
335
+ int *matches = (int *)ctx;
386
336
 
387
- *matches += 1;
337
+ *matches += 1;
388
338
 
389
- /* When we transform, keep first byte so we get the
390
- same number of matches in the followup traverse */
391
- out->value_type = BSON_TYPE_BINARY;
392
- out->value.v_binary.subtype = 6;
393
- out->value.v_binary.data = bson_malloc0 (14);
394
- BSON_ASSERT (out->value.v_binary.data);
339
+ /* When we transform, keep first byte so we get the
340
+ same number of matches in the followup traverse */
341
+ out->value_type = BSON_TYPE_BINARY;
342
+ out->value.v_binary.subtype = 6;
343
+ out->value.v_binary.data = bson_malloc0(14);
344
+ BSON_ASSERT(out->value.v_binary.data);
395
345
 
396
- out->value.v_binary.data[0] = in->data[0];
397
- memcpy (out->value.v_binary.data + 1, "secretmessage", 13);
398
- out->value.v_binary.data_len = 14;
346
+ out->value.v_binary.data[0] = in->data[0];
347
+ memcpy(out->value.v_binary.data + 1, "secretmessage", 13);
348
+ out->value.v_binary.data_len = 14;
399
349
 
400
- return true;
350
+ return true;
401
351
  }
402
352
 
403
- static void
404
- test_transform (int num_markings,
405
- int num_deterministic,
406
- int num_random,
407
- int num_binary,
408
- int num_other,
409
- traversal_match_t match,
410
- _util_tester_t *tester,
411
- int num_matches)
412
- {
413
- mongocrypt_status_t *status;
414
- bson_iter_t iter;
415
- bson_t *bson;
416
- bson_t out = BSON_INITIALIZER;
417
- int matches = 0;
418
-
419
- status = mongocrypt_status_new ();
420
- /* First, assemble the requested bson document */
421
- bson = _assemble_bson (num_markings,
422
- num_deterministic,
423
- num_random,
424
- num_binary,
425
- num_other,
426
- tester);
427
-
428
- /* Perform a transformation, count matches */
429
- BSON_ASSERT (bson_iter_init (&iter, bson));
430
- BSON_ASSERT (_mongocrypt_transform_binary_in_bson (
431
- test_transform_cb, &matches, match, &iter, &out, status));
432
-
433
- /* Make sure we had the correct number of matches */
434
- BSON_ASSERT (matches == num_matches);
435
-
436
- /* Now, traverse through the document again and
437
- count the actual transformations */
438
- matches = 0;
439
- BSON_ASSERT (bson_iter_init (&iter, &out));
440
- BSON_ASSERT (_mongocrypt_traverse_binary_in_bson (
441
- post_transform_traverse_check, &matches, match, &iter, status));
442
-
443
- /* Also, make sure we have the correct number of
444
- non-matching fields */
445
- _assert_correct_fields (&out,
446
- num_markings,
447
- num_deterministic,
448
- num_random,
449
- num_binary,
450
- num_other,
451
- tester);
452
-
453
-
454
- BSON_ASSERT (matches == num_matches);
455
-
456
- bson_destroy (bson);
457
- bson_destroy (&out);
458
- mongocrypt_status_destroy (status);
353
+ static void test_transform(int num_markings,
354
+ int num_deterministic,
355
+ int num_random,
356
+ int num_binary,
357
+ int num_other,
358
+ traversal_match_t match,
359
+ _util_tester_t *tester,
360
+ int num_matches) {
361
+ mongocrypt_status_t *status;
362
+ bson_iter_t iter;
363
+ bson_t *bson;
364
+ bson_t out = BSON_INITIALIZER;
365
+ int matches = 0;
366
+
367
+ status = mongocrypt_status_new();
368
+ /* First, assemble the requested bson document */
369
+ bson = _assemble_bson(num_markings, num_deterministic, num_random, num_binary, num_other, tester);
370
+
371
+ /* Perform a transformation, count matches */
372
+ BSON_ASSERT(bson_iter_init(&iter, bson));
373
+ BSON_ASSERT(_mongocrypt_transform_binary_in_bson(test_transform_cb, &matches, match, &iter, &out, status));
374
+
375
+ /* Make sure we had the correct number of matches */
376
+ BSON_ASSERT(matches == num_matches);
377
+
378
+ /* Now, traverse through the document again and
379
+ count the actual transformations */
380
+ matches = 0;
381
+ BSON_ASSERT(bson_iter_init(&iter, &out));
382
+ BSON_ASSERT(_mongocrypt_traverse_binary_in_bson(post_transform_traverse_check, &matches, match, &iter, status));
383
+
384
+ /* Also, make sure we have the correct number of
385
+ non-matching fields */
386
+ _assert_correct_fields(&out, num_markings, num_deterministic, num_random, num_binary, num_other, tester);
387
+
388
+ BSON_ASSERT(matches == num_matches);
389
+
390
+ bson_destroy(bson);
391
+ bson_destroy(&out);
392
+ mongocrypt_status_destroy(status);
459
393
  }
460
394
 
461
- static void
462
- test_mongocrypt_transform_util_nesting (_util_tester_t *tester)
463
- {
464
- /* Empty document */
465
- test_transform (0, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
466
- test_transform (0, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
395
+ static void test_mongocrypt_transform_util_nesting(_util_tester_t *tester) {
396
+ /* Empty document */
397
+ test_transform(0, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
398
+ test_transform(0, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
467
399
 
468
- /* Document with only non-binary fields */
469
- test_transform (0, 0, 0, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
470
- test_transform (0, 0, 0, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
400
+ /* Document with only non-binary fields */
401
+ test_transform(0, 0, 0, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
402
+ test_transform(0, 0, 0, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
471
403
 
472
- /* Document with only binary fields that aren't subtype 0x06 */
473
- test_transform (0, 0, 0, 2, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
474
- test_transform (0, 0, 0, 2, 0, TRAVERSE_MATCH_MARKING, tester, 0);
404
+ /* Document with only binary fields that aren't subtype 0x06 */
405
+ test_transform(0, 0, 0, 2, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
406
+ test_transform(0, 0, 0, 2, 0, TRAVERSE_MATCH_MARKING, tester, 0);
475
407
 
476
- /* Document with a single marking */
477
- test_transform (1, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
478
- test_transform (1, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 1);
408
+ /* Document with a single marking */
409
+ test_transform(1, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
410
+ test_transform(1, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 1);
479
411
 
480
- /* Document with multiple markings */
481
- test_transform (3, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
482
- test_transform (3, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 3);
412
+ /* Document with multiple markings */
413
+ test_transform(3, 0, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
414
+ test_transform(3, 0, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 3);
483
415
 
484
- /* Document with multiple markings and other fields */
485
- test_transform (2, 0, 0, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
486
- test_transform (2, 0, 0, 1, 1, TRAVERSE_MATCH_MARKING, tester, 2);
416
+ /* Document with multiple markings and other fields */
417
+ test_transform(2, 0, 0, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 0);
418
+ test_transform(2, 0, 0, 1, 1, TRAVERSE_MATCH_MARKING, tester, 2);
487
419
 
488
- /* Document with a single random ciphertext */
489
- test_transform (0, 0, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
490
- test_transform (0, 0, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
420
+ /* Document with a single random ciphertext */
421
+ test_transform(0, 0, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
422
+ test_transform(0, 0, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
491
423
 
492
- /* Document with a single deterministic ciphertext */
493
- test_transform (0, 1, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
494
- test_transform (0, 1, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
424
+ /* Document with a single deterministic ciphertext */
425
+ test_transform(0, 1, 0, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 1);
426
+ test_transform(0, 1, 0, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
495
427
 
496
- /* Document with multiple ciphertexts */
497
- test_transform (0, 1, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
498
- test_transform (0, 1, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
428
+ /* Document with multiple ciphertexts */
429
+ test_transform(0, 1, 1, 0, 0, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
430
+ test_transform(0, 1, 1, 0, 0, TRAVERSE_MATCH_MARKING, tester, 0);
499
431
 
500
- /* Document with multiple ciphertexts and other fields */
501
- test_transform (0, 1, 2, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 3);
502
- test_transform (0, 1, 2, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
432
+ /* Document with multiple ciphertexts and other fields */
433
+ test_transform(0, 1, 2, 0, 2, TRAVERSE_MATCH_CIPHERTEXT, tester, 3);
434
+ test_transform(0, 1, 2, 0, 2, TRAVERSE_MATCH_MARKING, tester, 0);
503
435
 
504
- /* Documents with all types of fields */
505
- test_transform (1, 1, 1, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
506
- test_transform (1, 1, 1, 1, 1, TRAVERSE_MATCH_MARKING, tester, 1);
436
+ /* Documents with all types of fields */
437
+ test_transform(1, 1, 1, 1, 1, TRAVERSE_MATCH_CIPHERTEXT, tester, 2);
438
+ test_transform(1, 1, 1, 1, 1, TRAVERSE_MATCH_MARKING, tester, 1);
507
439
  }
508
440
 
509
- static void
510
- test_mongocrypt_transform_util (_mongocrypt_tester_t *tester)
511
- {
512
- _util_tester_t ctx = {0};
441
+ static void test_mongocrypt_transform_util(_mongocrypt_tester_t *tester) {
442
+ _util_tester_t ctx = {0};
513
443
 
514
- ctx.tester = tester;
444
+ ctx.tester = tester;
515
445
 
516
- ctx.parent = NEST_IN_NONE;
517
- test_mongocrypt_transform_util_nesting (&ctx);
446
+ ctx.parent = NEST_IN_NONE;
447
+ test_mongocrypt_transform_util_nesting(&ctx);
518
448
 
519
- ctx.parent = NEST_IN_DOCUMENT;
520
- test_mongocrypt_transform_util_nesting (&ctx);
449
+ ctx.parent = NEST_IN_DOCUMENT;
450
+ test_mongocrypt_transform_util_nesting(&ctx);
521
451
 
522
- ctx.parent = NEST_IN_ARRAY;
523
- test_mongocrypt_transform_util_nesting (&ctx);
452
+ ctx.parent = NEST_IN_ARRAY;
453
+ test_mongocrypt_transform_util_nesting(&ctx);
524
454
  }
525
455
 
526
- static void
527
- test_mongocrypt_traverse_util (_mongocrypt_tester_t *tester)
528
- {
529
- _util_tester_t ctx;
456
+ static void test_mongocrypt_traverse_util(_mongocrypt_tester_t *tester) {
457
+ _util_tester_t ctx;
530
458
 
531
- ctx.tester = tester;
459
+ ctx.tester = tester;
532
460
 
533
- ctx.parent = NEST_IN_NONE;
534
- test_mongocrypt_traverse_util_nesting (&ctx);
461
+ ctx.parent = NEST_IN_NONE;
462
+ test_mongocrypt_traverse_util_nesting(&ctx);
535
463
 
536
- ctx.parent = NEST_IN_DOCUMENT;
537
- test_mongocrypt_traverse_util_nesting (&ctx);
464
+ ctx.parent = NEST_IN_DOCUMENT;
465
+ test_mongocrypt_traverse_util_nesting(&ctx);
538
466
 
539
- ctx.parent = NEST_IN_ARRAY;
540
- test_mongocrypt_traverse_util_nesting (&ctx);
467
+ ctx.parent = NEST_IN_ARRAY;
468
+ test_mongocrypt_traverse_util_nesting(&ctx);
541
469
  }
542
470
 
543
- void
544
- _mongocrypt_tester_install_traverse_util (_mongocrypt_tester_t *tester)
545
- {
546
- INSTALL_TEST (test_mongocrypt_traverse_util);
547
- INSTALL_TEST (test_mongocrypt_transform_util);
471
+ void _mongocrypt_tester_install_traverse_util(_mongocrypt_tester_t *tester) {
472
+ INSTALL_TEST(test_mongocrypt_traverse_util);
473
+ INSTALL_TEST(test_mongocrypt_transform_util);
548
474
  }