pass query_type, index_type, and contention_factor through to libmongocrypt

Author: kevinAlbs

src/libmongoc/src/mongoc/mongoc-client-side-encryption.c

@@ -1777,14 +1777,17 @@ mongoc_client_encryption_encrypt (mongoc_client_encryption_t *client_encryption,
       GOTO (fail);
    }
 
-   if (!_mongoc_crypt_explicit_encrypt (client_encryption->crypt,
-                                        client_encryption->keyvault_coll,
-                                        opts->algorithm,
-                                        &opts->keyid,
-                                        opts->keyaltname,
-                                        value,
-                                        ciphertext,
-                                        error)) {
+   if (!_mongoc_crypt_explicit_encrypt (
+          client_encryption->crypt,
+          client_encryption->keyvault_coll,
+          opts->algorithm,
+          &opts->keyid,
+          opts->keyaltname,
+          opts->query_type.set ? &opts->query_type.value : NULL,
+          opts->contention_factor.set ? &opts->contention_factor.value : NULL,
+          value,
+          ciphertext,
+          error)) {
       GOTO (fail);
    }
 

src/libmongoc/src/mongoc/mongoc-crypt-private.h

@@ -79,6 +79,8 @@ Perform explicit encryption.
 - exactly one of keyid or keyaltname must be set, the other NULL, or an error is
 returned.
 - value_out is always initialized.
+- query_type may be NULL.
+- contention_factor may be NULL.
 - may return false and set error.
 */
 bool
@@ -87,6 +89,8 @@ _mongoc_crypt_explicit_encrypt (_mongoc_crypt_t *crypt,
                                 const char *algorithm,
                                 const bson_value_t *keyid,
                                 char *keyaltname,
+                                mongoc_encrypt_query_type_t *query_type,
+                                int64_t *contention_factor,
                                 const bson_value_t *value_in,
                                 bson_value_t *value_out,
                                 bson_error_t *error);

src/libmongoc/src/mongoc/mongoc-crypt.c

@@ -1134,6 +1134,8 @@ _mongoc_crypt_explicit_encrypt (_mongoc_crypt_t *crypt,
                                 const char *algorithm,
                                 const bson_value_t *keyid,
                                 char *keyaltname,
+                                mongoc_encrypt_query_type_t *query_type,
+                                int64_t *contention_factor,
                                 const bson_value_t *value_in,
                                 bson_value_t *value_out,
                                 bson_error_t *error)
@@ -1156,9 +1158,48 @@ _mongoc_crypt_explicit_encrypt (_mongoc_crypt_t *crypt,
       goto fail;
    }
 
-   if (!mongocrypt_ctx_setopt_algorithm (state_machine->ctx, algorithm, -1)) {
-      _ctx_check_error (state_machine->ctx, error, true);
-      goto fail;
+   if (NULL != algorithm &&
+       0 == strcmp (algorithm, MONGOC_ENCRYPT_ALGORITHM_INDEXED)) {
+      if (!mongocrypt_ctx_setopt_index_type (state_machine->ctx,
+                                             MONGOCRYPT_INDEX_TYPE_EQUALITY)) {
+         _ctx_check_error (state_machine->ctx, error, true);
+         goto fail;
+      }
+   } else if (NULL != algorithm &&
+              0 == strcmp (algorithm, MONGOC_ENCRYPT_ALGORITHM_UNINDEXED)) {
+      if (!mongocrypt_ctx_setopt_index_type (state_machine->ctx,
+                                             MONGOCRYPT_INDEX_TYPE_NONE)) {
+         _ctx_check_error (state_machine->ctx, error, true);
+         goto fail;
+      }
+   } else {
+      if (!mongocrypt_ctx_setopt_algorithm (
+             state_machine->ctx, algorithm, -1)) {
+         _ctx_check_error (state_machine->ctx, error, true);
+         goto fail;
+      }
+   }
+
+   if (query_type != NULL) {
+      mongocrypt_query_type_t converted;
+
+      switch (*query_type) {
+      case MONGOC_ENCRYPT_QUERY_TYPE_EQUALITY:
+         converted = MONGOCRYPT_QUERY_TYPE_EQUALITY;
+         break;
+      }
+      if (!mongocrypt_ctx_setopt_query_type (state_machine->ctx, converted)) {
+         _ctx_check_error (state_machine->ctx, error, true);
+         goto fail;
+      }
+   }
+
+   if (contention_factor != NULL) {
+      if (!mongocrypt_ctx_setopt_contention_factor (state_machine->ctx,
+                                                    *contention_factor)) {
+         _ctx_check_error (state_machine->ctx, error, true);
+         goto fail;
+      }
    }
 
    if (keyaltname) {