libmongocrypt-helper 1.13.2.0.1001 → 1.14.0.0.1001

data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt-status.c

@@ -73,4 +73,4 @@ static void _test_status_len(_mongocrypt_tester_t *tester) {
 
 void _mongocrypt_tester_install_status(_mongocrypt_tester_t *tester) {
     INSTALL_TEST(_test_status_len);
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.c

@@ -81,10 +81,13 @@ void _usleep(int64_t usec) {
 }
 
 #define TEST_DATA_COUNT_INC(var)                                                                                       \
-    (var)++;                                                                                                           \
-    if ((var) >= TEST_DATA_COUNT) {                                                                                    \
-        TEST_ERROR("TEST_DATA_COUNT exceeded for %s. Increment TEST_DATA_COUNT.", #var);                               \
-    }
+    if (1) {                                                                                                           \
+        (var)++;                                                                                                       \
+        if ((var) >= TEST_DATA_COUNT) {                                                                                \
+            TEST_ERROR("TEST_DATA_COUNT exceeded for %s. Increment TEST_DATA_COUNT.", #var);                           \
+        }                                                                                                              \
+    } else                                                                                                             \
+        ((void)0)
 
 static void _load_json(_mongocrypt_tester_t *tester, const char *path) {
     bson_t as_bson;
@@ -206,26 +209,20 @@ bson_t *_mongocrypt_tester_file_as_bson(_mongocrypt_tester_t *tester, const char
     return bson;
 }
 
-bson_t *_mongocrypt_tester_bson_from_json(_mongocrypt_tester_t *tester, const char *json, ...) {
-    va_list ap;
-    char *full_json;
-    bson_t *bson;
-    bson_error_t error;
-    char *c;
+bson_t *_mongocrypt_tester_bson_from_str(_mongocrypt_tester_t *tester, const char *json) {
+    char *const full_json = bson_strdup(json);
 
-    va_start(ap, json);
-    full_json = bson_strdupv_printf(json, ap);
     /* Replace ' with " */
-    for (c = full_json; *c; c++) {
+    for (char *c = full_json; *c; c++) {
         if (*c == '\'') {
             *c = '"';
         }
     }
 
-    va_end(ap);
-    bson = &tester->test_bson[tester->bson_count];
+    bson_error_t error;
+    bson_t *const bson = &tester->test_bson[tester->bson_count];
     TEST_DATA_COUNT_INC(tester->bson_count);
-    if (!bson_init_from_json(bson, full_json, strlen(full_json), &error)) {
+    if (!bson_init_from_json(bson, full_json, -1, &error)) {
         TEST_STDERR_PRINTF("%s", error.message);
         abort();
     }
@@ -233,6 +230,17 @@ bson_t *_mongocrypt_tester_bson_from_json(_mongocrypt_tester_t *tester, const ch
     return bson;
 }
 
+bson_t *_mongocrypt_tester_bson_from_json(_mongocrypt_tester_t *tester, const char *json, ...) {
+    va_list ap;
+    va_start(ap, json);
+    char *const full_json = bson_strdupv_printf(json, ap);
+    va_end(ap);
+
+    bson_t *const bson = _mongocrypt_tester_bson_from_str(tester, full_json);
+    bson_free(full_json);
+    return bson;
+}
+
 bson_t *tmp_bsonf(_mongocrypt_tester_t *tester, const char *fmt, ...) {
     va_list arg;
     va_start(arg, fmt);
@@ -283,41 +291,30 @@ bson_t *tmp_bsonf(_mongocrypt_tester_t *tester, const char *fmt, ...) {
 #undef ENSURE_CAPACITY
 
     dst[dst_len] = '\0';
-    bson_t *tmp = TMP_BSON(dst);
+    bson_t *tmp = TMP_BSON_STR(dst);
     va_end(arg);
     bson_free(dst);
     return tmp;
 }
 
-mongocrypt_binary_t *_mongocrypt_tester_bin_from_json(_mongocrypt_tester_t *tester, const char *json, ...) {
-    va_list ap;
-    char *full_json;
-    bson_t *bson;
-    mongocrypt_binary_t *bin;
-    bson_error_t error;
-    char *c;
-
-    va_start(ap, json);
-    full_json = bson_strdupv_printf(json, ap);
-    /* Replace ' with " */
-    for (c = full_json; *c; c++) {
-        if (*c == '\'') {
-            *c = '"';
-        }
-    }
-
-    va_end(ap);
-    bson = &tester->test_bson[tester->bson_count];
-    TEST_DATA_COUNT_INC(tester->bson_count);
-    if (!bson_init_from_json(bson, full_json, strlen(full_json), &error)) {
-        TEST_STDERR_PRINTF("failed to parse JSON %s: %s", error.message, json);
-        abort();
-    }
-    bin = mongocrypt_binary_new();
+mongocrypt_binary_t *_mongocrypt_tester_bin_from_str(_mongocrypt_tester_t *tester, const char *json) {
+    mongocrypt_binary_t *const bin = mongocrypt_binary_new();
     tester->test_bin[tester->bin_count] = bin;
     TEST_DATA_COUNT_INC(tester->bin_count);
+
+    bson_t *const bson = _mongocrypt_tester_bson_from_str(tester, json);
     bin->data = (uint8_t *)bson_get_data(bson);
     bin->len = bson->len;
+    return bin;
+}
+
+mongocrypt_binary_t *_mongocrypt_tester_bin_from_json(_mongocrypt_tester_t *tester, const char *json, ...) {
+    va_list ap;
+    va_start(ap, json);
+    char *const full_json = bson_strdupv_printf(json, ap);
+    va_end(ap);
+
+    mongocrypt_binary_t *const bin = _mongocrypt_tester_bin_from_str(tester, full_json);
     bson_free(full_json);
     return bin;
 }
@@ -459,8 +456,8 @@ const char *_mongocrypt_tester_plaintext(_mongocrypt_tester_t *tester) {
     status = mongocrypt_status_new();
     ASSERT_OR_PRINT(_mongocrypt_marking_parse_unowned(&buf, &marking, status), status);
     mongocrypt_status_destroy(status);
-    BSON_ASSERT(BSON_ITER_HOLDS_UTF8(&marking.v_iter));
-    return bson_iter_utf8(&marking.v_iter, NULL);
+    BSON_ASSERT(BSON_ITER_HOLDS_UTF8(&marking.u.fle1.v_iter));
+    return bson_iter_utf8(&marking.u.fle1.v_iter, NULL);
 }
 
 mongocrypt_binary_t *_mongocrypt_tester_encrypted_doc(_mongocrypt_tester_t *tester) {
@@ -575,11 +572,6 @@ mongocrypt_t *_mongocrypt_tester_mongocrypt(tester_mongocrypt_flags flags) {
     if (flags & TESTER_MONGOCRYPT_WITH_CRYPT_SHARED_LIB) {
         mongocrypt_setopt_append_crypt_shared_lib_search_path(crypt, "$ORIGIN");
     }
-    if (flags & TESTER_MONGOCRYPT_WITH_RANGE_V2) {
-        ASSERT(mongocrypt_setopt_use_range_v2(crypt));
-    } else {
-        crypt->opts.use_range_v2 = false;
-    }
     if (flags & TESTER_MONGOCRYPT_WITH_SHORT_CACHE) {
         ASSERT(mongocrypt_setopt_key_expiration(crypt, 1));
     }
@@ -599,10 +591,6 @@ mongocrypt_t *_mongocrypt_tester_mongocrypt(tester_mongocrypt_flags flags) {
 
 bool _mongocrypt_init_for_test(mongocrypt_t *crypt) {
     BSON_ASSERT_PARAM(crypt);
-    // Even if the ENABLE_USE_RANGE_V2 compile flag is on, we should have range V2 off by default for testing, as many
-    // existing tests are based around range V2 being disabled. To use range V2, use the TESTER_MONGOCRYPT_WITH_RANGE_V2
-    // flag with the above function.
-    crypt->opts.use_range_v2 = false;
     return mongocrypt_init(crypt);
 }
 
@@ -876,14 +864,14 @@ static void _test_setopt_kms_providers(_mongocrypt_tester_t *tester) {
             mongocrypt_setopt_use_need_kms_credentials_state(crypt);
         }
         if (!test->errmsg) {
-            ASSERT_OK(mongocrypt_setopt_kms_providers(crypt, TEST_BSON(test->value)), crypt);
+            ASSERT_OK(mongocrypt_setopt_kms_providers(crypt, TEST_BSON_STR(test->value)), crypt);
             if (!test->errmsg_init) {
                 ASSERT_OK(_mongocrypt_init_for_test(crypt), crypt);
             } else {
                 ASSERT_FAILS(_mongocrypt_init_for_test(crypt), crypt, test->errmsg_init);
             }
         } else {
-            ASSERT_FAILS(mongocrypt_setopt_kms_providers(crypt, TEST_BSON(test->value)), crypt, test->errmsg);
+            ASSERT_FAILS(mongocrypt_setopt_kms_providers(crypt, TEST_BSON_STR(test->value)), crypt, test->errmsg);
         }
         mongocrypt_destroy(crypt);
     }
@@ -930,7 +918,7 @@ static void test_tmp_bsonf(_mongocrypt_tester_t *tester) {
 bool _aes_ctr_is_supported_by_os = true;
 
 int main(int argc, char **argv) {
-    _mongocrypt_tester_t tester = {0};
+    static _mongocrypt_tester_t tester = {0};
     int i;
 
     TEST_PRINTF("Pass a list of patterns to run a subset of tests.\n");
@@ -989,6 +977,7 @@ int main(int argc, char **argv) {
     _mongocrypt_tester_install_fle2_payload_iup_v2(&tester);
     _mongocrypt_tester_install_fle2_payload_find_equality_v2(&tester);
     _mongocrypt_tester_install_fle2_payload_find_range_v2(&tester);
+    _mongocrypt_tester_install_fle2_payload_find_text(&tester);
     _mongocrypt_tester_install_fle2_tag_and_encrypted_metadata_block(&tester);
     _mongocrypt_tester_install_range_encoding(&tester);
     _mongocrypt_tester_install_range_edge_generation(&tester);

data/ext/libmongocrypt/libmongocrypt/test/test-mongocrypt.h

@@ -40,8 +40,6 @@ typedef enum tester_mongocrypt_flags {
     /// crypt_shared library must be present in the same directory as the test
     /// executable.
     TESTER_MONGOCRYPT_WITH_CRYPT_SHARED_LIB = 1 << 0,
-    /// Enable range V2
-    TESTER_MONGOCRYPT_WITH_RANGE_V2 = 1 << 2,
     /// Short cache expiration
     TESTER_MONGOCRYPT_WITH_SHORT_CACHE = 1 << 3,
     /// Do not call `mongocrypt_init` yet to allow for further configuration of the resulting `mongocrypt_t`.
@@ -49,7 +47,6 @@ typedef enum tester_mongocrypt_flags {
 } tester_mongocrypt_flags;
 
 /* Arbitrary max of 2148 instances of temporary test data. Increase as needed.
- * TODO(MONGOCRYPT-775) increasing further (e.g. 3000+) causes a segfault on Windows test runs. Revise.
  */
 #define TEST_DATA_COUNT 2148
 
@@ -195,6 +192,8 @@ void _mongocrypt_tester_install_fle2_payload_find_equality_v2(_mongocrypt_tester
 
 void _mongocrypt_tester_install_fle2_payload_find_range_v2(_mongocrypt_tester_t *tester);
 
+void _mongocrypt_tester_install_fle2_payload_find_text(_mongocrypt_tester_t *tester);
+
 void _mongocrypt_tester_install_fle2_tag_and_encrypted_metadata_block(_mongocrypt_tester_t *tester);
 
 void _mongocrypt_tester_install_gcp_auth(_mongocrypt_tester_t *tester);
@@ -228,6 +227,11 @@ void _mongocrypt_tester_install_mc_schema_broker(_mongocrypt_tester_t *tester);
 /* Conveniences for getting test data. */
 
 /* Get a temporary bson_t from a JSON string. Do not free it. */
+bson_t *_mongocrypt_tester_bson_from_str(_mongocrypt_tester_t *tester, const char *json);
+#define TMP_BSON_STR(...) _mongocrypt_tester_bson_from_str(tester, __VA_ARGS__)
+
+/* Get a temporary bson_t from a formattable JSON string. Do not free it. */
+MLIB_ANNOTATE_PRINTF(2, 3)
 bson_t *_mongocrypt_tester_bson_from_json(_mongocrypt_tester_t *tester, const char *json, ...);
 #define TMP_BSON(...) _mongocrypt_tester_bson_from_json(tester, __VA_ARGS__)
 
@@ -246,6 +250,11 @@ bson_t *_mongocrypt_tester_file_as_bson(_mongocrypt_tester_t *tester, const char
 #define TEST_FILE_AS_BSON(path) _mongocrypt_tester_file_as_bson(tester, path)
 
 /* Get a temporary binary from a JSON string. Do not free it. */
+mongocrypt_binary_t *_mongocrypt_tester_bin_from_str(_mongocrypt_tester_t *tester, const char *json);
+#define TEST_BSON_STR(...) _mongocrypt_tester_bin_from_str(tester, __VA_ARGS__)
+
+/* Get a temporary binary from a formattable JSON string. Do not free it. */
+MLIB_ANNOTATE_PRINTF(2, 3)
 mongocrypt_binary_t *_mongocrypt_tester_bin_from_json(_mongocrypt_tester_t *tester, const char *json, ...);
 #define TEST_BSON(...) _mongocrypt_tester_bin_from_json(tester, __VA_ARGS__)
 

data/ext/libmongocrypt/libmongocrypt/test/test-named-kms-providers.c

@@ -387,7 +387,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
     {
         mongocrypt_t *crypt = mongocrypt_new();
         mongocrypt_binary_t *kms_providers =
-            TEST_BSON(BSON_STR({"local" : {}, "local:name1" : {"key" : "%s"}}), LOCAL_KEK1_BASE64, LOCAL_KEK2_BASE64);
+            TEST_BSON(BSON_STR({"local" : {}, "local:name1" : {"key" : "%s"}}), LOCAL_KEK1_BASE64);
         ASSERT_OK(mongocrypt_setopt_kms_providers(crypt, kms_providers), crypt);
         mongocrypt_setopt_use_need_kms_credentials_state(crypt);
         ASSERT_OK(_mongocrypt_init_for_test(crypt), crypt);
@@ -425,7 +425,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
         bson_t out_bson;
         ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
         char *pattern = BSON_STR({"masterKey" : {"provider" : "local:name1"}});
-        _assert_match_bson(&out_bson, TMP_BSON(pattern));
+        _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
         bson_destroy(&out_bson);
         mongocrypt_binary_destroy(out);
         mongocrypt_ctx_destroy(ctx);
@@ -491,7 +491,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
         bson_t out_bson;
         ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
         char *pattern = BSON_STR({"masterKey" : {"provider" : "azure:name1"}});
-        _assert_match_bson(&out_bson, TMP_BSON(pattern));
+        _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
         bson_destroy(&out_bson);
         mongocrypt_binary_destroy(out);
         mongocrypt_ctx_destroy(ctx);
@@ -536,7 +536,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
         bson_t out_bson;
         ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
         char *pattern = BSON_STR({"masterKey" : {"provider" : "azure:name1"}});
-        _assert_match_bson(&out_bson, TMP_BSON(pattern));
+        _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
         bson_destroy(&out_bson);
         mongocrypt_binary_destroy(out);
         mongocrypt_ctx_destroy(ctx);
@@ -611,7 +611,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
             bson_t out_bson;
             ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
             char *pattern = BSON_STR({"masterKey" : {"provider" : "azure:name1"}});
-            _assert_match_bson(&out_bson, TMP_BSON(pattern));
+            _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
             bson_destroy(&out_bson);
             mongocrypt_binary_destroy(out);
             mongocrypt_ctx_destroy(ctx);
@@ -664,7 +664,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
             bson_t out_bson;
             ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
             char *pattern = BSON_STR({"masterKey" : {"provider" : "azure:name2"}});
-            _assert_match_bson(&out_bson, TMP_BSON(pattern));
+            _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
             bson_destroy(&out_bson);
             mongocrypt_binary_destroy(out);
             mongocrypt_ctx_destroy(ctx);
@@ -717,7 +717,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
         bson_t out_bson;
         ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
         char *pattern = BSON_STR({"masterKey" : {"provider" : "kmip:name1"}});
-        _assert_match_bson(&out_bson, TMP_BSON(pattern));
+        _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
         bson_destroy(&out_bson);
         mongocrypt_binary_destroy(out);
         mongocrypt_ctx_destroy(ctx);
@@ -810,7 +810,7 @@ static void test_create_datakey_with_named_kms_provider(_mongocrypt_tester_t *te
         bson_t out_bson;
         ASSERT(_mongocrypt_binary_to_bson(out, &out_bson));
         char *pattern = BSON_STR({"masterKey" : {"provider" : "kmip:name1"}});
-        _assert_match_bson(&out_bson, TMP_BSON(pattern));
+        _assert_match_bson(&out_bson, TMP_BSON_STR(pattern));
         bson_destroy(&out_bson);
         mongocrypt_binary_destroy(out);
         mongocrypt_ctx_destroy(ctx);
@@ -2119,7 +2119,7 @@ static void test_rewrap_with_named_kms_provider_local2local(_mongocrypt_tester_t
             bson_t bin_bson;
             ASSERT(_mongocrypt_binary_to_bson(bin, &bin_bson));
             char *pattern = BSON_STR({"v" : [ {"masterKey" : {"provider" : "local:name2"}} ]});
-            _assert_match_bson(&bin_bson, TMP_BSON(pattern));
+            _assert_match_bson(&bin_bson, TMP_BSON_STR(pattern));
         }
         mongocrypt_binary_destroy(bin);
         mongocrypt_ctx_destroy(ctx);
@@ -2242,7 +2242,7 @@ static void test_rewrap_with_named_kms_provider_azure2azure(_mongocrypt_tester_t
             bson_t bin_bson;
             ASSERT(_mongocrypt_binary_to_bson(bin, &bin_bson));
             char *pattern = BSON_STR({"v" : [ {"masterKey" : {"provider" : "azure:name2"}} ]});
-            _assert_match_bson(&bin_bson, TMP_BSON(pattern));
+            _assert_match_bson(&bin_bson, TMP_BSON_STR(pattern));
         }
         mongocrypt_binary_destroy(bin);
         mongocrypt_ctx_destroy(ctx);
@@ -2330,7 +2330,7 @@ static void test_rewrap_with_named_kms_provider_azure2local(_mongocrypt_tester_t
             bson_t bin_bson;
             ASSERT(_mongocrypt_binary_to_bson(bin, &bin_bson));
             char *pattern = BSON_STR({"v" : [ {"masterKey" : {"provider" : "local:name1"}} ]});
-            _assert_match_bson(&bin_bson, TMP_BSON(pattern));
+            _assert_match_bson(&bin_bson, TMP_BSON_STR(pattern));
         }
         mongocrypt_binary_destroy(bin);
         mongocrypt_ctx_destroy(ctx);

data/ext/libmongocrypt/libmongocrypt/test/test-unicode-fold.c

@@ -49,7 +49,7 @@
                           _both_len,                                                                                   \
                           input,                                                                                       \
                           _input_len,                                                                                  \
-                          kUnicodeFoldToLower | kUnicodeFoldRemoveDiacritics);                                         \
+                          (unicode_fold_options_t)(kUnicodeFoldToLower | kUnicodeFoldRemoveDiacritics));               \
     } while (0)
 
 static void test_unicode_fold(_mongocrypt_tester_t *tester) {
@@ -85,7 +85,11 @@ static void test_unicode_fold(_mongocrypt_tester_t *tester) {
     TEST_UNICODE_FOLD_ALL_CASES("Cafe\xcc\x81", "cafe\xcc\x81", "Cafe", "cafe");
     TEST_UNICODE_FOLD_ALL_CASES("CafE\xcc\x81", "cafe\xcc\x81", "CafE", "cafe");
     // Test string with null bytes
-    TEST_UNICODE_FOLD("fo\0bar", 6, "fo\0bar", 6, kUnicodeFoldToLower | kUnicodeFoldRemoveDiacritics);
+    TEST_UNICODE_FOLD("fo\0bar",
+                      6,
+                      "fo\0bar",
+                      6,
+                      (unicode_fold_options_t)(kUnicodeFoldToLower | kUnicodeFoldRemoveDiacritics));
     // Test strings with folded representations longer in bytes than the input
     TEST_UNICODE_FOLD("\xe2\xb1\xa6", 3, "\xc8\xbe", 2, kUnicodeFoldToLower);
     TEST_UNICODE_FOLD("\xf0\xa4\x8b\xae", 4, "\xef\xa9\xac", 3, kUnicodeFoldRemoveDiacritics);

data/ext/libmongocrypt/libmongocrypt/test/util/HELP.autogen

@@ -101,4 +101,4 @@
 "csfle auto_decrypt --document '{ 'insert' : 'coll', 'documents' : [ { 'ssn' : { '$binary' : { 'base64': 'ARG+PK8ud0RZlDIzKwQmFoMCOuSIPyrfYleSqMZRXgaPCQOAurv0LTLNL6Tn/G7TuVOyf/Qv3j6VxSxCQEeu/yO7vv/UDE5niDE0itjOqjmf5Q==', 'subType' : '06' } } } ] }'\n"
 "\n"
 "csfle explicit_encrypt --key_id 'Eb48ry53RFmUMjMrBCYWgw==' --value '{'v': 'test'}' --algorithm 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'\n"
-"```\n"
+"```\n"

data/ext/libmongocrypt/libmongocrypt/test/util/csfle.c

@@ -23,7 +23,7 @@
 
 #include "util.h"
 
-const char *help_text = ""
+static const char *help_text = ""
 #include "HELP.autogen"
     ;
 

data/ext/libmongocrypt/libmongocrypt/test/util/util.c

@@ -50,7 +50,7 @@ void _errexit_ctx(mongocrypt_ctx_t *ctx, int line) {
 }
 
 void _errexit_bson(bson_error_t *error, int line) {
-    MONGOC_ERROR("Error at line %d with code %d and msg: %s", line, error->code, error->message);
+    MONGOC_ERROR("Error at line %d with code %" PRIu32 " and msg: %s", line, error->code, error->message);
     exit(1);
 }
 
@@ -111,7 +111,7 @@ static void _status_to_error(mongocrypt_status_t *status, bson_error_t *error) {
  * Returns true if ok, and does not modify @error.
  * Returns false if error, and sets @error.
  */
-bool _test_ctx_check_error(mongocrypt_ctx_t *ctx, bson_error_t *error, bool error_expected) {
+static bool _test_ctx_check_error(mongocrypt_ctx_t *ctx, bson_error_t *error, bool error_expected) {
     mongocrypt_status_t *status;
 
     status = mongocrypt_status_new();
@@ -131,7 +131,7 @@ bool _test_ctx_check_error(mongocrypt_ctx_t *ctx, bson_error_t *error, bool erro
     return true;
 }
 
-bool _test_kms_ctx_check_error(mongocrypt_kms_ctx_t *kms_ctx, bson_error_t *error, bool error_expected) {
+static bool _test_kms_ctx_check_error(mongocrypt_kms_ctx_t *kms_ctx, bson_error_t *error, bool error_expected) {
     mongocrypt_status_t *status;
 
     status = mongocrypt_status_new();
@@ -659,7 +659,7 @@ fail:
     return ret;
 }
 
-const char *_state_string(mongocrypt_ctx_state_t state) {
+static const char *_state_string(mongocrypt_ctx_state_t state) {
     switch (state) {
     case MONGOCRYPT_CTX_ERROR: return "MONGOCRYPT_CTX_ERROR";
     case MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB: return "MONGOCRYPT_CTX_NEED_MONGO_COLLINFO_WITH_DB";
@@ -732,7 +732,7 @@ bool _csfle_state_machine_run(_state_machine_t *state_machine, bson_t *result, b
                 goto fail;
             }
             break;
-        case MONGOCRYPT_CTX_DONE: goto success; break;
+        case MONGOCRYPT_CTX_DONE: goto success;
         }
     }
 

data/ext/libmongocrypt/libmongocrypt/test/util/util.h

@@ -20,19 +20,20 @@
 #include <mongoc/mongoc.h>
 
 void _errexit_mongocrypt(mongocrypt_t *crypt, int line);
-#define ERREXIT_MONGOCRYPT(crypt) _errexit_mongocrypt(crypt, __LINE__);
+#define ERREXIT_MONGOCRYPT(crypt) _errexit_mongocrypt(crypt, __LINE__)
 
 void _errexit_ctx(mongocrypt_ctx_t *ctx, int line);
-#define ERREXIT_CTX(ctx) _errexit_ctx(ctx, __LINE__);
+#define ERREXIT_CTX(ctx) _errexit_ctx(ctx, __LINE__)
 
 void _errexit_bson(bson_error_t *error, int line);
-#define ERREXIT_BSON(err) _errexit_bson(err, __LINE__);
+#define ERREXIT_BSON(err) _errexit_bson(err, __LINE__)
 
 #define ERREXIT(...)                                                                                                   \
-    do {                                                                                                               \
+    if (1) {                                                                                                           \
         MONGOC_ERROR(__VA_ARGS__);                                                                                     \
         abort();                                                                                                       \
-    } while (0)
+    } else                                                                                                             \
+        ((void)0)
 
 void _log_to_stdout(mongocrypt_log_level_t level, const char *message, uint32_t message_len, void *ctx);
 
@@ -71,4 +72,4 @@ bson_t *bson_get_json(bson_t *bson, const char *key);
 
 bson_t *bson_req_json(bson_t *bson, const char *key);
 
-bool bson_get_bool(bson_t *bson, const char *key, bool default_value);
+bool bson_get_bool(bson_t *bson, const char *key, bool default_value);

data/lib/libmongocrypt_helper/version.rb

@@ -1,5 +1,5 @@
 module LibmongocryptHelper
-  VERSION = '1.13.2.0.1001'
+  VERSION = '1.14.0.0.1001'
 
-  LIBMONGOCRYPT_VERSION = '1.13.2'
+  LIBMONGOCRYPT_VERSION = '1.14.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libmongocrypt-helper
 version: !ruby/object:Gem::Version
-  version: 1.13.2.0.1001
+  version: 1.14.0.0.1001
 platform: ruby
 authors:
 - The MongoDB Ruby Team
@@ -42,12 +42,11 @@ files:
 - ext/libmongocrypt/libmongocrypt/bindings/cs/README.md
 - ext/libmongocrypt/libmongocrypt/bindings/node/README.md
 - ext/libmongocrypt/libmongocrypt/bindings/python/CHANGELOG.rst
+- ext/libmongocrypt/libmongocrypt/bindings/python/CONTRIBUTING.md
 - ext/libmongocrypt/libmongocrypt/bindings/python/LICENSE
 - ext/libmongocrypt/libmongocrypt/bindings/python/README.rst
 - ext/libmongocrypt/libmongocrypt/bindings/python/RELEASE.rst
-- ext/libmongocrypt/libmongocrypt/bindings/python/build-manylinux-wheel.sh
 - ext/libmongocrypt/libmongocrypt/bindings/python/hatch_build.py
-- ext/libmongocrypt/libmongocrypt/bindings/python/libmongocrypt-version.txt
 - ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/__init__.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/auto_encrypter.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/asynchronous/credentials.py
@@ -70,12 +69,16 @@ files:
 - ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/synchronous/state_machine.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/pymongocrypt/version.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/pyproject.toml
-- ext/libmongocrypt/libmongocrypt/bindings/python/release.sh
 - ext/libmongocrypt/libmongocrypt/bindings/python/requirements-test.txt
 - ext/libmongocrypt/libmongocrypt/bindings/python/requirements.txt
 - ext/libmongocrypt/libmongocrypt/bindings/python/sbom.json
-- ext/libmongocrypt/libmongocrypt/bindings/python/strip_header.py
-- ext/libmongocrypt/libmongocrypt/bindings/python/synchro.py
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/build-manylinux-wheel.sh
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/libmongocrypt-version.txt
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/release.sh
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/synchro.py
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/synchro.sh
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/update-version.sh
+- ext/libmongocrypt/libmongocrypt/bindings/python/scripts/update_binding.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/test/__init__.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/test/data/collection-info.json
 - ext/libmongocrypt/libmongocrypt/bindings/python/test/data/command-reply.json
@@ -112,7 +115,6 @@ files:
 - ext/libmongocrypt/libmongocrypt/bindings/python/test/test_binding.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/test/test_crypto.py
 - ext/libmongocrypt/libmongocrypt/bindings/python/test/test_mongocrypt.py
-- ext/libmongocrypt/libmongocrypt/bindings/python/update-sbom.sh
 - ext/libmongocrypt/libmongocrypt/cmake/FetchMongoC.cmake
 - ext/libmongocrypt/libmongocrypt/cmake/ImportBSON.cmake
 - ext/libmongocrypt/libmongocrypt/cmake/ImportDFP.cmake
@@ -435,6 +437,8 @@ files:
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-private.h
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload-v2.c
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-range-payload.c
+- ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-text-payload-private.h
+- ext/libmongocrypt/libmongocrypt/src/mc-fle2-find-text-payload.c
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private-v2.h
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-private.h
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-insert-update-payload-v2.c
@@ -455,6 +459,8 @@ files:
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-tag-and-encrypted-metadata-block-private.h
 - ext/libmongocrypt/libmongocrypt/src/mc-fle2-tag-and-encrypted-metadata-block.c
 - ext/libmongocrypt/libmongocrypt/src/mc-optional-private.h
+- ext/libmongocrypt/libmongocrypt/src/mc-parse-utils-private.h
+- ext/libmongocrypt/libmongocrypt/src/mc-parse-utils.c
 - ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation-private.h
 - ext/libmongocrypt/libmongocrypt/src/mc-range-edge-generation.c
 - ext/libmongocrypt/libmongocrypt/src/mc-range-encoding-private.h
@@ -573,7 +579,6 @@ files:
 - ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/collinfo.json
 - ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/encrypted-field-config-map.json
 - ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/encrypted-payload-range-v2.json
-- ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/encrypted-payload.json
 - ext/libmongocrypt/libmongocrypt/test/data/collection-info-no-validator.json
 - ext/libmongocrypt/libmongocrypt/test/data/collection-info-view.json
 - ext/libmongocrypt/libmongocrypt/test/data/collinfo-siblings.json
@@ -591,7 +596,6 @@ files:
 - ext/libmongocrypt/libmongocrypt/test/data/compact/success/collinfo.json
 - ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-field-config-map.json
 - ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-payload-range-v2.json
-- ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-payload.json
 - ext/libmongocrypt/libmongocrypt/test/data/dollardb/omitted/cmd-to-mongocryptd.json
 - ext/libmongocrypt/libmongocrypt/test/data/dollardb/omitted/cmd.json
 - ext/libmongocrypt/libmongocrypt/test/data/dollardb/omitted/collinfo.json
@@ -627,18 +631,17 @@ files:
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE1EncryptionPlaceholder.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE1RandomEncryptedValue.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2EncryptionPlaceholder.json
-- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2EqualityIndexedValueV2.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2FindEqualityPayload.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2FindEqualityPayloadV2.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2IndexedEqualityEncryptedValue.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2IndexedEqualityEncryptedValueV2.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2IndexedRangeEncryptedValue.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2IndexedRangeEncryptedValueV2.json
-- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayload-with-edges-V2.json
-- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayload-with-edges.json
+- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayload-RangeV1.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayload.json
+- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayloadV2-RangeV1.json
+- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayloadV2-RangeV2.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2InsertUpdatePayloadV2.json
-- ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2RangeIndexedValueV2.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2UnindexedEncryptedValue.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decrypt/FLE2UnindexedEncryptedValueV2.json
 - ext/libmongocrypt/libmongocrypt/test/data/explicit-decryption-input.json
@@ -1108,6 +1111,7 @@ files:
 - ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-encryption-placeholder.c
 - ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-equality-payload-v2.c
 - ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-range-payload-v2.c
+- ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-find-text-payload.c
 - ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev-v2.c
 - ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iev.c
 - ext/libmongocrypt/libmongocrypt/test/test-mc-fle2-payload-iup-v2.c

data/ext/libmongocrypt/libmongocrypt/bindings/python/libmongocrypt-version.txt

@@ -1 +0,0 @@
-1.12.0

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

@@ -1,50 +0,0 @@
-# Copyright 2019-present MongoDB, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Generate a CFFI.cdef() string from a C header file
-
-Usage (on macOS):: python strip_header.py ../../src/mongocrypt.h | pbcopy
-"""
-
-import itertools
-import re
-import sys
-
-DROP_RE = re.compile(r"^\s*(#|MONGOCRYPT_EXPORT)")
-
-
-def strip_file(content):
-    fold = content.replace("\\\n", " ")
-    all_lines = [*fold.split("\n"), ""]
-    keep_lines = (line for line in all_lines if not DROP_RE.match(line))
-    fin = ""
-    for line, peek in itertools.pairwise(keep_lines):
-        if peek == "" and line == "":
-            # Drop adjacent empty lines
-            continue
-        yield line
-        fin = peek
-    yield fin
-
-
-def strip(hdr):
-    with open(hdr) as fp:
-        out = strip_file(fp.read())
-        print("\n".join(out))  # noqa: T201
-
-
-if __name__ == "__main__":
-    if len(sys.argv) != 2:
-        raise Exception("Usage: strip_header.py header.h")
-    strip(sys.argv[1])