libmongocrypt-helper 1.11.0.0.1001 → 1.13.2.0.1001

data/ext/libmongocrypt/libmongocrypt/src/unicode/fold.c

@@ -0,0 +1,139 @@
+/**
+ *    Copyright (C) 2025-present MongoDB, Inc.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the Server Side Public License, version 1,
+ *    as published by MongoDB, Inc.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    Server Side Public License for more details.
+ *
+ *    You should have received a copy of the Server Side Public License
+ *    along with this program. If not, see
+ *    <http://www.mongodb.com/licensing/server-side-public-license>.
+ *
+ *    As a special exception, the copyright holders give permission to link the
+ *    code of portions of this program with the OpenSSL library under certain
+ *    conditions as described in each individual source file and distribute
+ *    linked combinations including the program with the OpenSSL library. You
+ *    must comply with the Server Side Public License in all respects for
+ *    all of the code used other than as permitted herein. If you modify file(s)
+ *    with this exception, you may extend this exception to your version of the
+ *    file(s), but you are not obligated to do so. If you do not wish to do so,
+ *    delete this exception statement from your version. If you delete this
+ *    exception statement from all source files in the program, then also delete
+ *    it in the license file.
+ *
+ *    THIS IS A GENERATED FILE, DO NOT MODIFY.
+ */
+
+#include "fold.h"
+#include "../mc-range-edge-generation-private.h" // For mc_count_leading_zeros_u64
+#include "../mongocrypt-private.h"
+
+static bool append_utf8_codepoint(bson_unichar_t codepoint, char **output_it, mongocrypt_status_t *status) {
+    if (codepoint <= 0x7f /* max 1-byte codepoint */) {
+        *(*output_it)++ = (char)codepoint;
+    } else if (codepoint <= 0x7ff /* max 2-byte codepoint*/) {
+        *(*output_it)++ = (char)((codepoint >> (6 * 1)) | 0xc0); // 2 leading 1s.
+        *(*output_it)++ = (char)(((codepoint >> (6 * 0)) & 0x3f) | 0x80);
+    } else if (codepoint <= 0xffff /* max 3-byte codepoint*/) {
+        *(*output_it)++ = (char)((codepoint >> (6 * 2)) | 0xe0); // 3 leading 1s.
+        *(*output_it)++ = (char)(((codepoint >> (6 * 1)) & 0x3f) | 0x80);
+        *(*output_it)++ = (char)(((codepoint >> (6 * 0)) & 0x3f) | 0x80);
+    } else {
+        if (codepoint > 0x10FFFF) {
+            CLIENT_ERR("append_utf8_codepoint: codepoint was out of range for UTF-8");
+            return false;
+        }
+        *(*output_it)++ = (char)((codepoint >> (6 * 3)) | 0xf0); // 4 leading 1s.
+        *(*output_it)++ = (char)(((codepoint >> (6 * 2)) & 0x3f) | 0x80);
+        *(*output_it)++ = (char)(((codepoint >> (6 * 1)) & 0x3f) | 0x80);
+        *(*output_it)++ = (char)(((codepoint >> (6 * 0)) & 0x3f) | 0x80);
+    }
+    return true;
+}
+
+// C translation of mongo::unicode::String::caseFoldAndStripDiacritics.
+bool unicode_fold(const char *str,
+                  size_t len,
+                  unicode_fold_options_t options,
+                  char **out_str,
+                  size_t *out_len,
+                  mongocrypt_status_t *status) {
+    BSON_ASSERT_PARAM(str);
+    BSON_ASSERT_PARAM(out_str);
+    BSON_ASSERT_PARAM(out_len);
+    BSON_ASSERT_PARAM(status);
+
+    if (!(options & (kUnicodeFoldRemoveDiacritics | kUnicodeFoldToLower))) {
+        CLIENT_ERR("unicode_fold: Either case or diacritic folding must be enabled");
+        return false;
+    }
+    // Allocate space for possible growth. Folding characters may result in longer UTF-8 sequences.
+    // 2x is an upper bound. With current fold maps, the largest growth is a 2-byte sequence mapping to a 3-byte
+    // sequence.
+    *out_str = bson_malloc(2 * len + 1);
+    const char *input_it = str;
+    const char *end_it = str + len;
+    char *output_it = *out_str;
+    while (input_it < end_it) {
+        const uint8_t first_byte = (uint8_t)*input_it++;
+        bson_unichar_t codepoint = 0;
+        if (first_byte <= 0x7f) {
+            // ASCII special case. Can use faster operations.
+            if ((options & kUnicodeFoldToLower) && (first_byte >= 'A' && first_byte <= 'Z')) {
+                codepoint = first_byte | 0x20; // Set the ascii lowercase bit on the character.
+            } else {
+                // ASCII has two pure diacritics that should be skipped, and no characters that
+                // change when removing diacritics.
+                if ((options & kUnicodeFoldRemoveDiacritics) && (first_byte == '^' || first_byte == '`')) {
+                    continue;
+                }
+                codepoint = first_byte;
+            }
+        } else {
+            // Multi-byte character
+            size_t leading_ones = mc_count_leading_zeros_u64(~(((uint64_t)first_byte) << (64 - 8)));
+
+            // Only checking enough to ensure that this code doesn't crash in the face of malformed
+            // utf-8. We make no guarantees about what results will be returned in this case.
+            if (!(leading_ones > 1 && leading_ones <= 4 && input_it + (leading_ones - 1) <= end_it)) {
+                CLIENT_ERR("unicode_fold: Text contains invalid UTF-8");
+                bson_free(*out_str);
+                return false;
+            }
+
+            codepoint = (bson_unichar_t)(first_byte & (0xff >> leading_ones)); // mask off the size indicator.
+            for (size_t sub_byte_index = 1; sub_byte_index < leading_ones; sub_byte_index++) {
+                const uint8_t sub_byte = (uint8_t)*input_it++;
+                codepoint <<= 6;
+                codepoint |= sub_byte & 0x3f; // mask off continuation bits.
+            }
+
+            if (options & kUnicodeFoldToLower) {
+                bson_unichar_t new_cp = unicode_codepoint_to_lower(codepoint);
+                codepoint = new_cp;
+            }
+
+            if ((options & kUnicodeFoldRemoveDiacritics)) {
+                codepoint = unicode_codepoint_remove_diacritics(codepoint);
+                if (!codepoint) {
+                    continue; // codepoint is a pure diacritic.
+                }
+            }
+        }
+
+        if (!append_utf8_codepoint(codepoint, &output_it, status)) {
+            bson_free(*out_str);
+            return false;
+        }
+    }
+
+    // Null terminate
+    *output_it = '\0';
+    *out_len = (size_t)(output_it - *out_str);
+    return true;
+}

