libmongocrypt-helper 1.12.0.0.1001 → 1.14.0.0.1001

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-private.h

@@ -20,6 +20,7 @@
 #include "mc-efc-private.h"
 #include "mc-optional-private.h"
 #include "mc-rangeopts-private.h"
+#include "mc-schema-broker-private.h"
 #include "mongocrypt-buffer-private.h"
 #include "mongocrypt-endpoint-private.h"
 #include "mongocrypt-key-broker-private.h"
@@ -159,7 +160,10 @@ typedef struct {
     char *target_coll;
 
     _mongocrypt_buffer_t list_collections_filter;
-    _mongocrypt_buffer_t schema;
+
+    // `sb` manages encryption schemas (JSONSchema for CSFLE and encryptedFields for QE).
+    mc_schema_broker_t *sb;
+
     /* TODO CDRIVER-3150: audit + rename these buffers.
      * original_cmd for explicit is {v: <BSON value>}, for auto is the command to
      * be encrypted.
@@ -177,24 +181,6 @@ typedef struct {
     _mongocrypt_buffer_t marked_cmd;
     _mongocrypt_buffer_t encrypted_cmd;
     _mongocrypt_buffer_t key_id;
-    bool used_local_schema;
-    /* collinfo_has_siblings is true if the schema came from a remote JSON
-     * schema, and there were siblings. */
-    bool collinfo_has_siblings;
-    /* encrypted_field_config is set when:
-     * 1. `target_ns` is present in an encrypted_field_config_map.
-     * 2. (TODO MONGOCRYPT-414) The collection has encryptedFields in the
-     * response to listCollections. encrypted_field_config is true if and only if
-     * encryption is using FLE 2.0.
-     * 3. The `bulkWrite` command is processed and needs an empty encryptedFields to be processed by query analysis.
-     * (`bulkWrite` does not support empty JSON schema).
-     */
-    _mongocrypt_buffer_t encrypted_field_config;
-    mc_EncryptedFieldConfig_t efc;
-    // `used_empty_encryptedFields` is true if the collection has no JSON schema or encryptedFields,
-    // yet an empty encryptedFields was constructed to support query analysis.
-    // When true, an empty encryptedFields is sent to query analysis, but not appended to the final command.
-    bool used_empty_encryptedFields;
     /* bypass_query_analysis is set to true to skip the
      * MONGOCRYPT_CTX_NEED_MONGO_MARKINGS state. */
     bool bypass_query_analysis;

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx-rewrap-many-datakey.c

@@ -136,6 +136,18 @@ static mongocrypt_kms_ctx_t *_next_kms_ctx_encrypt(mongocrypt_ctx_t *ctx) {
     mongocrypt_ctx_t *dkctx = NULL;
 
     BSON_ASSERT_PARAM(ctx);
+    /* Check if any need retry */
+    {
+        _mongocrypt_ctx_rmd_datakey_t *it = rmdctx->datakeys;
+        while (it != NULL) {
+            _mongocrypt_ctx_datakey_t *dkctx = (_mongocrypt_ctx_datakey_t *)it->dkctx;
+            if (dkctx->kms.should_retry) {
+                dkctx->kms.should_retry = false; // Reset retry state.
+                return &dkctx->kms;
+            }
+            it = it->next;
+        }
+    }
 
     /* No more datakey contexts requiring KMS. */
     if (!rmdctx->datakeys_iter) {

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-ctx.c

@@ -262,12 +262,8 @@ bool mongocrypt_ctx_setopt_algorithm(mongocrypt_ctx_t *ctx, const char *algorith
         ctx->opts.index_type.value = MONGOCRYPT_INDEX_TYPE_RANGE;
         ctx->opts.index_type.set = true;
     } else if (mstr_eq_ignore_case(algo_str, mstrv_lit(MONGOCRYPT_ALGORITHM_RANGEPREVIEW_DEPRECATED_STR))) {
-        if (ctx->crypt->opts.use_range_v2) {
-            _mongocrypt_ctx_fail_w_msg(ctx, "Algorithm 'rangePreview' is deprecated, please use 'range'");
-            return false;
-        }
-        ctx->opts.index_type.value = MONGOCRYPT_INDEX_TYPE_RANGEPREVIEW_DEPRECATED;
-        ctx->opts.index_type.set = true;
+        _mongocrypt_ctx_fail_w_msg(ctx, "Algorithm 'rangePreview' is deprecated, please use 'range'");
+        return false;
     } else {
         char *error = bson_strdup_printf("unsupported algorithm string \"%.*s\"",
                                          algo_str.len <= (size_t)INT_MAX ? (int)algo_str.len : INT_MAX,
@@ -1068,12 +1064,8 @@ bool mongocrypt_ctx_setopt_query_type(mongocrypt_ctx_t *ctx, const char *query_t
         ctx->opts.query_type.value = MONGOCRYPT_QUERY_TYPE_RANGE;
         ctx->opts.query_type.set = true;
     } else if (mstr_eq_ignore_case(qt_str, mstrv_lit(MONGOCRYPT_QUERY_TYPE_RANGEPREVIEW_DEPRECATED_STR))) {
-        if (ctx->crypt->opts.use_range_v2) {
-            _mongocrypt_ctx_fail_w_msg(ctx, "Query type 'rangePreview' is deprecated, please use 'range'");
-            return false;
-        }
-        ctx->opts.query_type.value = MONGOCRYPT_QUERY_TYPE_RANGEPREVIEW_DEPRECATED;
-        ctx->opts.query_type.set = true;
+        _mongocrypt_ctx_fail_w_msg(ctx, "Query type 'rangePreview' is deprecated, please use 'range'");
+        return false;
     } else {
         /* don't check if qt_str.len fits in int; we want the diagnostic output */
         char *error = bson_strdup_printf("Unsupported query_type \"%.*s\"",
@@ -1128,7 +1120,7 @@ bool mongocrypt_ctx_setopt_algorithm_range(mongocrypt_ctx_t *ctx, mongocrypt_bin
         return _mongocrypt_ctx_fail_w_msg(ctx, "invalid BSON");
     }
 
-    if (!mc_RangeOpts_parse(&ctx->opts.rangeopts.value, &as_bson, ctx->crypt->opts.use_range_v2, ctx->status)) {
+    if (!mc_RangeOpts_parse(&ctx->opts.rangeopts.value, &as_bson, ctx->status)) {
         return _mongocrypt_ctx_fail(ctx);
     }
 

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-dll-private.h

@@ -6,9 +6,9 @@
 
 #include <stdlib.h>
 
-#if _WIN32
+#if defined(_WIN32)
 #define MCR_DLL_SUFFIX ".dll"
-#elif __APPLE__
+#elif defined(__APPLE__)
 #define MCR_DLL_SUFFIX ".dylib"
 #else
 #define MCR_DLL_SUFFIX ".so"
@@ -54,6 +54,23 @@ static inline void mcr_dll_close(mcr_dll dll) {
     mstr_free(dll.error_string);
 }
 
+// All currently supported platforms require casting to/from `void*` for dynamically loaded function symbols by
+// necessity despite being undefined behavior according to the C standard specification.
+#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+// GCC requires silencing `-Wpedantic` for this cast.
+#define MC_BEGIN_CAST_FUNCTION_TYPE_STRICT_IGNORE                                                                      \
+    _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored \"-Wpedantic\"")
+#define MC_END_CAST_FUNCTION_TYPE_STRICT_IGNORE _Pragma("GCC diagnostic pop")
+#elif defined(__clang__)
+#define MC_BEGIN_CAST_FUNCTION_TYPE_STRICT_IGNORE                                                                      \
+    _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wunknown-warning-option\"")                  \
+        _Pragma("clang diagnostic ignored \"-Wcast-function-type-strict\"")
+#define MC_END_CAST_FUNCTION_TYPE_STRICT_IGNORE _Pragma("clang diagnostic pop")
+#else
+#define MC_BEGIN_CAST_FUNCTION_TYPE_STRICT_IGNORE
+#define MC_END_CAST_FUNCTION_TYPE_STRICT_IGNORE
+#endif
+
 /**
  * @brief Obtain a pointer to an exported entity from the given dynamic library.
  *

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-key-broker.c

@@ -24,11 +24,11 @@ typedef struct _auth_request_t {
     char *kmsid;
 } auth_request_t;
 
-auth_request_t *auth_request_new() {
+static auth_request_t *auth_request_new(void) {
     return bson_malloc0(sizeof(auth_request_t));
 }
 
-void auth_request_destroy(auth_request_t *ar) {
+static void auth_request_destroy(auth_request_t *ar) {
     if (!ar) {
         return;
     }
@@ -41,13 +41,13 @@ struct _mc_mapof_kmsid_to_authrequest_t {
     mc_array_t entries;
 };
 
-mc_mapof_kmsid_to_authrequest_t *mc_mapof_kmsid_to_authrequest_new(void) {
+static mc_mapof_kmsid_to_authrequest_t *mc_mapof_kmsid_to_authrequest_new(void) {
     mc_mapof_kmsid_to_authrequest_t *k2a = bson_malloc0(sizeof(mc_mapof_kmsid_to_authrequest_t));
     _mc_array_init(&k2a->entries, sizeof(auth_request_t *));
     return k2a;
 }
 
-void mc_mapof_kmsid_to_authrequest_destroy(mc_mapof_kmsid_to_authrequest_t *k2a) {
+static void mc_mapof_kmsid_to_authrequest_destroy(mc_mapof_kmsid_to_authrequest_t *k2a) {
     if (!k2a) {
         return;
     }
@@ -59,7 +59,7 @@ void mc_mapof_kmsid_to_authrequest_destroy(mc_mapof_kmsid_to_authrequest_t *k2a)
     bson_free(k2a);
 }
 
-bool mc_mapof_kmsid_to_authrequest_has(const mc_mapof_kmsid_to_authrequest_t *k2a, const char *kmsid) {
+static bool mc_mapof_kmsid_to_authrequest_has(const mc_mapof_kmsid_to_authrequest_t *k2a, const char *kmsid) {
     BSON_ASSERT_PARAM(k2a);
     BSON_ASSERT_PARAM(kmsid);
     for (size_t i = 0; i < k2a->entries.len; i++) {
@@ -71,25 +71,25 @@ bool mc_mapof_kmsid_to_authrequest_has(const mc_mapof_kmsid_to_authrequest_t *k2
     return false;
 }
 
-size_t mc_mapof_kmsid_to_authrequest_len(const mc_mapof_kmsid_to_authrequest_t *k2a) {
+static size_t mc_mapof_kmsid_to_authrequest_len(const mc_mapof_kmsid_to_authrequest_t *k2a) {
     BSON_ASSERT_PARAM(k2a);
     return k2a->entries.len;
 }
 
-bool mc_mapof_kmsid_to_authrequest_empty(const mc_mapof_kmsid_to_authrequest_t *k2a) {
+static bool mc_mapof_kmsid_to_authrequest_empty(const mc_mapof_kmsid_to_authrequest_t *k2a) {
     BSON_ASSERT_PARAM(k2a);
     return k2a->entries.len == 0;
 }
 
 // `mc_mapof_kmsid_to_authrequest_put` moves `to_put` into the map and takes ownership of `to_put`.
 // No checking is done to prohibit duplicate entries.
-void mc_mapof_kmsid_to_authrequest_put(mc_mapof_kmsid_to_authrequest_t *k2a, auth_request_t *to_put) {
+static void mc_mapof_kmsid_to_authrequest_put(mc_mapof_kmsid_to_authrequest_t *k2a, auth_request_t *to_put) {
     BSON_ASSERT_PARAM(k2a);
 
     _mc_array_append_val(&k2a->entries, to_put);
 }
 
-auth_request_t *mc_mapof_kmsid_to_authrequest_at(mc_mapof_kmsid_to_authrequest_t *k2a, size_t i) {
+static auth_request_t *mc_mapof_kmsid_to_authrequest_at(mc_mapof_kmsid_to_authrequest_t *k2a, size_t i) {
     BSON_ASSERT_PARAM(k2a);
 
     return _mc_array_index(&k2a->entries, auth_request_t *, i);

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-kms-ctx.c

@@ -1121,7 +1121,7 @@ done:
 }
 
 bool mongocrypt_kms_ctx_fail(mongocrypt_kms_ctx_t *kms) {
-    if (!kms || !kms->retry_enabled) {
+    if (!kms) {
         return false;
     }
 

data/ext/libmongocrypt/libmongocrypt/src/mongocrypt-marking-private.h

@@ -39,10 +39,10 @@ typedef struct {
 
             _mongocrypt_buffer_t key_id;
             bson_value_t key_alt_name;
-        };
+        } fle1;
 
         mc_FLE2EncryptionPlaceholder_t fle2;
-    };
+    } u;
 } _mongocrypt_marking_t;
 
 // `_mongocrypt_marking_t` inherits extended alignment from libbson. To dynamically allocate, use aligned allocation
@@ -67,7 +67,6 @@ bool _mongocrypt_marking_to_ciphertext(void *ctx,
 
 mc_mincover_t *mc_get_mincover_from_FLE2RangeFindSpec(mc_FLE2RangeFindSpec_t *findSpec,
                                                       size_t sparsity,
-                                                      mongocrypt_status_t *status,
-                                                      bool use_range_v2) MONGOCRYPT_WARN_UNUSED_RESULT;
+                                                      mongocrypt_status_t *status) MONGOCRYPT_WARN_UNUSED_RESULT;
 
 #endif /* MONGOCRYPT_MARKING_PRIVATE_H */