libmongocrypt-helper 1.8.0.0.1001 → 1.11.0.0.1001

data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_decimal128.cstruct

@@ -1,4 +1,4 @@
-// This code is GENERATED! Do not edit!
+// This code is GENERATED! Do not edit! Regenerate with `test/util/make_includes.py`
 // clang-format off
 {
   .lowerBound = mc_dec128_from_string("-100.000000"),

data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_decimal128_precision.cstruct

@@ -1,4 +1,4 @@
-// This code is GENERATED! Do not edit!
+// This code is GENERATED! Do not edit! Regenerate with `test/util/make_includes.py`
 // clang-format off
 {
   .lowerBound = mc_dec128_from_string("0.000000"),

data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_double.cstruct

@@ -1,4 +1,4 @@
-// This code is GENERATED! Do not edit!
+// This code is GENERATED! Do not edit! Regenerate with `test/util/make_includes.py`
 // clang-format off
 {
   .lowerBound = -100.000000,

data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_double_precision.cstruct

@@ -1,4 +1,4 @@
-// This code is GENERATED! Do not edit!
+// This code is GENERATED! Do not edit! Regenerate with `test/util/make_includes.py`
 // clang-format off
 {
   .lowerBound = 0.000000,
@@ -299,7 +299,7 @@
   .max = { .set = true, .value = 314.159265 },
   .precision = { .set = true, .value = 6 },
   .expectMincoverStrings = {
-    "0000010011100111000101111011",
+    "00000100111001110001011110111",
     "00000100111001110001011111",
     "000001001110011100011",
     "0000010011100111001",

data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_int32.cstruct

@@ -1,4 +1,4 @@
-// This code is GENERATED! Do not edit!
+// This code is GENERATED! Do not edit! Regenerate with `test/util/make_includes.py`
 // clang-format off
 {
   .lowerBound = -100,

data/ext/libmongocrypt/libmongocrypt/test/data/range-min-cover/mincover_int64.cstruct

@@ -1,4 +1,4 @@
-// This code is GENERATED! Do not edit!
+// This code is GENERATED! Do not edit! Regenerate with `test/util/make_includes.py`
 // clang-format off
 {
   .lowerBound = -100,

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/cmd.json

@@ -0,0 +1,8 @@
+{
+    "find": "test",
+    "filter": {
+        "encrypted": {
+            "$numberInt": "123456"
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/encrypted-field-map.json

@@ -0,0 +1,19 @@
+{
+   "db.test": {
+      "fields": [
+         {
+            "keyId": {
+               "$binary": {
+                  "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                  "subType": "04"
+               }
+            },
+            "path": "encrypted",
+            "bsonType": "int",
+            "queries": {
+               "queryType": "range"
+            }
+         }
+      ]
+   }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/encrypted-payload.json

@@ -0,0 +1,53 @@
+{
+    "find": "test",
+    "filter": {
+        "$and": [
+            {
+                "encrypted": {
+                    "$gte": {
+                        "$binary": {
+                            "base64": "DQEBAAADcGF5bG9hZACZAAAABGcAhQAAAAMwAH0AAAAFZAAgAAAAABVoe9wkcCyHpbOGCU+k9auwnEcS2CtNpRqiecg98ONpBXMAIAAAAABvqHHsxgHdi12FXVttMVYYwNK4R2zYUjeXQHAURNBvzwVsACAAAAAAfmp4QWZF7LiYXH6RYjf1kc6OpgRnCadlHki6cRrMilsAABJjbQAIAAAAAAAAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAASc3AAAgAAAAAAAAAQdGYABgAAABBtbgAAAACAEG14AP///38A",
+                            "subType": "06"
+                        }
+                    }
+                }
+            },
+            {
+                "encrypted": {
+                    "$lte": {
+                        "$binary": {
+                            "base64": "DTsAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAAA",
+                            "subType": "06"
+                        }
+                    }
+                }
+            }
+        ]
+    },
+    "encryptionInformation": {
+        "type": {
+            "$numberInt": "1"
+        },
+        "schema": {
+            "db.test": {
+                "fields": [
+                    {
+                        "keyId": {
+                            "$binary": {
+                                "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                                "subType": "04"
+                            }
+                        },
+                        "path": "encrypted",
+                        "bsonType": "int",
+                        "queries": {
+                            "queryType": "range"
+                        }
+                    }
+                ],
+                "escCollection": "enxcol_.test.esc",
+                "ecocCollection": "enxcol_.test.ecoc"
+            }
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-find-int32/mongocryptd-reply.json

@@ -0,0 +1,58 @@
+{
+    "hasEncryptionPlaceholders": true,
+    "schemaRequiresEncryption": true,
+    "result": {
+        "find": "test",
+        "filter": {
+            "$and": [
+                {
+                    "encrypted": {
+                        "$gte": {
+                            "$binary": {
+                                "base64": "AxABAAAQdAACAAAAEGEAAwAAAAVraQAQAAAABBI0VngSNJh2EjQSNFZ4kBIFa3UAEAAAAAQSNFZ4EjSYdhI0EjRWeJASA3YAsQAAAANlZGdlc0luZm8AawAAABBsb3dlckJvdW5kAEDiAQAIbGJJbmNsdWRlZAABEHVwcGVyQm91bmQAQOIBAAh1YkluY2x1ZGVkAAEQdHJpbUZhY3RvcgAGAAAAEGluZGV4TWluAAAAAIAQaW5kZXhNYXgA////fwAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAAAEmNtAAgAAAAAAAAAEnMAAgAAAAAAAAAA",
+                                "subType": "06"
+                            }
+                        }
+                    }
+                },
+                {
+                    "encrypted": {
+                        "$lte": {
+                            "$binary": {
+                                "base64": "A5oAAAAQdAACAAAAEGEAAwAAAAVraQAQAAAABBI0VngSNJh2EjQSNFZ4kBIFa3UAEAAAAAQSNFZ4EjSYdhI0EjRWeJASA3YAOwAAABBwYXlsb2FkSWQAAAAAABBmaXJzdE9wZXJhdG9yAAIAAAAQc2Vjb25kT3BlcmF0b3IABAAAAAASY20ACAAAAAAAAAAScwACAAAAAAAAAAA=",
+                                "subType": "06"
+                            }
+                        }
+                    }
+                }
+            ]
+        },
+        "encryptionInformation": {
+            "type": {
+                "$numberInt": "1"
+            },
+            "schema": {
+                "db.test": {
+                    "fields": [
+                        {
+                            "keyId": {
+                                "$binary": {
+                                    "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                                    "subType": "04"
+                                }
+                            },
+                            "path": "encrypted",
+                            "bsonType": "int",
+                            "queries": {
+                                "queryType": "range"
+                            }
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    "ok": {
+        "$numberDouble": "1.0"
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/cmd.json

@@ -0,0 +1,11 @@
+{
+    "insert": "test",
+    "documents": [
+        {
+            "plainText": "sample",
+            "encrypted": {
+                "$numberInt": "123456"
+            }
+        }
+    ]
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/encrypted-field-map.json

@@ -0,0 +1,19 @@
+{
+   "db.test": {
+      "fields": [
+         {
+            "keyId": {
+               "$binary": {
+                  "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                  "subType": "04"
+               }
+            },
+            "path": "encrypted",
+            "bsonType": "int",
+            "queries": {
+               "queryType": "range"
+            }
+         }
+      ]
+   }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/encrypted-payload.json

@@ -0,0 +1,40 @@
+{
+    "insert": "test",
+    "documents": [
+        {
+            "plainText": "sample",
+            "encrypted": {
+                "$binary": {
+                    "base64": "C64LAAAFZAAgAAAAAFX/OCQuK7sgFC5OgvIzRF0iZF5yZhqqgVEw+BDk04D/BXMAIAAAAADf8ZGTnPqqur9tusELGqTbSNtoJgj8i071DXm7kQpcSgVwADEAAAAAAwECAwECAwECAwECAwECAz+VM8kdZjiqXJ2Kga/NSZuITHP/iMRHFXZ17XdXy4FMWwV1ABAAAAAEEjRWeBI0mHYSNBI0VniQEhB0ABAAAAAFdgBQAAAAABI0VngSNJh2EjQSNFZ4kBIBAgMBAgMBAgMBAgMBAgMB978eymjOG8LzTgudRZqpbK4Tm1RK3tB9QMB9lTWKiy6Wqp7twzRA/ZbjQ69RKj60BWUAIAAAAADrmnP3kS2GpCl+gdL2da90KHTkBX46iQ/sZRoj7uPz7AVsACAAAAAAlO36MaVLVRDFW6xrI+0UTkyQdFfSCEBPkZg8sFzuTJYSawAGAAAAAAAAAARnACcKAAADMAC2AAAABWQAIAAAAABx4c6MPMR3Yyxzi0dTMjQ7UdRNgI8uP2LTi1vhGYnLMAVzACAAAAAAon13gVyXE18K3ylqp/ovYStGulVBaekS2mKVRFq7RQgFbAAgAAAAAH5qeEFmRey4mFx+kWI39ZHOjqYEZwmnZR5IunEazIpbBXAAMQAAAAACAwECAwECAwECAwECAwECy273HayEz3hgoMYG56e0sxacPePKwPiqCCS575wlTLMxAAMxALYAAAAFZAAgAAAAALhKoC9+IzmWByMV7+lxHqBz30ckyd4wjXTJIaxvSHGQBXMAIAAAAADOFYCxSi5cl0dHBBpG2MuoCMK4VW7bnHkT4W0b8/S9QAVsACAAAAAA2ed4R4wYD6DT0P+N6o3gDJPE0DjljbRAv5vme3jb42sFcAAxAAAAAAMBAgMBAgMBAgMBAgMBAgMucSLry7LOh6S3NFriDyboyFWjjO7jUCKQmfnXNTVgRlsAAzIAtgAAAAVkACAAAAAA6d+xdtGaB4rPWNOM/dfLBsjgszgJ3nZIu6NMY7PGleMFcwAgAAAAAOoLJCMXdUXT5CP7ddF7NkbkHzTWmAJdEQnP3xG/VufdBWwAIAAAAADH9XHyaSTZUZNt8Z6XnKi7viLmxyO8TBuoRmwhAOkIogVwADEAAAAAAQIDAQIDAQIDAQIDAQIDAViMN5HI9n2E2jIfq+NIBjTZq9V1WKXzuz6coSb44HleywADMwC2AAAABWQAIAAAAABHc/GW0GvNFnIAzns/1yI0xGl/Ir5cH5BLQckH+kV3fAVzACAAAAAAQmiJLIWjabGJeih4GboT6t/cn3SFOjMUgUpJrmQ8XUEFbAAgAAAAAOZbKzIqF/xRxwrHvwiWIdNZqj2l78DCYswNswCdUkc9BXAAMQAAAAACAwECAwECAwECAwECAwECK3sJsHWwtZbjBccUWeeIOOIGGMIOkyKsUwxlBaKiVPowAAM0ALYAAAAFZAAgAAAAAOW+ccgZnspe3Zk0B15sNoxYs+++vkIhLYDssUWrpf+ZBXMAIAAAAAC13nmuhE1cSoIdkJleu6iHCYZARpCxvagwSrdjvgaRUgVsACAAAAAAIrk7klUCamSAp05f9qK6PqR041yRVCaJ7dctpSUm5/gFcAAxAAAAAAMBAgMBAgMBAgMBAgMBAgNVutv0BdHOWmHtoNn6bEXHyRFbnxCJcfOzMiOveMdMVFsAAzUAtgAAAAVkACAAAAAAHDzIz2zmH3ABRBNEt4lMKBvbFr/Isvn120UyOZX2fO0FcwAgAAAAAC38Cjx6SPJmI+8cIdItT/DAqdCxJaLNeqYyxzGMte4GBWwAIAAAAAB2mov70YYtzeH4imEKJhjQUoXg3o3I54oyLFTZgru74QVwADEAAAAAAQIDAQIDAQIDAQIDAQIDAZ97GY6ly8oxHf74/+Aef4L9HTES5QVj0JFhuQbLA3CFywADNgC2AAAABWQAIAAAAAD0ugfk8nq6aFeln4+QLIhFyOkLafGcozN8MvybVLzaRgVzACAAAAAAC1ORUt0477aATkfBAN86Ky6TzUN4zYnGFdZw5VLJ3hcFbAAgAAAAAAs9x1SnVpMfNv5Bm1aXGwHmbbI9keWa9HRD35XuCBK5BXAAMQAAAAACAwECAwECAwECAwECAwECYkARzi0rM5HqMaitQIKh+RNJSvXzZJh+x5BcTpRX16wwAAM3ALYAAAAFZAAgAAAAANCNn0wJp9IH48jKhaXrMNEZxL+8bFLBDK4cdcRKisXwBXMAIAAAAAAwYLl1BiMdwdX0D4kOg6Ny/vAShkyLLpYLOj//l8nv8QVsACAAAAAADxH2z9GufFM6RT5+pgWycCbSSY0peGvRXeT/U6u25NEFcAAxAAAAAAMBAgMBAgMBAgMBAgMBAgPQBBsvh7+P0TYEP8mqVE4yPmcJX8yz4s2IQqszUQgy91sAAzgAtgAAAAVkACAAAAAApUDgJrXbR7rYptc8rNKDAMTJJgpWx3wJ5Ei6ExI4cKsFcwAgAAAAAFYLdRWwhup6c51dwxz7JtWZ9hiWTI45RNME1HAiNLTlBWwAIAAAAAAK6ZFHvQOghjlhXsLbZmhDLlW+nCV3NrZD9Ue7y3/0ngVwADEAAAAAAQIDAQIDAQIDAQIDAQIDAeSMZqdvBdItTYy5HS7IFqekQvk1jCmX7uRXqkdlgipmywADOQC2AAAABWQAIAAAAACnNRIgrtUTrL9bvDzNfdzpGsdqBElHVWVpYyPXwSwrvgVzACAAAAAAjmBoFQHWGwST1BE0yaBiekIcYVsoUf/BSrLwO9UhtEsFbAAgAAAAAEe9aNvZUOhoa4IYjG0TUFY0Lbx6KYY//F0HqCDbN/u7BXAAMQAAAAACAwECAwECAwECAwECAwEC53PoifHFxyP5q/5Yif35qH/G5u2j+O55mPTckBO/vfAwAAMxMAC2AAAABWQAIAAAAADO9uLhaBzFY2pp5k2huL0y7Ia9bbX9Td+8jbnze8vEoAVzACAAAAAAqE4YrbpDF0KstI1C6t+5gafrNKpWWc0gzHNa1VbxPjgFbAAgAAAAABkNIn+3njU/Zxu3Jz1yp3hxtx8KveIfzSQx6uLAsQLYBXAAMQAAAAADAQIDAQIDAQIDAQIDAQIDSCq69zvfhVJPRL0CTghUwWd8L3PWYQF7TwvOGZAw4z5bAAMxMQC2AAAABWQAIAAAAABugPtcm/HV5MD8yyuw4bpcdO1+K8CkSbE/dhzK93fyJAVzACAAAAAAuKJP+IQVI2kYA02OeeHFQEmvuVVPFYtpD7nAcl4U8rYFbAAgAAAAAJRkWtjoKRlC5wNyXtyBUyPeH8hFa0fcZTw8R8alLt7QBXAAMQAAAAABAgMBAgMBAgMBAgMBAgMBCiVcSluWGz4mEqlQS9L1MnQbWPaPsiXDOOq+RRmibDXLAAMxMgC2AAAABWQAIAAAAAC6uNqCo6p+ohuqlioUo7bhj6L+0kJpFl3yLYfYhqbnrAVzACAAAAAAH6WDk481/wTTL/Y6t765GCYPH0niPXWzamTeZ6lEQkcFbAAgAAAAABhXLMOXrnco598ejjUHAkNGZR8eNVnDMWrAuQ16j2O/BXAAMQAAAAACAwECAwECAwECAwECAwECdrYDD38mIyO5UBlW9+MiyhvVmP9plGQLuCLyzG/aS/wwAAMxMwC2AAAABWQAIAAAAABn8GOJ0BUhqxsCMujadpEuMjQH/JqjdSe+d7ck4BJpBgVzACAAAAAA/+5+gxu0s/JHvMroY0hgg4/pNDl6+FbjkVVL4pp0wKAFbAAgAAAAAIZjTmkgXeFszdl7b+WoFTth6LSUyRYvg6eh5JiOaoBYBXAAMQAAAAADAQIDAQIDAQIDAQIDAQIDH4rc2ZooIeKkTPqox5+Nw09+L+D6wJq4Ei3fLly1HaZbAAASc3AAAgAAAAAAAAAQdGYABgAAABBtbgAAAACAEG14AP///38A",
+                    "subType": "06"
+                }
+            }
+        }
+    ],
+    "encryptionInformation": {
+        "type": {
+            "$numberInt": "1"
+        },
+        "schema": {
+            "db.test": {
+                "fields": [
+                    {
+                        "keyId": {
+                            "$binary": {
+                                "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                                "subType": "04"
+                            }
+                        },
+                        "path": "encrypted",
+                        "bsonType": "int",
+                        "queries": {
+                            "queryType": "range"
+                        }
+                    }
+                ],
+                "escCollection": "enxcol_.test.esc",
+                "ecocCollection": "enxcol_.test.ecoc"
+            }
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/auto-insert-int32/mongocryptd-reply.json

@@ -0,0 +1,45 @@
+{
+    "hasEncryptionPlaceholders": true,
+    "schemaRequiresEncryption": true,
+    "result": {
+        "insert": "test",
+        "encryptionInformation": {
+            "type": {
+                "$numberInt": "1"
+            },
+            "schema": {
+                "db.test": {
+                    "fields": [
+                        {
+                            "keyId": {
+                                "$binary": {
+                                    "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                                    "subType": "04"
+                                }
+                            },
+                            "path": "encrypted",
+                            "bsonType": "int",
+                            "queries": {
+                                "queryType": "range"
+                            }
+                        }
+                    ]
+                }
+            }
+        },
+        "documents": [
+            {
+                "plainText": "sample",
+                "encrypted": {
+                    "$binary": {
+                        "base64": "A30AAAAQdAABAAAAEGEAAwAAAAVraQAQAAAABBI0VngSNJh2EjQSNFZ4kBIFa3UAEAAAAAQSNFZ4EjSYdhI0EjRWeJASA3YAHgAAABB2AEDiAQAQbWluAAAAAIAQbWF4AP///38AEmNtAAgAAAAAAAAAEnMAAgAAAAAAAAAA",
+                        "subType": "06"
+                    }
+                }
+            }
+        ]
+    },
+    "ok": {
+        "$numberDouble": "1.0"
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32/expected.json

@@ -0,0 +1,26 @@
+{
+    "v": {
+        "$and": [
+            {
+                "age": {
+                    "$gte": {
+                        "$binary": {
+                            "base64": "DYEDAAADcGF5bG9hZAAZAwAABGcABQMAAAMwAH0AAAAFZAAgAAAAANBGT3k4GTmoze5hCRukb6u82SvYtFyGp+AHjlySsjWOBXMAIAAAAAB9cQ+iwhaAuhOnOn/BFalNNBn3Tx1mHngGdjzKvNPfsgVsACAAAAAA5ZNdJZh+4XZcHqJMhqWcLUo4YkxCxPhhRU7UFru8pk8AAzEAfQAAAAVkACAAAAAAzrlE+7ZYgnH71G+SpzjCefAEj4qNkUQOfn0FUFuKWycFcwAgAAAAAKZDfaea7ZYGynYzTtP38WQAewOs6QD3NH4RO9XwuJG5BWwAIAAAAACpq6FrRDHryiZeM1B50z/fz/J5yK3fEqAlFj4E6KCdSwADMgB9AAAABWQAIAAAAAA9l5+QldlpI2N4eSiV+2l4tS9xZM+Y8kwcP+KhiEA8owVzACAAAAAAmdQflu77krN/4fFaB4la/ZWystLLh6nNv6xE9ErNZmMFbAAgAAAAACJbpdQ2++FVjMz+SdScn4lx3wsi1Y9gBcJozBfHuC6dAAMzAH0AAAAFZAAgAAAAAAhh9K4YcA+N8ACgj7B4smCyJmmJImd5oOUxjgM3T208BXMAIAAAAAB8LMl/6O3elk8pcE6o/WWd6HQKpQgr22l1tt2CpA+V7QVsACAAAAAAIMPlQ/IXn7oI3v3ltx2/1ql4oP/HRQPRjFyh/qTXANoAAzQAfQAAAAVkACAAAAAAXvLR5mSdJiSJ1DFwqIs6GYKvY+1bd0llpUdegS3y6tEFcwAgAAAAABAbG+tZXZ/z9VokQYAH23Kd7R4B9hjN0M3kWn/KBj8CBWwAIAAAAAACdaE9Ls6mFpsHzPBdVxPze4wHSHyPOW9xjCKEW3nYKgADNQB9AAAABWQAIAAAAAALlsQ6TaYfVYomaBlpbXtQcSyRgpJWDQVMh9YGaoJKwwVzACAAAAAA2OMU7sh4xR5O2482Idkiluu2zVJ2/OytctuyOxrgBWsFbAAgAAAAAA8vwTEAaqZNyh/H/6rELrEWzB/Q+JsF/NJ3zszdMjy+AAASY20AAQAAAAAAAAAAEHBheWxvYWRJZAAAAAAAEGZpcnN0T3BlcmF0b3IAAgAAABBzZWNvbmRPcGVyYXRvcgAEAAAAEnNwAAMAAAAAAAAAEHRmAAQAAAAQbW4AAAAAABBteACH1hIAAA==",
+                            "subType": "06"
+                        }
+                    }
+                }
+            },
+            {
+                "age": {
+                    "$lte": {
+                        "$binary": {
+                            "base64": "DTsAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAAA",
+                            "subType": "06"
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32/to-encrypt.json

@@ -0,0 +1,20 @@
+{
+    "v": {
+        "$and": [
+            {
+                "age": {
+                    "$gte": {
+                        "$numberInt": "23"
+                    }
+                }
+            },
+            {
+                "age": {
+                    "$lte": {
+                        "$numberInt": "35"
+                    }
+                }
+            }
+        ]
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32-defaults/expected.json

@@ -0,0 +1,26 @@
+{
+    "v": {
+        "$and": [
+            {
+                "age": {
+                    "$gte": {
+                        "$binary": {
+                            "base64": "DYECAAADcGF5bG9hZAAZAgAABGcABQIAAAMwAH0AAAAFZAAgAAAAANBGT3k4GTmoze5hCRukb6u82SvYtFyGp+AHjlySsjWOBXMAIAAAAAB9cQ+iwhaAuhOnOn/BFalNNBn3Tx1mHngGdjzKvNPfsgVsACAAAAAA5ZNdJZh+4XZcHqJMhqWcLUo4YkxCxPhhRU7UFru8pk8AAzEAfQAAAAVkACAAAAAAzrlE+7ZYgnH71G+SpzjCefAEj4qNkUQOfn0FUFuKWycFcwAgAAAAAKZDfaea7ZYGynYzTtP38WQAewOs6QD3NH4RO9XwuJG5BWwAIAAAAACpq6FrRDHryiZeM1B50z/fz/J5yK3fEqAlFj4E6KCdSwADMgB9AAAABWQAIAAAAABTX/+x7fmCvi5gAWgsy5xZowLqeEc/z1qE7Eh9QkpMmQVzACAAAAAAjOLpo8K1z0hnG5U/e+p5IVCfR23vd98ZDgqy00xqJuwFbAAgAAAAAFqIYZydW8nwOUai0Cbz6IKBHpkuCbTP/VsBNDG9j1wUAAMzAH0AAAAFZAAgAAAAADgmrmBDpEvWF++05l1otn4vG6Q+GoYpGgdV2EIGSYXaBXMAIAAAAAD2b6bl3/wn2zPllR9z8Kl96rDn8OwdHZuVhUC9sYjFngVsACAAAAAARtUrQP0hYeNlaA1/I+sENuShjFgWyxY3Jw9URdcLiJAAABJjbQABAAAAAAAAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAASc3AAAgAAAAAAAAAQdGYABgAAABBtbgAAAAAAEG14AIfWEgAA",
+                            "subType": "06"
+                        }
+                    }
+                }
+            },
+            {
+                "age": {
+                    "$lte": {
+                        "$binary": {
+                            "base64": "DTsAAAAQcGF5bG9hZElkAAAAAAAQZmlyc3RPcGVyYXRvcgACAAAAEHNlY29uZE9wZXJhdG9yAAQAAAAA",
+                            "subType": "06"
+                        }
+                    }
+                }
+            }
+        ]
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-find-int32-defaults/to-encrypt.json

@@ -0,0 +1,20 @@
+{
+    "v": {
+        "$and": [
+            {
+                "age": {
+                    "$gte": {
+                        "$numberInt": "23"
+                    }
+                }
+            },
+            {
+                "age": {
+                    "$lte": {
+                        "$numberInt": "35"
+                    }
+                }
+            }
+        ]
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-insert-double/expected.json

@@ -0,0 +1,8 @@
+{
+    "v": {
+        "$binary": {
+            "base64": "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",
+            "subType": "06"
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-insert-int32/expected.json

@@ -0,0 +1,8 @@
+{
+    "v": {
+        "$binary": {
+            "base64": "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",
+            "subType": "06"
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/range-sends-cryptoParams/explicit-insert-int32-defaults/expected.json

@@ -0,0 +1,8 @@
+{
+    "v": {
+        "$binary": {
+            "base64": "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",
+            "subType": "06"
+        }
+    }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/tokens/README.md

@@ -7,7 +7,7 @@ Each document is a single-depth set of key value pairs. All values are 32 octet
 | ----- | ----------- |
 | root | The base key from which all other tokens are derived. |
 | value | Data used in `DerivedFromData` tokens. |
-| counter | Data used in `DerivedFromDataAndCounter` tokens. |
+| contentionFactor | Data used in `DerivedFromDataAndContentionFactor` tokens. |
 | collectionsLevel1Token | HMAC(root, 1) |
 | serverTokenDerivationLevel1Token | HMAC(root, 2) |
 | serverDataEncryptionLevel1Token | HMAC(root, 3) |
@@ -18,9 +18,12 @@ Each document is a single-depth set of key value pairs. All values are 32 octet
 | EDCDerivedFromDataToken | HMAC(EDCToken, value) |
 | ESCDerivedFromDataToken | HMAC(ESCToken, value) |
 | ECCDerivedFromDataToken | HMAC(ECCToken, value) |
-| EDCDerivedFromDataTokenAndCounter| HMAC(EDCDerivedFromDataToken, counter) |
-| ESCDerivedFromDataTokenAndCounter| HMAC(ESCDerivedFromDataToken, counter) |
-| ECCDerivedFromDataTokenAndCounter| HMAC(ECCDerivedFromDataToken, counter) |
+| EDCDerivedFromDataTokenAndContentionFactor| HMAC(EDCDerivedFromDataToken, contentionFactor) |
+| ESCDerivedFromDataTokenAndContentionFactor| HMAC(ESCDerivedFromDataToken, contentionFactor) |
+| ECCDerivedFromDataTokenAndContentionFactor| HMAC(ECCDerivedFromDataToken, contentionFactor) |
+| EDCTwiceDerivedToken | HMAC(EDCDerivedFromDataTokenAndContentionFactor, 1) |
+| ESCTwiceDerivedTagToken | HMAC(ESCDerivedFromDataTokenAndContentionFactor, 1) |
+| ESCTwiceDerivedValueToken | HMAC(ESCDerivedFromDataTokenAndContentionFactor, 2) |
 | serverDerivedFromDataToken | HMAC(serverTokenDerivationLevel1Token, value) |
 | serverCountAndContentionFactorEncryptionToken | HMAC(serverDerivedFromDataToken, 1) |
 | serverZerosEncryptionToken | HMAC(serverDerivedFromDataToken, 2) |

data/ext/libmongocrypt/libmongocrypt/test/data/tokens/mc.json

@@ -1,7 +1,7 @@
 {
    "root": "6eda88c8496ec990f5d5518dd2ad6f3d9c33b6055904b120f12de82911fbd933",
    "value": "c07c0df51257948e1a0fc70dd4568e3af99b23b3434c9858237ca7db62db9766",
-   "counter": 1234567890,
+   "contentionFactor": 1234567890,
    "collectionsLevel1Token": "ff2103ff205a36f39704f643c270c129919f008c391d9589a6d2c86a7429d0d3",
    "serverDataEncryptionLevel1Token": "d915ccc1eb81687fb5fc5b799f48c99fbe17e7a011a46a48901b9ae3d790656b",
    "serverTokenDerivationLevel1Token": "1adc114b462741e6ac9f52eacf3dcb8cbca19827693c571d9418fda570c29d82",
@@ -13,9 +13,13 @@
    "ESCDerivedFromDataToken": "acb3fab332131bbeaf112814f29ae0f2b10e97dc94b62db56c594661248e7467",
    "ECCDerivedFromDataToken": "826cfd35c35dcc7d4fbe13f33a3520749853bd1ea4c47919482252fba3a70cec",
    "serverDerivedFromDataToken": "4a671dbf25d68b6c040a077dabb4e63869e03f4d466803609233b16356ec6d66",
-   "EDCDerivedFromDataTokenAndCounter": "70fb9a3f760996f2f1438c5bf2a4d52bcba01b0badc3596276f49ffb2f0b136e",
-   "ESCDerivedFromDataTokenAndCounter": "7076c7b05fb4be4fe585eed930b852a6d088a0c55f3c96b50069e8a26ebfb347",
-   "ECCDerivedFromDataTokenAndCounter": "6c6a349956c19f9c5e638e612011a71fbb71921edb540310c17cd0208b7f548b",
+   "EDCDerivedFromDataTokenAndContentionFactor": "70fb9a3f760996f2f1438c5bf2a4d52bcba01b0badc3596276f49ffb2f0b136e",
+   "ESCDerivedFromDataTokenAndContentionFactor": "7076c7b05fb4be4fe585eed930b852a6d088a0c55f3c96b50069e8a26ebfb347",
+   "ECCDerivedFromDataTokenAndContentionFactor": "6c6a349956c19f9c5e638e612011a71fbb71921edb540310c17cd0208b7f548b",
+   "EDCTwiceDerivedToken": "3643fd370e2719c03234cdeec787dfdc7d8fceecafa8a992e3c1f9d4d53449fe",
+   "ESCTwiceDerivedTagToken": "c73bc4ff5e70222c653140b2b4998b4d62db973f20f116f66ff811a9a907a78f",
+   "ESCTwiceDerivedValueToken": "34150c6f5ab56dc39ddb935accb7f53e5276322fa937650b76a4dda9723d6fba",
    "serverCountAndContentionFactorEncryptionToken": "a8c4a477e5518a527f718a5a1530919f2dad13b1f3559833e17b479711cbdbb9",
-   "serverZerosEncryptionToken": "95fda1e139ef1dc84260d4d3ebaab7627a9676f4af7aeb1b596c7c14a0b3a2ea"
+   "serverZerosEncryptionToken": "95fda1e139ef1dc84260d4d3ebaab7627a9676f4af7aeb1b596c7c14a0b3a2ea",
+   "AnchorPaddingTokenRoot": "d5072cc56d9241470b9771292c3f75d950cba1cf842ca6707d1adfec5ec6f3e7"
 }

data/ext/libmongocrypt/libmongocrypt/test/data/tokens/server.json

@@ -1,7 +1,7 @@
 {
    "root": "e3d9219f79586582112740b2add88e1030d91926ae8afc13ee575cfb8bb965b7",
    "value": "c07c0df51257948e1a0fc70dd4568e3af99b23b3434c9858237ca7db62db9766",
-   "counter": 1234567890,
+   "contentionFactor": 1234567890,
    "collectionsLevel1Token": "BD53ACAC665EDD01E0CA30CB648B2B8F4967544047FD4E7D12B1A9BF07339928",
    "serverTokenDerivationLevel1Token": "C17FDF249DE234F9AB15CD95137EA7EC82AE4E5B51F6BFB0FC1B8FEB6800F74C",
    "serverDataEncryptionLevel1Token": "EB9A73F7912D86A4297E81D2F675AF742874E4057E3A890FEC651A23EEE3F3EC",
@@ -13,9 +13,13 @@
    "ESCDerivedFromDataToken": "DE6A1AC292BC62094C33E94647B044B9B10514317B75F4128DDA2E0FB686704F",
    "ECCDerivedFromDataToken": "9A95D4F44734447E3F0266D1629513A0B7698CCE8C1524F329CE7970627FFD06",
    "serverDerivedFromDataToken": "EDBC92F3BFE4CCB3F088FED8D42379A83F26DC37F2B6D513D4F568A6F32C8C80",
-   "EDCDerivedFromDataTokenAndCounter": "D8CC38AE6A64BD1BF195A2D35734C13AF2B1729AD1052A81BE00BF29C67A696E",
-   "ESCDerivedFromDataTokenAndCounter": "8AAF04CBA6DC16BFB37CADBA43DCA66C183634CB3DA278DE174556AE6E17CEBB",
-   "ECCDerivedFromDataTokenAndCounter": "E9580F805E0D07AF384EBA185384F28A49C3DB93AFA4A187A1F4DA129271D82C",
+   "EDCDerivedFromDataTokenAndContentionFactor": "D8CC38AE6A64BD1BF195A2D35734C13AF2B1729AD1052A81BE00BF29C67A696E",
+   "ESCDerivedFromDataTokenAndContentionFactor": "8AAF04CBA6DC16BFB37CADBA43DCA66C183634CB3DA278DE174556AE6E17CEBB",
+   "ECCDerivedFromDataTokenAndContentionFactor": "E9580F805E0D07AF384EBA185384F28A49C3DB93AFA4A187A1F4DA129271D82C",
+   "EDCTwiceDerivedToken": "B39A7EC33FD976EFB8EEBBBF3A265A933E2128D709BB88C77E3D42AA735F697C",
+   "ESCTwiceDerivedTagToken": "D6F76A9D4767E0889B709517C8CF0412D81874AEB6E6CEBFBDDFF7B013EB7154",
+   "ESCTwiceDerivedValueToken": "53F0A51A43447B9881D5E79BA4C5F78E80BC2BC6AA42B00C81079EBF4C9D5A7C",
    "serverCountAndContentionFactorEncryptionToken": "2F30DBCC06B722B60BC1FF018FC28D5FAEE2F222496BE34A264EF3267E811DA0",
-   "serverZerosEncryptionToken": "986F23F132FF7F14F748AC69373CFC982AD0AD4BAD25BE92008B83AB43E96029"
+   "serverZerosEncryptionToken": "986F23F132FF7F14F748AC69373CFC982AD0AD4BAD25BE92008B83AB43E96029",
+   "AnchorPaddingTokenRoot": "4312890F621FE3CA7497C3405DFD8AAF46A578C77F7404D28C12BA853A4D3327"
 }

data/ext/libmongocrypt/libmongocrypt/test/example-state-machine.c

@@ -151,6 +151,7 @@ void _run_state_machine(mongocrypt_ctx_t *ctx, bson_t *result) {
     while (!done) {
         state = mongocrypt_ctx_state(ctx);
         switch (state) {
+        case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB:
         case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO:
             output = mongocrypt_binary_new();
             CHECK(mongocrypt_ctx_mongo_op(ctx, output));

data/ext/libmongocrypt/libmongocrypt/test/test-gcp-auth.c

@@ -46,7 +46,7 @@ static void _test_createdatakey_with_credentials(_mongocrypt_tester_t *tester) {
         ASSERT_STREQUAL("oauth2.googleapis.com:443", endpoint);
 
         /* Satisfy request. */
-        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/gcp-auth/oauth-response.txt")), kms);
+        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-gcp/oauth-response.txt")), kms);
         ASSERT_CMPINT((int)mongocrypt_kms_ctx_bytes_needed(kms), ==, 0);
 
         kms = mongocrypt_ctx_next_kms_ctx(ctx);
@@ -64,7 +64,7 @@ static void _test_createdatakey_with_credentials(_mongocrypt_tester_t *tester) {
         ASSERT_STREQUAL("cloudkms.googleapis.com:443", endpoint);
 
         /* Satisfy request. */
-        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/gcp-auth/encrypt-response.txt")), kms);
+        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-gcp/encrypt-response.txt")), kms);
         ASSERT_CMPINT((int)mongocrypt_kms_ctx_bytes_needed(kms), ==, 0);
 
         kms = mongocrypt_ctx_next_kms_ctx(ctx);
@@ -109,7 +109,7 @@ static void _test_encrypt_with_credentials(_mongocrypt_tester_t *tester) {
         ASSERT_STREQUAL("oauth2.googleapis.com:443", endpoint);
 
         /* Satisfy request. */
-        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/gcp-auth/oauth-response.txt")), kms);
+        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-gcp/oauth-response.txt")), kms);
         ASSERT_CMPINT((int)mongocrypt_kms_ctx_bytes_needed(kms), ==, 0);
 
         kms = mongocrypt_ctx_next_kms_ctx(ctx);
@@ -127,7 +127,7 @@ static void _test_encrypt_with_credentials(_mongocrypt_tester_t *tester) {
         ASSERT_STREQUAL("cloudkms.googleapis.com:443", endpoint);
 
         /* Satisfy request. */
-        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/gcp-auth/decrypt-response.txt")), kms);
+        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-gcp/decrypt-response.txt")), kms);
         ASSERT_CMPINT((int)mongocrypt_kms_ctx_bytes_needed(kms), ==, 0);
 
         kms = mongocrypt_ctx_next_kms_ctx(ctx);
@@ -157,7 +157,7 @@ static void _test_createdatakey_with_accesstoken(_mongocrypt_tester_t *tester) {
     crypt = mongocrypt_new();
     ASSERT_OK(mongocrypt_setopt_kms_providers(crypt, TEST_BSON("{'gcp': {}}")), crypt);
     mongocrypt_setopt_use_need_kms_credentials_state(crypt);
-    ASSERT_OK(mongocrypt_init(crypt), crypt);
+    ASSERT_OK(_mongocrypt_init_for_test(crypt), crypt);
     ctx = mongocrypt_ctx_new(crypt);
     ASSERT_OK(mongocrypt_ctx_setopt_key_encryption_key(ctx, TEST_BSON(kek)), ctx);
     ASSERT_OK(mongocrypt_ctx_datakey_init(ctx), ctx);
@@ -175,7 +175,7 @@ static void _test_createdatakey_with_accesstoken(_mongocrypt_tester_t *tester) {
         ASSERT_STREQUAL("cloudkms.googleapis.com:443", endpoint);
 
         /* Satisfy request. */
-        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/gcp-auth/encrypt-response.txt")), kms);
+        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-gcp/encrypt-response.txt")), kms);
         ASSERT_CMPINT((int)mongocrypt_kms_ctx_bytes_needed(kms), ==, 0);
 
         kms = mongocrypt_ctx_next_kms_ctx(ctx);
@@ -199,7 +199,7 @@ static void _test_encrypt_with_accesstoken(_mongocrypt_tester_t *tester) {
     crypt = mongocrypt_new();
     ASSERT_OK(mongocrypt_setopt_kms_providers(crypt, TEST_BSON("{'gcp': {}}")), crypt);
     mongocrypt_setopt_use_need_kms_credentials_state(crypt);
-    ASSERT_OK(mongocrypt_init(crypt), crypt);
+    ASSERT_OK(_mongocrypt_init_for_test(crypt), crypt);
     ctx = mongocrypt_ctx_new(crypt);
     uuid = mongocrypt_binary_new_from_data((uint8_t *)uuid_data, UUID_LEN);
     ASSERT_OK(mongocrypt_ctx_setopt_key_id(ctx, uuid), ctx);
@@ -227,7 +227,7 @@ static void _test_encrypt_with_accesstoken(_mongocrypt_tester_t *tester) {
         ASSERT_STREQUAL("cloudkms.googleapis.com:443", endpoint);
 
         /* Satisfy request. */
-        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/gcp-auth/decrypt-response.txt")), kms);
+        ASSERT_OK(mongocrypt_kms_ctx_feed(kms, TEST_FILE("./test/data/kms-gcp/decrypt-response.txt")), kms);
         ASSERT_CMPINT((int)mongocrypt_kms_ctx_bytes_needed(kms), ==, 0);
 
         kms = mongocrypt_ctx_next_kms_ctx(ctx);