data/ext/libmongocrypt/libmongocrypt/src/unicode/fold.h

@@ -0,0 +1,58 @@
+/**
+ *    Copyright (C) 2025-present MongoDB, Inc.
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the Server Side Public License, version 1,
+ *    as published by MongoDB, Inc.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    Server Side Public License for more details.
+ *
+ *    You should have received a copy of the Server Side Public License
+ *    along with this program. If not, see
+ *    <http://www.mongodb.com/licensing/server-side-public-license>.
+ *
+ *    As a special exception, the copyright holders give permission to link the
+ *    code of portions of this program with the OpenSSL library under certain
+ *    conditions as described in each individual source file and distribute
+ *    linked combinations including the program with the OpenSSL library. You
+ *    must comply with the Server Side Public License in all respects for
+ *    all of the code used other than as permitted herein. If you modify file(s)
+ *    with this exception, you may extend this exception to your version of the
+ *    file(s), but you are not obligated to do so. If you do not wish to do so,
+ *    delete this exception statement from your version. If you delete this
+ *    exception statement from all source files in the program, then also delete
+ *    it in the license file.
+ */
+
+#ifndef UNICODE_FOLD_H
+#define UNICODE_FOLD_H
+
+#include "../mongocrypt-status-private.h"
+
+#include <bson/bson.h>
+
+#include <stddef.h>
+
+bson_unichar_t unicode_codepoint_to_lower(bson_unichar_t codepoint);
+bson_unichar_t unicode_codepoint_remove_diacritics(bson_unichar_t codepoint);
+
+typedef enum {
+    kUnicodeFoldNone = 0,
+    kUnicodeFoldToLower = 1 << 0,
+    kUnicodeFoldRemoveDiacritics = 1 << 1
+} unicode_fold_options_t;
+
+// Fold unicode string str of length len according to options. len should not include the null terminator, if it exists.
+// Returns true if successful, and returns the null-terminated folded string and its byte length, excluding the null
+// terminator, as out_str and out_len. On failure, returns false and sets status accordingly.
+bool unicode_fold(const char *str,
+                  size_t len,
+                  unicode_fold_options_t options,
+                  char **out_str,
+                  size_t *out_len,
+                  mongocrypt_status_t *status);
+
+#endif

data/ext/libmongocrypt/libmongocrypt/test/data/bulkWrite/unencrypted/payload.json

@@ -12,10 +12,10 @@
          }
       }
    ],
-   "$db": "admin",
    "nsInfo": [
       {
          "ns": "db.test"
       }
-   ]
+   ],
+   "$db": "admin"
 }

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/missing-key-id/collinfo.json

@@ -1,4 +1,5 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "fle2.basic.esc",

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/no-fields/collinfo.json

@@ -1,4 +1,5 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",

data/ext/libmongocrypt/libmongocrypt/test/data/cleanup/success/collinfo.json

@@ -1,4 +1,5 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",

