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,678 +14,557 @@
14
14
  * limitations under the License.
15
15
  */
16
16
 
17
- #include <bson/bson.h>
18
17
  #include "mongocrypt-buffer-private.h"
19
18
  #include "mongocrypt-endian-private.h"
20
19
  #include "mongocrypt-util-private.h"
20
+ #include <bson/bson.h>
21
21
 
22
22
  #define INT32_LEN 4
23
23
  #define TYPE_LEN 1
24
24
  #define NULL_BYTE_LEN 1
25
25
  #define NULL_BYTE_VAL 0x00
26
26
 
27
-
28
27
  /* if a buffer is not owned, copy the data and make it owned. */
29
- static void
30
- _make_owned (_mongocrypt_buffer_t *buf)
31
- {
32
- uint8_t *tmp;
33
-
34
- BSON_ASSERT_PARAM (buf);
35
- if (buf->owned) {
36
- return;
37
- }
38
- tmp = buf->data;
39
- if (buf->len > 0) {
40
- buf->data = bson_malloc (buf->len);
41
- BSON_ASSERT (buf->data);
42
- memcpy (buf->data, tmp, buf->len);
43
- } else {
44
- buf->data = NULL;
45
- }
46
-
47
- buf->owned = true;
28
+ static void _make_owned(_mongocrypt_buffer_t *buf) {
29
+ uint8_t *tmp;
30
+
31
+ BSON_ASSERT_PARAM(buf);
32
+ if (buf->owned) {
33
+ return;
34
+ }
35
+ tmp = buf->data;
36
+ if (buf->len > 0) {
37
+ buf->data = bson_malloc(buf->len);
38
+ BSON_ASSERT(buf->data);
39
+ memcpy(buf->data, tmp, buf->len);
40
+ } else {
41
+ buf->data = NULL;
42
+ }
43
+
44
+ buf->owned = true;
48
45
  }
49
46
 
50
47
  /* TODO CDRIVER-2990 have buffer operations require initialized buffer to
51
48
  * prevent leaky code. */
52
- void
53
- _mongocrypt_buffer_init (_mongocrypt_buffer_t *buf)
54
- {
55
- BSON_ASSERT_PARAM (buf);
49
+ void _mongocrypt_buffer_init(_mongocrypt_buffer_t *buf) {
50
+ BSON_ASSERT_PARAM(buf);
56
51
 
57
- memset (buf, 0, sizeof (*buf));
52
+ memset(buf, 0, sizeof(*buf));
58
53
  }
59
54
 
55
+ void _mongocrypt_buffer_resize(_mongocrypt_buffer_t *buf, uint32_t len) {
56
+ BSON_ASSERT_PARAM(buf);
57
+
58
+ /* Currently this just wipes whatever was in data before,
59
+ but a fancier implementation could copy over up to 'len'
60
+ bytes from the old buffer to the new one. */
61
+ if (buf->owned) {
62
+ buf->data = bson_realloc(buf->data, len);
63
+ buf->len = len;
64
+ return;
65
+ }
60
66
 
61
- void
62
- _mongocrypt_buffer_resize (_mongocrypt_buffer_t *buf, uint32_t len)
63
- {
64
- BSON_ASSERT_PARAM (buf);
67
+ buf->data = bson_malloc(len);
68
+ BSON_ASSERT(buf->data);
65
69
 
66
- /* Currently this just wipes whatever was in data before,
67
- but a fancier implementation could copy over up to 'len'
68
- bytes from the old buffer to the new one. */
69
- if (buf->owned) {
70
- buf->data = bson_realloc (buf->data, len);
71
- buf->len = len;
72
- return;
73
- }
70
+ buf->len = len;
71
+ buf->owned = true;
72
+ }
74
73
 
75
- buf->data = bson_malloc (len);
76
- BSON_ASSERT (buf->data);
74
+ void _mongocrypt_buffer_init_size(_mongocrypt_buffer_t *buf, uint32_t len) {
75
+ BSON_ASSERT_PARAM(buf);
77
76
 
78
- buf->len = len;
79
- buf->owned = true;
77
+ _mongocrypt_buffer_init(buf);
78
+ _mongocrypt_buffer_resize(buf, len);
80
79
  }
81
80
 
81
+ void _mongocrypt_buffer_steal(_mongocrypt_buffer_t *buf, _mongocrypt_buffer_t *src) {
82
+ BSON_ASSERT_PARAM(buf);
83
+ BSON_ASSERT_PARAM(src);
82
84
 
83
- void
84
- _mongocrypt_buffer_init_size (_mongocrypt_buffer_t *buf, uint32_t len)
85
- {
86
- BSON_ASSERT_PARAM (buf);
85
+ if (!src->owned) {
86
+ _mongocrypt_buffer_copy_to(src, buf);
87
+ _mongocrypt_buffer_init(src);
88
+ return;
89
+ }
87
90
 
88
- _mongocrypt_buffer_init (buf);
89
- _mongocrypt_buffer_resize (buf, len);
91
+ buf->data = src->data;
92
+ buf->len = src->len;
93
+ buf->owned = true;
94
+ _mongocrypt_buffer_init(src);
90
95
  }
91
96
 
97
+ bool _mongocrypt_buffer_from_binary_iter(_mongocrypt_buffer_t *buf, bson_iter_t *iter) {
98
+ BSON_ASSERT_PARAM(buf);
99
+ BSON_ASSERT_PARAM(iter);
100
+
101
+ if (!BSON_ITER_HOLDS_BINARY(iter)) {
102
+ return false;
103
+ }
104
+ _mongocrypt_buffer_init(buf);
105
+ bson_iter_binary(iter, &buf->subtype, &buf->len, (const uint8_t **)&buf->data);
106
+ buf->owned = false;
107
+ return true;
108
+ }
92
109
 
93
- void
94
- _mongocrypt_buffer_steal (_mongocrypt_buffer_t *buf, _mongocrypt_buffer_t *src)
95
- {
96
- BSON_ASSERT_PARAM (buf);
97
- BSON_ASSERT_PARAM (src);
110
+ bool _mongocrypt_buffer_copy_from_binary_iter(_mongocrypt_buffer_t *buf, bson_iter_t *iter) {
111
+ BSON_ASSERT_PARAM(buf);
112
+ BSON_ASSERT_PARAM(iter);
98
113
 
99
- if (!src->owned) {
100
- _mongocrypt_buffer_copy_to (src, buf);
101
- _mongocrypt_buffer_init (src);
102
- return;
103
- }
114
+ if (!_mongocrypt_buffer_from_binary_iter(buf, iter)) {
115
+ return false;
116
+ }
104
117
 
105
- buf->data = src->data;
106
- buf->len = src->len;
107
- buf->owned = true;
108
- _mongocrypt_buffer_init (src);
118
+ _make_owned(buf);
119
+ return true;
109
120
  }
110
121
 
111
- bool
112
- _mongocrypt_buffer_from_binary_iter (_mongocrypt_buffer_t *buf,
113
- bson_iter_t *iter)
114
- {
115
- BSON_ASSERT_PARAM (buf);
116
- BSON_ASSERT_PARAM (iter);
122
+ bool _mongocrypt_buffer_from_document_iter(_mongocrypt_buffer_t *buf, bson_iter_t *iter) {
123
+ BSON_ASSERT_PARAM(buf);
124
+ BSON_ASSERT_PARAM(iter);
117
125
 
118
- if (!BSON_ITER_HOLDS_BINARY (iter)) {
119
- return false;
120
- }
121
- _mongocrypt_buffer_init (buf);
122
- bson_iter_binary (
123
- iter, &buf->subtype, &buf->len, (const uint8_t **) &buf->data);
124
- buf->owned = false;
125
- return true;
126
+ if (!BSON_ITER_HOLDS_DOCUMENT(iter)) {
127
+ return false;
128
+ }
129
+ _mongocrypt_buffer_init(buf);
130
+ bson_iter_document(iter, &buf->len, (const uint8_t **)&buf->data);
131
+ buf->owned = false;
132
+ return true;
126
133
  }
127
134
 
135
+ bool _mongocrypt_buffer_copy_from_document_iter(_mongocrypt_buffer_t *buf, bson_iter_t *iter) {
136
+ BSON_ASSERT_PARAM(buf);
137
+ BSON_ASSERT_PARAM(iter);
128
138
 
129
- bool
130
- _mongocrypt_buffer_copy_from_binary_iter (_mongocrypt_buffer_t *buf,
131
- bson_iter_t *iter)
132
- {
133
- BSON_ASSERT_PARAM (buf);
134
- BSON_ASSERT_PARAM (iter);
139
+ if (!_mongocrypt_buffer_from_document_iter(buf, iter)) {
140
+ return false;
141
+ }
142
+ _make_owned(buf);
143
+ return true;
144
+ }
135
145
 
136
- if (!_mongocrypt_buffer_from_binary_iter (buf, iter)) {
137
- return false;
138
- }
146
+ void _mongocrypt_buffer_steal_from_bson(_mongocrypt_buffer_t *buf, bson_t *bson) {
147
+ BSON_ASSERT_PARAM(buf);
148
+ BSON_ASSERT_PARAM(bson);
139
149
 
140
- _make_owned (buf);
141
- return true;
150
+ _mongocrypt_buffer_init(buf);
151
+ buf->data = bson_destroy_with_steal(bson, true, &buf->len);
152
+ buf->owned = true;
142
153
  }
143
154
 
155
+ void _mongocrypt_buffer_from_bson(_mongocrypt_buffer_t *buf, const bson_t *bson) {
156
+ BSON_ASSERT_PARAM(buf);
157
+ BSON_ASSERT_PARAM(bson);
158
+
159
+ _mongocrypt_buffer_init(buf);
160
+ buf->data = (uint8_t *)bson_get_data(bson);
161
+ buf->len = bson->len;
162
+ buf->owned = false;
163
+ }
144
164
 
145
- bool
146
- _mongocrypt_buffer_from_document_iter (_mongocrypt_buffer_t *buf,
147
- bson_iter_t *iter)
148
- {
149
- BSON_ASSERT_PARAM (buf);
150
- BSON_ASSERT_PARAM (iter);
165
+ bool _mongocrypt_buffer_to_bson(const _mongocrypt_buffer_t *buf, bson_t *bson) {
166
+ BSON_ASSERT_PARAM(buf);
167
+ BSON_ASSERT_PARAM(bson);
151
168
 
152
- if (!BSON_ITER_HOLDS_DOCUMENT (iter)) {
153
- return false;
154
- }
155
- _mongocrypt_buffer_init (buf);
156
- bson_iter_document (iter, &buf->len, (const uint8_t **) &buf->data);
157
- buf->owned = false;
158
- return true;
169
+ return bson_init_static(bson, buf->data, buf->len);
159
170
  }
160
171
 
172
+ bool _mongocrypt_buffer_append(const _mongocrypt_buffer_t *buf, bson_t *bson, const char *key, int key_len) {
173
+ BSON_ASSERT_PARAM(buf);
174
+ BSON_ASSERT_PARAM(bson);
175
+ BSON_ASSERT_PARAM(key);
161
176
 
162
- bool
163
- _mongocrypt_buffer_copy_from_document_iter (_mongocrypt_buffer_t *buf,
164
- bson_iter_t *iter)
165
- {
166
- BSON_ASSERT_PARAM (buf);
167
- BSON_ASSERT_PARAM (iter);
177
+ return bson_append_binary(bson, key, key_len, buf->subtype, buf->data, buf->len);
178
+ }
179
+
180
+ void _mongocrypt_buffer_from_binary(_mongocrypt_buffer_t *buf, const mongocrypt_binary_t *binary) {
181
+ BSON_ASSERT_PARAM(buf);
182
+ BSON_ASSERT_PARAM(binary);
168
183
 
169
- if (!_mongocrypt_buffer_from_document_iter (buf, iter)) {
170
- return false;
171
- }
172
- _make_owned (buf);
173
- return true;
184
+ _mongocrypt_buffer_init(buf);
185
+ buf->data = binary->data;
186
+ buf->len = binary->len;
187
+ buf->owned = false;
174
188
  }
175
189
 
190
+ void _mongocrypt_buffer_copy_from_binary(_mongocrypt_buffer_t *buf, const struct _mongocrypt_binary_t *binary) {
191
+ BSON_ASSERT_PARAM(buf);
192
+ BSON_ASSERT_PARAM(binary);
193
+
194
+ _mongocrypt_buffer_from_binary(buf, binary);
195
+ _make_owned(buf);
196
+ }
176
197
 
177
- void
178
- _mongocrypt_buffer_steal_from_bson (_mongocrypt_buffer_t *buf, bson_t *bson)
179
- {
180
- BSON_ASSERT_PARAM (buf);
181
- BSON_ASSERT_PARAM (bson);
198
+ void _mongocrypt_buffer_to_binary(const _mongocrypt_buffer_t *buf, mongocrypt_binary_t *binary) {
199
+ BSON_ASSERT_PARAM(buf);
200
+ BSON_ASSERT_PARAM(binary);
182
201
 
183
- _mongocrypt_buffer_init (buf);
184
- buf->data = bson_destroy_with_steal (bson, true, &buf->len);
185
- buf->owned = true;
202
+ binary->data = buf->data;
203
+ binary->len = buf->len;
186
204
  }
187
205
 
206
+ void _mongocrypt_buffer_copy_to(const _mongocrypt_buffer_t *src, _mongocrypt_buffer_t *dst) {
207
+ if (src == dst) {
208
+ return;
209
+ }
210
+
211
+ BSON_ASSERT_PARAM(src);
212
+ BSON_ASSERT_PARAM(dst);
213
+
214
+ _mongocrypt_buffer_cleanup(dst);
215
+ if (src->len == 0) {
216
+ return;
217
+ }
188
218
 
189
- void
190
- _mongocrypt_buffer_from_bson (_mongocrypt_buffer_t *buf, const bson_t *bson)
191
- {
192
- BSON_ASSERT_PARAM (buf);
193
- BSON_ASSERT_PARAM (bson);
219
+ dst->data = bson_malloc((size_t)src->len);
220
+ BSON_ASSERT(dst->data);
194
221
 
195
- _mongocrypt_buffer_init (buf);
196
- buf->data = (uint8_t *) bson_get_data (bson);
197
- buf->len = bson->len;
198
- buf->owned = false;
222
+ memcpy(dst->data, src->data, src->len);
223
+ dst->len = src->len;
224
+ dst->subtype = src->subtype;
225
+ dst->owned = true;
199
226
  }
200
227
 
228
+ void _mongocrypt_buffer_set_to(const _mongocrypt_buffer_t *src, _mongocrypt_buffer_t *dst) {
229
+ if (src == dst) {
230
+ return;
231
+ }
201
232
 
202
- bool
203
- _mongocrypt_buffer_to_bson (const _mongocrypt_buffer_t *buf, bson_t *bson)
204
- {
205
- BSON_ASSERT_PARAM (buf);
206
- BSON_ASSERT_PARAM (bson);
233
+ BSON_ASSERT_PARAM(src);
234
+ BSON_ASSERT_PARAM(dst);
207
235
 
208
- return bson_init_static (bson, buf->data, buf->len);
236
+ dst->data = src->data;
237
+ dst->len = src->len;
238
+ dst->subtype = src->subtype;
239
+ dst->owned = false;
209
240
  }
210
241
 
242
+ int _mongocrypt_buffer_cmp(const _mongocrypt_buffer_t *a, const _mongocrypt_buffer_t *b) {
243
+ BSON_ASSERT_PARAM(a);
244
+ BSON_ASSERT_PARAM(b);
211
245
 
212
- bool
213
- _mongocrypt_buffer_append (const _mongocrypt_buffer_t *buf,
214
- bson_t *bson,
215
- const char *key,
216
- int key_len)
217
- {
218
- BSON_ASSERT_PARAM (buf);
219
- BSON_ASSERT_PARAM (bson);
220
- BSON_ASSERT_PARAM (key);
221
-
222
- return bson_append_binary (
223
- bson, key, key_len, buf->subtype, buf->data, buf->len);
246
+ if (a->len != b->len) {
247
+ return a->len > b->len ? 1 : -1;
248
+ }
249
+ if (0 == a->len) {
250
+ return 0;
251
+ }
252
+ return memcmp(a->data, b->data, a->len);
224
253
  }
225
254
 
255
+ void _mongocrypt_buffer_cleanup(_mongocrypt_buffer_t *buf) {
256
+ if (buf && buf->owned) {
257
+ bson_free(buf->data);
258
+ }
259
+ }
226
260
 
227
- void
228
- _mongocrypt_buffer_from_binary (_mongocrypt_buffer_t *buf,
229
- const mongocrypt_binary_t *binary)
230
- {
231
- BSON_ASSERT_PARAM (buf);
232
- BSON_ASSERT_PARAM (binary);
261
+ bool _mongocrypt_buffer_empty(const _mongocrypt_buffer_t *buf) {
262
+ BSON_ASSERT_PARAM(buf);
233
263
 
234
- _mongocrypt_buffer_init (buf);
235
- buf->data = binary->data;
236
- buf->len = binary->len;
237
- buf->owned = false;
264
+ return buf->data == NULL;
238
265
  }
239
266
 
267
+ bool _mongocrypt_buffer_to_bson_value(_mongocrypt_buffer_t *plaintext, uint8_t type, bson_value_t *out) {
268
+ bool ret = false;
269
+ bson_iter_t iter;
270
+ bson_t wrapper;
271
+ uint32_t data_len;
272
+ uint32_t le_data_len;
273
+ uint8_t *data;
274
+ uint8_t data_prefix;
275
+
276
+ BSON_ASSERT_PARAM(plaintext);
277
+ BSON_ASSERT_PARAM(out);
278
+
279
+ data_prefix = INT32_LEN /* adds document size */
280
+ + TYPE_LEN /* element type */
281
+ + NULL_BYTE_LEN; /* and doc's null byte terminator */
282
+
283
+ BSON_ASSERT(plaintext->len <= UINT32_MAX - data_prefix - NULL_BYTE_LEN);
240
284
 
241
- void
242
- _mongocrypt_buffer_copy_from_binary (_mongocrypt_buffer_t *buf,
243
- const struct _mongocrypt_binary_t *binary)
244
- {
245
- BSON_ASSERT_PARAM (buf);
246
- BSON_ASSERT_PARAM (binary);
285
+ data_len = (plaintext->len + data_prefix + NULL_BYTE_LEN);
286
+ le_data_len = BSON_UINT32_TO_LE(data_len);
247
287
 
248
- _mongocrypt_buffer_from_binary (buf, binary);
249
- _make_owned (buf);
288
+ data = bson_malloc0(data_len);
289
+ BSON_ASSERT(data);
290
+
291
+ memcpy(data + data_prefix, plaintext->data, plaintext->len);
292
+ memcpy(data, &le_data_len, INT32_LEN);
293
+ memcpy(data + INT32_LEN, &type, TYPE_LEN);
294
+ data[data_len - 1] = NULL_BYTE_VAL;
295
+
296
+ if (!bson_init_static(&wrapper, data, data_len)) {
297
+ goto fail;
298
+ }
299
+
300
+ if (!bson_validate(&wrapper, BSON_VALIDATE_NONE, NULL)) {
301
+ goto fail;
302
+ }
303
+
304
+ if (!bson_iter_init_find(&iter, &wrapper, "")) {
305
+ goto fail;
306
+ }
307
+ bson_value_copy(bson_iter_value(&iter), out);
308
+
309
+ /* Due to an open libbson bug (CDRIVER-3340), give an empty
310
+ * binary payload a real address. TODO: remove this after
311
+ * CDRIVER-3340 is fixed. */
312
+ if (out->value_type == BSON_TYPE_BINARY && 0 == out->value.v_binary.data_len) {
313
+ out->value.v_binary.data = bson_malloc(1); /* Freed in bson_value_destroy */
314
+ }
315
+
316
+ ret = true;
317
+ fail:
318
+ bson_free(data);
319
+ return ret;
250
320
  }
251
321
 
322
+ void _mongocrypt_buffer_from_iter(_mongocrypt_buffer_t *plaintext, bson_iter_t *iter) {
323
+ bson_t wrapper = BSON_INITIALIZER;
324
+ int32_t offset = INT32_LEN /* skips document size */
325
+ + TYPE_LEN /* element type */
326
+ + NULL_BYTE_LEN; /* and the key's null byte terminator */
327
+
328
+ uint8_t *wrapper_data;
329
+
330
+ BSON_ASSERT_PARAM(plaintext);
331
+ BSON_ASSERT_PARAM(iter);
332
+
333
+ /* It is not straightforward to transform a bson_value_t to a string of
334
+ * bytes. As a workaround, we wrap the value in a bson document with an empty
335
+ * key, then use the raw buffer from inside the new bson_t, skipping the
336
+ * length and type header information and the key name. */
337
+ bson_append_iter(&wrapper, "", 0, iter);
338
+ wrapper_data = ((uint8_t *)bson_get_data(&wrapper));
339
+ BSON_ASSERT(wrapper.len >= (uint32_t)offset + NULL_BYTE_LEN);
340
+ plaintext->len = wrapper.len - (uint32_t)offset - NULL_BYTE_LEN; /* the final null byte */
341
+ plaintext->data = bson_malloc(plaintext->len);
342
+ BSON_ASSERT(plaintext->data);
252
343
 
253
- void
254
- _mongocrypt_buffer_to_binary (const _mongocrypt_buffer_t *buf,
255
- mongocrypt_binary_t *binary)
256
- {
257
- BSON_ASSERT_PARAM (buf);
258
- BSON_ASSERT_PARAM (binary);
344
+ plaintext->owned = true;
345
+ memcpy(plaintext->data, wrapper_data + offset, plaintext->len);
259
346
 
260
- binary->data = buf->data;
261
- binary->len = buf->len;
347
+ bson_destroy(&wrapper);
262
348
  }
263
349
 
350
+ bool _mongocrypt_buffer_from_uuid_iter(_mongocrypt_buffer_t *buf, bson_iter_t *iter) {
351
+ const uint8_t *data;
352
+ bson_subtype_t subtype;
353
+ uint32_t len;
264
354
 
265
- void
266
- _mongocrypt_buffer_copy_to (const _mongocrypt_buffer_t *src,
267
- _mongocrypt_buffer_t *dst)
268
- {
269
- if (src == dst) {
270
- return;
271
- }
355
+ BSON_ASSERT_PARAM(buf);
356
+ BSON_ASSERT_PARAM(iter);
272
357
 
273
- BSON_ASSERT_PARAM (src);
274
- BSON_ASSERT_PARAM (dst);
358
+ if (!BSON_ITER_HOLDS_BINARY(iter)) {
359
+ return false;
360
+ }
361
+ bson_iter_binary(iter, &subtype, &len, &data);
362
+ if (subtype != BSON_SUBTYPE_UUID) {
363
+ return false;
364
+ }
365
+ if (len != UUID_LEN) {
366
+ return false;
367
+ }
368
+ _mongocrypt_buffer_init(buf);
369
+ buf->data = (uint8_t *)data;
370
+ buf->len = len;
371
+ buf->subtype = subtype;
372
+ buf->owned = false;
373
+ return true;
374
+ }
375
+
376
+ bool _mongocrypt_buffer_copy_from_uuid_iter(_mongocrypt_buffer_t *buf, bson_iter_t *iter) {
377
+ BSON_ASSERT_PARAM(buf);
378
+ BSON_ASSERT_PARAM(iter);
275
379
 
276
- _mongocrypt_buffer_cleanup (dst);
277
- if (src->len == 0) {
278
- return;
279
- }
380
+ if (!_mongocrypt_buffer_from_uuid_iter(buf, iter)) {
381
+ return false;
382
+ }
383
+ _make_owned(buf);
384
+ return true;
385
+ }
280
386
 
281
- dst->data = bson_malloc ((size_t) src->len);
282
- BSON_ASSERT (dst->data);
387
+ bool _mongocrypt_buffer_is_uuid(_mongocrypt_buffer_t *buf) {
388
+ BSON_ASSERT_PARAM(buf);
283
389
 
284
- memcpy (dst->data, src->data, src->len);
285
- dst->len = src->len;
286
- dst->subtype = src->subtype;
287
- dst->owned = true;
390
+ return buf->len == UUID_LEN && buf->subtype == BSON_SUBTYPE_UUID;
288
391
  }
289
392
 
393
+ void _mongocrypt_buffer_copy_from_hex(_mongocrypt_buffer_t *buf, const char *hex) {
394
+ uint32_t i;
395
+ size_t hex_len;
396
+
397
+ BSON_ASSERT_PARAM(buf);
398
+ BSON_ASSERT_PARAM(hex);
290
399
 
291
- void
292
- _mongocrypt_buffer_set_to (const _mongocrypt_buffer_t *src,
293
- _mongocrypt_buffer_t *dst)
294
- {
295
- if (src == dst) {
296
- return;
297
- }
400
+ hex_len = strlen(hex);
401
+ if (hex_len == 0) {
402
+ _mongocrypt_buffer_init(buf);
403
+ return;
404
+ }
298
405
 
299
- BSON_ASSERT_PARAM (src);
300
- BSON_ASSERT_PARAM (dst);
406
+ BSON_ASSERT(hex_len / 2u <= UINT32_MAX);
407
+ buf->len = (uint32_t)(hex_len / 2u);
408
+ buf->data = bson_malloc(buf->len);
409
+ BSON_ASSERT(buf->data);
301
410
 
302
- dst->data = src->data;
303
- dst->len = src->len;
304
- dst->subtype = src->subtype;
305
- dst->owned = false;
411
+ buf->owned = true;
412
+ for (i = 0; i < buf->len; i++) {
413
+ uint32_t tmp;
414
+ BSON_ASSERT(i <= UINT32_MAX / 2);
415
+ BSON_ASSERT(sscanf(hex + (2 * i), "%02x", &tmp));
416
+ *(buf->data + i) = (uint8_t)tmp;
417
+ }
306
418
  }
307
419
 
420
+ int _mongocrypt_buffer_cmp_hex(_mongocrypt_buffer_t *buf, const char *hex) {
421
+ _mongocrypt_buffer_t tmp;
422
+ int res;
308
423
 
309
- int
310
- _mongocrypt_buffer_cmp (const _mongocrypt_buffer_t *a,
311
- const _mongocrypt_buffer_t *b)
312
- {
313
- BSON_ASSERT_PARAM (a);
314
- BSON_ASSERT_PARAM (b);
424
+ BSON_ASSERT_PARAM(buf);
425
+ BSON_ASSERT_PARAM(hex);
315
426
 
316
- if (a->len != b->len) {
317
- return a->len > b->len ? 1 : -1;
318
- }
319
- if (0 == a->len) {
320
- return 0;
321
- }
322
- return memcmp (a->data, b->data, a->len);
427
+ _mongocrypt_buffer_copy_from_hex(&tmp, hex);
428
+ res = _mongocrypt_buffer_cmp(buf, &tmp);
429
+ _mongocrypt_buffer_cleanup(&tmp);
430
+ return res;
323
431
  }
324
432
 
433
+ char *_mongocrypt_buffer_to_hex(_mongocrypt_buffer_t *buf) {
434
+ BSON_ASSERT_PARAM(buf);
435
+ /* since buf->len is a uint32_t, even doubling it won't bring it anywhere
436
+ * near to SIZE_MAX */
325
437
 
326
- void
327
- _mongocrypt_buffer_cleanup (_mongocrypt_buffer_t *buf)
328
- {
329
- if (buf && buf->owned) {
330
- bson_free (buf->data);
331
- }
438
+ char *hex = bson_malloc0(buf->len * 2 + 1);
439
+ BSON_ASSERT(hex);
440
+
441
+ char *out = hex;
442
+
443
+ for (uint32_t i = 0; i < buf->len; i++, out += 2) {
444
+ sprintf(out, "%02X", buf->data[i]);
445
+ }
446
+ return hex;
332
447
  }
333
448
 
449
+ bool _mongocrypt_buffer_concat(_mongocrypt_buffer_t *dst, const _mongocrypt_buffer_t *srcs, uint32_t num_srcs) {
450
+ uint32_t total = 0;
451
+ uint32_t offset;
452
+ uint32_t i;
453
+
454
+ BSON_ASSERT_PARAM(dst);
455
+ BSON_ASSERT_PARAM(srcs);
334
456
 
335
- bool
336
- _mongocrypt_buffer_empty (const _mongocrypt_buffer_t *buf)
337
- {
338
- BSON_ASSERT_PARAM (buf);
457
+ for (i = 0; i < num_srcs; i++) {
458
+ uint32_t old_total = total;
339
459
 
340
- return buf->data == NULL;
460
+ total += srcs[i].len;
461
+ /* If the previous operation overflowed, then total will have a smaller
462
+ * value than previously. */
463
+ if (total < old_total) {
464
+ return false;
465
+ }
466
+ }
467
+
468
+ _mongocrypt_buffer_init(dst);
469
+ _mongocrypt_buffer_resize(dst, total);
470
+ offset = 0;
471
+ for (i = 0; i < num_srcs; i++) {
472
+ if (srcs[i].len) {
473
+ memcpy(dst->data + offset, srcs[i].data, srcs[i].len);
474
+ }
475
+ offset += srcs[i].len;
476
+ }
477
+ return true;
341
478
  }
342
479
 
343
- bool
344
- _mongocrypt_buffer_to_bson_value (_mongocrypt_buffer_t *plaintext,
345
- uint8_t type,
346
- bson_value_t *out)
347
- {
348
- bool ret = false;
349
- bson_iter_t iter;
350
- bson_t wrapper;
351
- uint32_t data_len;
352
- uint32_t le_data_len;
353
- uint8_t *data;
354
- uint8_t data_prefix;
480
+ struct _mongocrypt_binary_t *_mongocrypt_buffer_as_binary(_mongocrypt_buffer_t *buf) {
481
+ BSON_ASSERT_PARAM(buf);
355
482
 
356
- BSON_ASSERT_PARAM (plaintext);
357
- BSON_ASSERT_PARAM (out);
483
+ buf->bin.data = buf->data;
484
+ buf->bin.len = buf->len;
485
+ return &buf->bin;
486
+ }
358
487
 
359
- data_prefix = INT32_LEN /* adds document size */
360
- + TYPE_LEN /* element type */
361
- + NULL_BYTE_LEN; /* and doc's null byte terminator */
488
+ bool _mongocrypt_buffer_copy_from_data_and_size(_mongocrypt_buffer_t *buf, const uint8_t *data, size_t len) {
489
+ BSON_ASSERT_PARAM(buf);
490
+ BSON_ASSERT_PARAM(data);
362
491
 
363
- BSON_ASSERT (plaintext->len <= UINT32_MAX - data_prefix - NULL_BYTE_LEN);
492
+ _mongocrypt_buffer_init(buf);
364
493
 
365
- data_len = (plaintext->len + data_prefix + NULL_BYTE_LEN);
366
- le_data_len = BSON_UINT32_TO_LE (data_len);
494
+ if (!size_to_uint32(len, &buf->len)) {
495
+ return false;
496
+ }
367
497
 
368
- data = bson_malloc0 (data_len);
369
- BSON_ASSERT (data);
498
+ if ((buf->data = bson_malloc(len))) {
499
+ memcpy(buf->data, data, len);
500
+ buf->owned = true;
501
+ }
370
502
 
371
- memcpy (data + data_prefix, plaintext->data, plaintext->len);
372
- memcpy (data, &le_data_len, INT32_LEN);
373
- memcpy (data + INT32_LEN, &type, TYPE_LEN);
374
- data[data_len - 1] = NULL_BYTE_VAL;
503
+ return true;
504
+ }
375
505
 
376
- if (!bson_init_static (&wrapper, data, data_len)) {
377
- goto fail;
378
- }
506
+ bool _mongocrypt_buffer_steal_from_data_and_size(_mongocrypt_buffer_t *buf, uint8_t *data, size_t len) {
507
+ BSON_ASSERT_PARAM(buf);
508
+ BSON_ASSERT_PARAM(data);
379
509
 
380
- if (!bson_validate (&wrapper, BSON_VALIDATE_NONE, NULL)) {
381
- goto fail;
382
- }
510
+ _mongocrypt_buffer_init(buf);
511
+ if (!size_to_uint32(len, &buf->len)) {
512
+ return false;
513
+ }
514
+ buf->data = data;
515
+ buf->owned = true;
516
+ return true;
517
+ }
383
518
 
384
- if (!bson_iter_init_find (&iter, &wrapper, "")) {
385
- goto fail;
386
- }
387
- bson_value_copy (bson_iter_value (&iter), out);
519
+ bool _mongocrypt_buffer_steal_from_string(_mongocrypt_buffer_t *buf, char *str) {
520
+ BSON_ASSERT_PARAM(buf);
521
+ BSON_ASSERT_PARAM(str);
388
522
 
389
- /* Due to an open libbson bug (CDRIVER-3340), give an empty
390
- * binary payload a real address. TODO: remove this after
391
- * CDRIVER-3340 is fixed. */
392
- if (out->value_type == BSON_TYPE_BINARY &&
393
- 0 == out->value.v_binary.data_len) {
394
- out->value.v_binary.data =
395
- bson_malloc (1); /* Freed in bson_value_destroy */
396
- }
523
+ _mongocrypt_buffer_init(buf);
524
+ if (!size_to_uint32(strlen(str), &buf->len)) {
525
+ return false;
526
+ }
527
+ buf->data = (uint8_t *)str;
528
+ buf->owned = true;
529
+ return true;
530
+ }
397
531
 
398
- ret = true;
399
- fail:
400
- bson_free (data);
401
- return ret;
402
- }
403
-
404
- void
405
- _mongocrypt_buffer_from_iter (_mongocrypt_buffer_t *plaintext,
406
- bson_iter_t *iter)
407
- {
408
- bson_t wrapper = BSON_INITIALIZER;
409
- int32_t offset = INT32_LEN /* skips document size */
410
- + TYPE_LEN /* element type */
411
- + NULL_BYTE_LEN; /* and the key's null byte terminator */
412
-
413
- uint8_t *wrapper_data;
414
-
415
- BSON_ASSERT_PARAM (plaintext);
416
- BSON_ASSERT_PARAM (iter);
417
-
418
- /* It is not straightforward to transform a bson_value_t to a string of
419
- * bytes. As a workaround, we wrap the value in a bson document with an empty
420
- * key, then use the raw buffer from inside the new bson_t, skipping the
421
- * length and type header information and the key name. */
422
- bson_append_iter (&wrapper, "", 0, iter);
423
- wrapper_data = ((uint8_t *) bson_get_data (&wrapper));
424
- BSON_ASSERT (wrapper.len >= (uint32_t) offset + NULL_BYTE_LEN);
425
- plaintext->len =
426
- wrapper.len - (uint32_t) offset - NULL_BYTE_LEN; /* the final null byte */
427
- plaintext->data = bson_malloc (plaintext->len);
428
- BSON_ASSERT (plaintext->data);
429
-
430
- plaintext->owned = true;
431
- memcpy (plaintext->data, wrapper_data + offset, plaintext->len);
432
-
433
- bson_destroy (&wrapper);
434
- }
435
-
436
-
437
- bool
438
- _mongocrypt_buffer_from_uuid_iter (_mongocrypt_buffer_t *buf, bson_iter_t *iter)
439
- {
440
- const uint8_t *data;
441
- bson_subtype_t subtype;
442
- uint32_t len;
443
-
444
- BSON_ASSERT_PARAM (buf);
445
- BSON_ASSERT_PARAM (iter);
446
-
447
- if (!BSON_ITER_HOLDS_BINARY (iter)) {
448
- return false;
449
- }
450
- bson_iter_binary (iter, &subtype, &len, &data);
451
- if (subtype != BSON_SUBTYPE_UUID) {
452
- return false;
453
- }
454
- if (len != UUID_LEN) {
455
- return false;
456
- }
457
- _mongocrypt_buffer_init (buf);
458
- buf->data = (uint8_t *) data;
459
- buf->len = len;
460
- buf->subtype = subtype;
461
- buf->owned = false;
462
- return true;
463
- }
464
-
465
-
466
- bool
467
- _mongocrypt_buffer_copy_from_uuid_iter (_mongocrypt_buffer_t *buf,
468
- bson_iter_t *iter)
469
- {
470
- BSON_ASSERT_PARAM (buf);
471
- BSON_ASSERT_PARAM (iter);
472
-
473
- if (!_mongocrypt_buffer_from_uuid_iter (buf, iter)) {
474
- return false;
475
- }
476
- _make_owned (buf);
477
- return true;
478
- }
479
-
480
- bool
481
- _mongocrypt_buffer_is_uuid (_mongocrypt_buffer_t *buf)
482
- {
483
- BSON_ASSERT_PARAM (buf);
484
-
485
- return buf->len == UUID_LEN && buf->subtype == BSON_SUBTYPE_UUID;
486
- }
487
-
488
- void
489
- _mongocrypt_buffer_copy_from_hex (_mongocrypt_buffer_t *buf, const char *hex)
490
- {
491
- uint32_t i;
492
- size_t hex_len;
493
-
494
- BSON_ASSERT_PARAM (buf);
495
- BSON_ASSERT_PARAM (hex);
496
-
497
- hex_len = strlen (hex);
498
- if (hex_len == 0) {
499
- _mongocrypt_buffer_init (buf);
500
- return;
501
- }
502
-
503
- BSON_ASSERT (hex_len / 2u <= UINT32_MAX);
504
- buf->len = (uint32_t) (hex_len / 2u);
505
- buf->data = bson_malloc (buf->len);
506
- BSON_ASSERT (buf->data);
507
-
508
- buf->owned = true;
509
- for (i = 0; i < buf->len; i++) {
510
- uint32_t tmp;
511
- BSON_ASSERT (i <= UINT32_MAX / 2);
512
- BSON_ASSERT (sscanf (hex + (2 * i), "%02x", &tmp));
513
- *(buf->data + i) = (uint8_t) tmp;
514
- }
515
- }
516
-
517
- int
518
- _mongocrypt_buffer_cmp_hex (_mongocrypt_buffer_t *buf, const char *hex)
519
- {
520
- _mongocrypt_buffer_t tmp;
521
- int res;
522
-
523
- BSON_ASSERT_PARAM (buf);
524
- BSON_ASSERT_PARAM (hex);
525
-
526
- _mongocrypt_buffer_copy_from_hex (&tmp, hex);
527
- res = _mongocrypt_buffer_cmp (buf, &tmp);
528
- _mongocrypt_buffer_cleanup (&tmp);
529
- return res;
530
- }
531
-
532
- char *
533
- _mongocrypt_buffer_to_hex (_mongocrypt_buffer_t *buf)
534
- {
535
- BSON_ASSERT_PARAM (buf);
536
- /* since buf->len is a uint32_t, even doubling it won't bring it anywhere
537
- * near to SIZE_MAX */
538
-
539
- char *hex = bson_malloc0 (buf->len * 2 + 1);
540
- BSON_ASSERT (hex);
541
-
542
- char *out = hex;
543
-
544
- for (uint32_t i = 0; i < buf->len; i++, out += 2) {
545
- sprintf (out, "%02X", buf->data[i]);
546
- }
547
- return hex;
548
- }
549
-
550
- bool
551
- _mongocrypt_buffer_concat (_mongocrypt_buffer_t *dst,
552
- const _mongocrypt_buffer_t *srcs,
553
- uint32_t num_srcs)
554
- {
555
- uint32_t total = 0;
556
- uint32_t offset;
557
- uint32_t i;
558
-
559
- BSON_ASSERT_PARAM (dst);
560
- BSON_ASSERT_PARAM (srcs);
561
-
562
- for (i = 0; i < num_srcs; i++) {
563
- uint32_t old_total = total;
564
-
565
- total += srcs[i].len;
566
- /* If the previous operation overflowed, then total will have a smaller
567
- * value than previously. */
568
- if (total < old_total) {
569
- return false;
570
- }
571
- }
572
-
573
- _mongocrypt_buffer_init (dst);
574
- _mongocrypt_buffer_resize (dst, total);
575
- offset = 0;
576
- for (i = 0; i < num_srcs; i++) {
577
- if (srcs[i].len) {
578
- memcpy (dst->data + offset, srcs[i].data, srcs[i].len);
579
- }
580
- offset += srcs[i].len;
581
- }
582
- return true;
583
- }
584
-
585
- struct _mongocrypt_binary_t *
586
- _mongocrypt_buffer_as_binary (_mongocrypt_buffer_t *buf)
587
- {
588
- BSON_ASSERT_PARAM (buf);
589
-
590
- buf->bin.data = buf->data;
591
- buf->bin.len = buf->len;
592
- return &buf->bin;
593
- }
594
-
595
- bool
596
- _mongocrypt_buffer_copy_from_data_and_size (_mongocrypt_buffer_t *buf,
597
- const uint8_t *data,
598
- size_t len)
599
- {
600
- BSON_ASSERT_PARAM (buf);
601
- BSON_ASSERT_PARAM (data);
602
-
603
- _mongocrypt_buffer_init (buf);
604
-
605
- if (!size_to_uint32 (len, &buf->len)) {
606
- return false;
607
- }
608
- buf->data = bson_malloc (len);
609
- memcpy (buf->data, data, len);
610
- buf->owned = true;
611
- return true;
612
- }
613
-
614
- bool
615
- _mongocrypt_buffer_steal_from_data_and_size (_mongocrypt_buffer_t *buf,
616
- uint8_t *data,
617
- size_t len)
618
- {
619
- BSON_ASSERT_PARAM (buf);
620
- BSON_ASSERT_PARAM (data);
621
-
622
- _mongocrypt_buffer_init (buf);
623
- if (!size_to_uint32 (len, &buf->len)) {
624
- return false;
625
- }
626
- buf->data = data;
627
- buf->owned = true;
628
- return true;
629
- }
630
-
631
- bool
632
- _mongocrypt_buffer_steal_from_string (_mongocrypt_buffer_t *buf, char *str)
633
- {
634
- BSON_ASSERT_PARAM (buf);
635
- BSON_ASSERT_PARAM (str);
636
-
637
- _mongocrypt_buffer_init (buf);
638
- if (!size_to_uint32 (strlen (str), &buf->len)) {
639
- return false;
640
- }
641
- buf->data = (uint8_t *) str;
642
- buf->owned = true;
643
- return true;
644
- }
645
-
646
- bool
647
- _mongocrypt_buffer_from_string (_mongocrypt_buffer_t *buf, const char *str)
648
- {
649
- BSON_ASSERT_PARAM (buf);
650
- BSON_ASSERT_PARAM (str);
651
-
652
- _mongocrypt_buffer_init (buf);
653
- if (!size_to_uint32 (strlen (str), &buf->len)) {
654
- return false;
655
- }
656
- buf->data = (uint8_t *) str;
657
- buf->owned = false;
658
- return true;
659
- }
660
-
661
- void
662
- _mongocrypt_buffer_copy_from_uint64_le (_mongocrypt_buffer_t *buf,
663
- uint64_t value)
664
- {
665
- uint64_t value_le = MONGOCRYPT_UINT64_TO_LE (value);
666
-
667
- BSON_ASSERT_PARAM (buf);
668
-
669
- _mongocrypt_buffer_init (buf);
670
- _mongocrypt_buffer_resize (buf, sizeof (value));
671
- memcpy (buf->data, &value_le, buf->len);
672
- }
673
-
674
- bool
675
- _mongocrypt_buffer_from_subrange (_mongocrypt_buffer_t *out,
676
- const _mongocrypt_buffer_t *in,
677
- uint32_t offset,
678
- uint32_t len)
679
- {
680
- BSON_ASSERT_PARAM (out);
681
- BSON_ASSERT_PARAM (in);
682
-
683
- _mongocrypt_buffer_init (out);
684
- BSON_ASSERT (offset <= UINT32_MAX - len);
685
- if (offset + len > in->len) {
686
- return false;
687
- }
688
- out->data = in->data + offset;
689
- out->len = len;
690
- return true;
532
+ bool _mongocrypt_buffer_from_string(_mongocrypt_buffer_t *buf, const char *str) {
533
+ BSON_ASSERT_PARAM(buf);
534
+ BSON_ASSERT_PARAM(str);
535
+
536
+ _mongocrypt_buffer_init(buf);
537
+ if (!size_to_uint32(strlen(str), &buf->len)) {
538
+ return false;
539
+ }
540
+ buf->data = (uint8_t *)str;
541
+ buf->owned = false;
542
+ return true;
543
+ }
544
+
545
+ void _mongocrypt_buffer_copy_from_uint64_le(_mongocrypt_buffer_t *buf, uint64_t value) {
546
+ uint64_t value_le = MONGOCRYPT_UINT64_TO_LE(value);
547
+
548
+ BSON_ASSERT_PARAM(buf);
549
+
550
+ _mongocrypt_buffer_init(buf);
551
+ _mongocrypt_buffer_resize(buf, sizeof(value));
552
+ memcpy(buf->data, &value_le, buf->len);
553
+ }
554
+
555
+ bool _mongocrypt_buffer_from_subrange(_mongocrypt_buffer_t *out,
556
+ const _mongocrypt_buffer_t *in,
557
+ uint32_t offset,
558
+ uint32_t len) {
559
+ BSON_ASSERT_PARAM(out);
560
+ BSON_ASSERT_PARAM(in);
561
+
562
+ _mongocrypt_buffer_init(out);
563
+ BSON_ASSERT(offset <= UINT32_MAX - len);
564
+ if (offset + len > in->len) {
565
+ return false;
566
+ }
567
+ out->data = in->data + offset;
568
+ out->len = len;
569
+ return true;
691
570
  }