mongodb · kevinAlbs · Jan 3, 2025 · Dec 30, 2024 · Jan 3, 2025 · Jan 2, 2025
@@ -1,7 +1,6 @@
 {
     "db.test": {
         "escCollection": "esc",
-        "eccCollection": "ecc",
         "ecocCollection": "ecoc",
         "fields": [
             {

@@ -1,7 +1,6 @@
 {
     "test.test": {
         "escCollection": "fle2.basic.esc",
-        "eccCollection": "fle2.basic.ecc",
         "ecocCollection": "fle2.basic.ecoc",
         "fields": [
             {
@@ -24,7 +23,6 @@
     },
     "test.test2": {
         "escCollection": "fle2.basic.esc",
-        "eccCollection": "fle2.basic.ecc",
         "ecocCollection": "fle2.basic.ecoc",
         "fields": [
             {

diff --git a/src/mongocrypt-ctx-encrypt.c b/src/mongocrypt-ctx-encrypt.c
diff --git a/src/mongocrypt-marking.c b/src/mongocrypt-marking.c
diff --git a/src/mongocrypt-opts-private.h b/src/mongocrypt-opts-private.h
@@ -118,10 +118,6 @@ typedef struct {
     bool use_need_mongo_collinfo_with_db_state;
     bool bypass_query_analysis;
 
-    // When creating new encrypted payloads,
-    // use V2 variants of the FLE2 datatypes.
-    bool use_fle2_v2;
-
     // Use the Queryable Encryption Range V2 protocol.
     bool use_range_v2;
 } _mongocrypt_opts_t;

diff --git a/src/mongocrypt-private.h b/src/mongocrypt-private.h
@@ -161,15 +161,4 @@ bool _mongocrypt_needs_credentials_for_provider(mongocrypt_t *crypt,
                                                 _mongocrypt_kms_provider_t provider,
                                                 const char *name);
 
-/**
- * Enable/disable the use of FLE2v2 payload types for write.
- *
- * @param[in] crypt The @ref mongocrypt_t object.
- * @param[in] enable Whether to enable use of FLE2v2 payloads.
- *
- * @returns A boolean indicating success. If false, an error status is set.
- * Retrieve it with @ref mongocrypt_status
- */
-bool mongocrypt_setopt_fle2v2(mongocrypt_t *crypt, bool enable);
-
 #endif /* MONGOCRYPT_PRIVATE_H */
diff --git a/src/mongocrypt.c b/src/mongocrypt.c
@@ -118,8 +118,6 @@ mongocrypt_t *mongocrypt_new(void) {
     crypt->status = mongocrypt_status_new();
     _mongocrypt_opts_init(&crypt->opts);
     _mongocrypt_log_init(&crypt->log);
-    // Default to using FLEv2 (aka QEv2)
-    crypt->opts.use_fle2_v2 = true;
     crypt->ctx_counter = 1;
     crypt->cache_oauth = mc_mapof_kmsid_to_token_new();
     crypt->csfle = (_mongo_crypt_v1_vtable){.okay = false};
@@ -148,13 +146,6 @@ mongocrypt_t *mongocrypt_new(void) {
         }                                                                                                              \
     }
 
-bool mongocrypt_setopt_fle2v2(mongocrypt_t *crypt, bool enable) {
-    ASSERT_MONGOCRYPT_PARAM_UNINIT(crypt);
-
-    crypt->opts.use_fle2_v2 = enable;
-    return true;
-}
-
 bool mongocrypt_setopt_use_range_v2(mongocrypt_t *crypt) {
     ASSERT_MONGOCRYPT_PARAM_UNINIT(crypt);
 

diff --git a/test/data/bulkWrite/jsonSchema/cmd.json b/test/data/bulkWrite/jsonSchema/cmd.json
diff --git a/test/data/collection-info-no-schema.json b/test/data/collection-info-no-schema.json
diff --git a/test/data/compact/anchor-pad/collinfo.json b/test/data/compact/anchor-pad/collinfo.json
@@ -2,7 +2,6 @@
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {

diff --git a/test/data/compact/anchor-pad/encrypted-payload-range-v2.json b/test/data/compact/anchor-pad/encrypted-payload-range-v2.json
@@ -8,7 +8,6 @@
         "schema": {
             "db.test": {
                 "escCollection": "esc",
-                "eccCollection": "ecc",
                 "ecocCollection": "ecoc",
                 "fields": [
                     {
@@ -82,24 +81,24 @@
                     "subType": "00"
                 }
             }
-       },
-       "nested.notindexed": {
-          "$binary": {
-             "base64": "27J6DZqcjkRzZ3lWEsxH7CsQHr4CZirrGmuPS8ZkRO0=",
-             "subType": "00"
-          }
-       },
-       "nested.encrypted": {
-          "$binary": {
-             "base64": "SWO8WEoZ2r2Kx/muQKb7+COizy85nIIUFiHh4K9kcvA=",
-             "subType": "00"
-          }
-       },
-       "encrypted": {
-          "$binary": {
-             "base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
-             "subType": "00"
-          }
-       }
+        },
+        "nested.notindexed": {
+            "$binary": {
+                "base64": "27J6DZqcjkRzZ3lWEsxH7CsQHr4CZirrGmuPS8ZkRO0=",
+                "subType": "00"
+            }
+        },
+        "nested.encrypted": {
+            "$binary": {
+                "base64": "SWO8WEoZ2r2Kx/muQKb7+COizy85nIIUFiHh4K9kcvA=",
+                "subType": "00"
+            }
+        },
+        "encrypted": {
+            "$binary": {
+                "base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
+                "subType": "00"
+            }
+        }
     }
- }
+}
diff --git a/test/data/compact/missing-key-id/collinfo.json b/test/data/compact/missing-key-id/collinfo.json
@@ -2,7 +2,6 @@
     "options": {
         "encryptedFields": {
             "escCollection": "fle2.basic.esc",
-            "eccCollection": "fle2.basic.ecc",
             "ecocCollection": "fle2.basic.ecoc",
             "fields": [
                 {
@@ -16,6 +15,6 @@
                     }
                 }
             ]
-        }        
+        }
     }
 }
diff --git a/test/data/compact/no-fields/collinfo.json b/test/data/compact/no-fields/collinfo.json
@@ -2,7 +2,6 @@
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": []
         }

diff --git a/test/data/compact/no-range/collinfo.json b/test/data/compact/no-range/collinfo.json
@@ -2,7 +2,6 @@
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {

diff --git a/test/data/compact/no-range/encrypted-field-config-map.json b/test/data/compact/no-range/encrypted-field-config-map.json
diff --git a/test/data/compact/success/collinfo.json b/test/data/compact/success/collinfo.json
@@ -2,7 +2,6 @@
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {

diff --git a/test/data/compact/success/encrypted-field-config-map.json b/test/data/compact/success/encrypted-field-config-map.json
@@ -1,7 +1,6 @@
 {
     "db.test": {
         "escCollection": "esc",
-        "eccCollection": "ecc",
         "ecocCollection": "ecoc",
         "fields": [
             {

diff --git a/test/data/compact/success/encrypted-payload-range-v2.json b/test/data/compact/success/encrypted-payload-range-v2.json
@@ -7,7 +7,6 @@
         "schema": {
             "db.test": {
                 "escCollection": "esc",
-                "eccCollection": "ecc",
                 "ecocCollection": "ecoc",
                 "fields": [
                     {
@@ -81,24 +80,24 @@
                     "subType": "00"
                 }
             }
-       },
-       "nested.notindexed": {
-          "$binary": {
-             "base64": "27J6DZqcjkRzZ3lWEsxH7CsQHr4CZirrGmuPS8ZkRO0=",
-             "subType": "00"
-          }
-       },
-       "nested.encrypted": {
-          "$binary": {
-             "base64": "SWO8WEoZ2r2Kx/muQKb7+COizy85nIIUFiHh4K9kcvA=",
-             "subType": "00"
-          }
-       },
-       "encrypted": {
-          "$binary": {
-             "base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
-             "subType": "00"
-          }
-       }
+        },
+        "nested.notindexed": {
+            "$binary": {
+                "base64": "27J6DZqcjkRzZ3lWEsxH7CsQHr4CZirrGmuPS8ZkRO0=",
+                "subType": "00"
+            }
+        },
+        "nested.encrypted": {
+            "$binary": {
+                "base64": "SWO8WEoZ2r2Kx/muQKb7+COizy85nIIUFiHh4K9kcvA=",
+                "subType": "00"
+            }
+        },
+        "encrypted": {
+            "$binary": {
+                "base64": "noN+05JsuO1oDg59yypIGj45i+eFH6HOTXOPpeZ//Mk=",
+                "subType": "00"
+            }
+        }
     }
- }
+}
diff --git a/test/data/dollardb/omitted/cmd-to-mongocryptd.json b/test/data/dollardb/omitted/cmd-to-mongocryptd.json
@@ -8,7 +8,6 @@
         "schema": {
             "db.test": {
                 "escCollection": "esc",
-                "eccCollection": "ecc",
                 "ecocCollection": "ecoc",
                 "fields": [
                     {
@@ -31,4 +30,4 @@
             }
         }
     }
-}
+}
diff --git a/test/data/dollardb/omitted/collinfo.json b/test/data/dollardb/omitted/collinfo.json
@@ -2,7 +2,6 @@
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {
@@ -24,4 +23,4 @@
             ]
         }
     }
-}
+}
diff --git a/test/data/dollardb/omitted/encrypted-payload.json b/test/data/dollardb/omitted/encrypted-payload.json
@@ -3,7 +3,7 @@
    "filter": {
       "value": {
          "$binary": {
-            "base64": "BbEAAAAFZAAgAAAAAE8KGPgq7h3n9nH5lfHcia8wtOTLwGkZNLBesb6PULqbBXMAIAAAAACq0558QyD3c3jkR5k0Zc9UpQK8ByhXhtn2d1xVQnuJ3AVjACAAAAAA1003zUWGwD4zVZ0KeihnZOthS3V6CEHUfnJZcIYHefIFZQAgAAAAAOuac/eRLYakKX6B0vZ1r3QodOQFfjqJD+xlGiPu4/PsEmNtAAAAAAAAAAAAAA==",
+            "base64": "DIkAAAAFZAAgAAAAAE8KGPgq7h3n9nH5lfHcia8wtOTLwGkZNLBesb6PULqbBXMAIAAAAACq0558QyD3c3jkR5k0Zc9UpQK8ByhXhtn2d1xVQnuJ3AVsACAAAAAAlO36MaVLVRDFW6xrI+0UTkyQdFfSCEBPkZg8sFzuTJYSY20AAAAAAAAAAAAA",
             "subType": "06"
          }
       }
@@ -13,7 +13,6 @@
       "schema": {
          "db.test": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                {
@@ -36,4 +35,4 @@
          }
       }
    }
-}
+}
diff --git a/test/data/dollardb/omitted/mongocryptd-reply.json b/test/data/dollardb/omitted/mongocryptd-reply.json
@@ -17,7 +17,6 @@
          "schema": {
             "db.test": {
                "escCollection": "esc",
-               "eccCollection": "ecc",
                "ecocCollection": "ecoc",
                "fields": [
                   {
@@ -42,4 +41,4 @@
       }
    },
    "hasEncryptedPlaceholders": true
-}
+}