data/ext/libmongocrypt/libmongocrypt/test/data/compact/anchor-pad/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {

data/ext/libmongocrypt/libmongocrypt/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"
+            }
+        }
     }
- }
+}

data/ext/libmongocrypt/libmongocrypt/test/data/compact/missing-key-id/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "fle2.basic.esc",
-            "eccCollection": "fle2.basic.ecc",
             "ecocCollection": "fle2.basic.ecoc",
             "fields": [
                 {
@@ -16,6 +16,6 @@
                     }
                 }
             ]
-        }        
+        }
     }
 }

data/ext/libmongocrypt/libmongocrypt/test/data/compact/no-fields/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": []
         }

data/ext/libmongocrypt/libmongocrypt/test/data/compact/no-range/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {

data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {

data/ext/libmongocrypt/libmongocrypt/test/data/compact/success/encrypted-field-config-map.json

@@ -1,7 +1,6 @@
 {
     "db.test": {
         "escCollection": "esc",
-        "eccCollection": "ecc",
         "ecocCollection": "ecoc",
         "fields": [
             {

data/ext/libmongocrypt/libmongocrypt/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"
+            }
+        }
     }
- }
+}

data/ext/libmongocrypt/libmongocrypt/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 @@
             }
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/omitted/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {
@@ -24,4 +24,4 @@
             ]
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/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 @@
          }
       }
    }
-}
+}

data/ext/libmongocrypt/libmongocrypt/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
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved/cmd-to-mongocryptd.json

@@ -8,7 +8,6 @@
         "schema": {
             "db.test": {
                 "escCollection": "esc",
-                "eccCollection": "ecc",
                 "ecocCollection": "ecoc",
                 "fields": [
                     {
@@ -31,4 +30,4 @@
             }
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved/collinfo.json

@@ -1,8 +1,8 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": [
                 {
@@ -24,4 +24,4 @@
             ]
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved/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": [
                {
@@ -37,4 +36,4 @@
       }
    },
    "$db": "db"
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved/mongocryptd-reply.json

@@ -17,7 +17,6 @@
          "schema": {
             "db.test": {
                "escCollection": "esc",
-               "eccCollection": "ecc",
                "ecocCollection": "ecoc",
                "fields": [
                   {
@@ -42,4 +41,4 @@
       }
    },
    "hasEncryptedPlaceholders": true
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved_empty/cmd-to-mongocryptd.json

@@ -8,10 +8,9 @@
         "schema": {
             "db.test": {
                 "escCollection": "esc",
-                "eccCollection": "ecc",
                 "ecocCollection": "ecoc",
                 "fields": []
             }
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved_empty/collinfo.json

@@ -1,10 +1,10 @@
 {
+    "name": "test",
     "options": {
         "encryptedFields": {
             "escCollection": "esc",
-            "eccCollection": "ecc",
             "ecocCollection": "ecoc",
             "fields": []
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved_empty/mongocryptd-reply.json

@@ -12,7 +12,6 @@
          "schema": {
             "db.test": {
                "escCollection": "esc",
-               "eccCollection": "ecc",
                "ecocCollection": "ecoc",
                "fields": []
             }
@@ -20,4 +19,4 @@
       }
    },
    "hasEncryptedPlaceholders": false
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/dollardb/preserved_fle1/collinfo.json

@@ -1,4 +1,5 @@
 {
+    "name": "test",
     "options": {
         "validator": {
             "$jsonSchema": {
@@ -22,4 +23,4 @@
             }
         }
     }
-}
+}

data/ext/libmongocrypt/libmongocrypt/test/data/efc/efc-extraField.json

@@ -1,6 +1,5 @@
 {
     "escCollection": "fle2.basic.esc",
-    "eccCollection": "fle2.basic.ecc",
     "ecocCollection": "fle2.basic.ecoc",
     "fields": [
         {

data/ext/libmongocrypt/libmongocrypt/test/data/efc/efc-missingKeyId.json

@@ -1,6 +1,5 @@
 {
     "escCollection": "fle2.basic.esc",
-    "eccCollection": "fle2.basic.ecc",
     "ecocCollection": "fle2.basic.ecoc",
     "fields": [
         {

data/ext/libmongocrypt/libmongocrypt/test/data/efc/efc-oneField-badVersionSet.json

@@ -0,0 +1,23 @@
+{
+    "escCollection": "fle2.basic.esc",
+    "ecocCollection": "fle2.basic.ecoc",
+    "fields": [
+        {
+            "keyId": {
+                "$binary": {
+                    "base64": "EjRWeBI0mHYSNBI0VniQEg==",
+                    "subType": "04"
+                }
+            },
+            "path": "firstName",
+            "bsonType": "string",
+            "queries": {
+                "queryType": "equality",
+                "contention": {
+                    "$numberLong": "0"
+                }
+            }
+        }
+    ],
+    "strEncodeVersion": 99
+}