MONGOCRYPT-888 update libbson to 2.3.0 (#1149)

* note in changelog

* bump libbson from 2.1.0 to 2.3.0

* replace deprecated calls of bson_append_array_begin with bson_append_array_unsafe_begin

Opt into the unsafe API since the generated keys are expected to be correct.

* update patches

To account for formatting changes

* remove ASan tasks on arm64

To address observed compiler errors.

Author: kevinAlbs

.evergreen/config.yml

@@ -1588,7 +1588,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-asan
   - build-packages
   - name: publish-packages
     distros:
@@ -1842,7 +1841,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-asan
   - build-packages
   - name: publish-packages
     distros:
@@ -1882,7 +1880,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-asan
   - build-packages
   - name: publish-packages
     distros:
@@ -1910,7 +1907,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-asan
   - build-packages
   - name: publish-packages
     distros:
@@ -1967,7 +1963,6 @@ buildvariants:
   tasks:
   - build-and-test-and-upload
   - build-and-test-shared-bson
-  - build-and-test-asan
   - build-packages
   - name: publish-packages
     distros:

.evergreen/linker_tests_deps/bson_patches/libbson1.patch

@@ -2,14 +2,15 @@ Adds a printf to bson_malloc0 to test linking scenarios with two forms of libbso
 See linker-tests.sh. If this patch fails to apply, regenerate from libbson's source.
 
 diff --git a/src/libbson/src/bson/memory.c b/src/libbson/src/bson/memory.c
-index 0e1523331..aa7112305 100644
+index 0d84ea53e5..ad0f8eb0aa 100644
 --- a/src/libbson/src/bson/memory.c
 +++ b/src/libbson/src/bson/memory.c
-@@ -104,6 +104,7 @@ bson_malloc0 (size_t num_bytes) /* IN */
+@@ -140,6 +140,7 @@ bson_malloc0(size_t num_bytes) /* IN */
  {
     void *mem = NULL;
 
-+   printf (".from libbson1.");
-    if (BSON_LIKELY (num_bytes)) {
-       if (BSON_UNLIKELY (!(mem = gMemVtable.calloc (1, num_bytes)))) {
-          fprintf (stderr, "Failure to allocate memory in bson_malloc0(). errno: %d.\n", errno);
++   printf(".from libbson1.");
+    if (BSON_LIKELY(num_bytes)) {
+       if (BSON_UNLIKELY(!(mem = gMemVtable.calloc(1, num_bytes)))) {
+          fprintf(stderr, "Failure to allocate memory in bson_malloc0(). errno: %d.\n", errno);
+

.evergreen/linker_tests_deps/bson_patches/libbson2.patch

@@ -2,14 +2,15 @@ Adds a printf to bson_malloc0 to test linking scenarios with two forms of libbso
 See linker-tests.sh. If this patch fails to apply, regenerate from libbson's source.
 
 diff --git a/src/libbson/src/bson/memory.c b/src/libbson/src/bson/memory.c
-index 0e1523331..aa7112305 100644
+index 0d84ea53e5..ad0f8eb0aa 100644
 --- a/src/libbson/src/bson/memory.c
 +++ b/src/libbson/src/bson/memory.c
-@@ -104,6 +104,7 @@ bson_malloc0 (size_t num_bytes) /* IN */
+@@ -140,6 +140,7 @@ bson_malloc0(size_t num_bytes) /* IN */
  {
     void *mem = NULL;
 
-+   printf (".from libbson2.\n");
-    if (BSON_LIKELY (num_bytes)) {
-       if (BSON_UNLIKELY (!(mem = gMemVtable.calloc (1, num_bytes)))) {
-          fprintf (stderr, "Failure to allocate memory in bson_malloc0(). errno: %d.\n", errno);
++   printf(".from libbson2.");
+    if (BSON_LIKELY(num_bytes)) {
+       if (BSON_UNLIKELY(!(mem = gMemVtable.calloc(1, num_bytes)))) {
+          fprintf(stderr, "Failure to allocate memory in bson_malloc0(). errno: %d.\n", errno);
+

.evergreen/prep_c_driver_source.sh

@@ -3,7 +3,7 @@
 set -euxo pipefail
 
 # Clone mongo-c-driver and check out to a tagged version.
-MONGO_C_DRIVER_VERSION=2.1.0
+MONGO_C_DRIVER_VERSION=2.3.0
 
 # Force checkout with lf endings since .sh must have lf, not crlf on Windows
 git clone https://github.com/mongodb/mongo-c-driver.git --config core.eol=lf --config core.autocrlf=false --depth=1 --branch $MONGO_C_DRIVER_VERSION

CHANGELOG.md

@@ -11,6 +11,7 @@
 ### Changed
 
 - Final release packages in the PPA are now available by specifying `release` in the repository configuration in place of the major/minor version (e.g., `1.17`). Details in `README.md`.
+- Bump downloaded libbson version from 2.1.0 to 2.3.0.
 
 ### Deprecated
 - RHEL 6.2 builds are deprecated and may be removed in the future. The `linux-x86_64-glibc_2_7-nocrypto` release build may be used instead and has equivalent glibc requirements.

cmake/FetchMongoC.cmake

@@ -2,7 +2,7 @@ include (FetchContent)
 
 # Set the tag that we will fetch.
 # When updating the version of libbson, also update the version in etc/purls.txt and .evergreen/prep_c_driver_source.sh
-set (MONGOC_FETCH_TAG_FOR_LIBBSON "2.1.0" CACHE STRING "The Git tag of mongo-c-driver that will be fetched to obtain libbson")
+set (MONGOC_FETCH_TAG_FOR_LIBBSON "2.3.0" CACHE STRING "The Git tag of mongo-c-driver that will be fetched to obtain libbson")
 
 # Add an option to disable patching if a patch command is unavailable.
 option (LIBBSON_PATCH_ENABLED "Whether to apply patches to the libbson library" ON)

etc/cyclonedx.sbom.json

@@ -1,16 +1,16 @@
 {
   "components": [
     {
-      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.1.0#src/libbson",
+      "bom-ref": "pkg:github/mongodb/mongo-c-driver@v2.3.0#src/libbson",
       "copyright": "Copyright 2009-present MongoDB, Inc.",
       "externalReferences": [
         {
           "type": "distribution",
-          "url": "https://github.com/mongodb/mongo-c-driver/archive/refs/tags/v2.1.0.tar.gz"
+          "url": "https://github.com/mongodb/mongo-c-driver/archive/v2.3.0.tar.gz"
         },
         {
           "type": "website",
-          "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.1.0"
+          "url": "https://github.com/mongodb/mongo-c-driver/tree/v2.3.0"
         }
       ],
       "group": "mongodb",
@@ -22,9 +22,9 @@
         }
       ],
       "name": "mongo-c-driver",
-      "purl": "pkg:github/mongodb/mongo-c-driver@v2.1.0#src/libbson",
+      "purl": "pkg:github/mongodb/mongo-c-driver@v2.3.0#src/libbson",
       "type": "library",
-      "version": "v2.1.0"
+      "version": "v2.3.0"
     },
     {
       "bom-ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz",
@@ -53,11 +53,11 @@
       "ref": "pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz"
     },
     {
-      "ref": "pkg:github/mongodb/mongo-c-driver@v2.1.0#src/libbson"
+      "ref": "pkg:github/mongodb/mongo-c-driver@v2.3.0#src/libbson"
     }
   ],
   "metadata": {
-    "timestamp": "2025-11-10T20:52:37.547279+00:00",
+    "timestamp": "2026-04-21T13:26:40.166707+00:00",
     "tools": [
       {
         "externalReferences": [

etc/libbson-remove-GCC-diagnostic-pragma.patch

@@ -1,35 +1,54 @@
 diff --git a/src/common/src/common-bson-dsl-private.h b/src/common/src/common-bson-dsl-private.h
-index b6cb7a2705..c2cb0bcaf2 100644
+index 748ba54046..67a6a4f194 100644
 --- a/src/common/src/common-bson-dsl-private.h
 +++ b/src/common/src/common-bson-dsl-private.h
 @@ -31,6 +31,13 @@ enum {
-    BSON_IF_WINDOWS (__declspec (selectany)) \
-    BSON_IF_POSIX (__attribute__ ((weak)))
+    BSON_IF_WINDOWS(__declspec(selectany)) \
+    BSON_IF_POSIX(__attribute__((weak)))
 
 +#if defined(__GNUC__) && !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
 +// Using GCC < 4.6
 +// Do not define `GCC diagnostic` pragma for GCC < 4.6.
-+#define _bsonDSL_disableWarnings() ((void) 0)
-+#define _bsonDSL_restoreWarnings() ((void) 0)
++#define _bsonDSL_disableWarnings() ((void)0)
++#define _bsonDSL_restoreWarnings() ((void)0)
 +#else
 +// Not using GCC < 4.6
  #ifdef __GNUC__
  // GCC has a bug handling pragma statements that disable warnings within complex
  // nested macro expansions. If we're GCC, just disable -Wshadow outright:
-@@ -50,7 +57,7 @@ BSON_IF_GNU_LIKE (_Pragma ("GCC diagnostic ignored \"-Wshadow\""))
-       mlib_diagnostic_pop ();      \
+@@ -50,7 +57,7 @@ BSON_IF_GNU_LIKE(_Pragma("GCC diagnostic ignored \"-Wshadow\""))
+       mlib_diagnostic_pop();       \
     } else                          \
-       ((void) 0)
+       ((void)0)
 -
 +#endif
  /**
   * @brief Parse the given BSON document.
   *
+diff --git a/src/common/src/common-macros-private.h b/src/common/src/common-macros-private.h
+index 068b09470f..b5c94c5c9d 100644
+--- a/src/common/src/common-macros-private.h
++++ b/src/common/src/common-macros-private.h
+@@ -97,7 +97,13 @@
+ #endif
+ 
+ // Disable the -Wcast-qual warning
+-#if defined(__GNUC__)
++#if defined(__GNUC__) && !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
++// Using GCC < 4.6
++// Do not define `GCC diagnostic` pragma for GCC < 4.6.
++#define MC_DISABLE_CAST_QUAL_WARNING_BEGIN
++#define MC_DISABLE_CAST_QUAL_WARNING_END
++#elif defined(__GNUC__)
++// Not using GCC < 4.6
+ #define MC_DISABLE_CAST_QUAL_WARNING_BEGIN MC_PRAGMA_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+ #define MC_DISABLE_CAST_QUAL_WARNING_END MC_PRAGMA_DIAGNOSTIC_POP
+ #elif defined(__clang__)
 diff --git a/src/common/src/mlib/config.h b/src/common/src/mlib/config.h
-index 6a1e45275b..797f278250 100644
+index a95f917efb..d1494797cd 100644
 --- a/src/common/src/mlib/config.h
 +++ b/src/common/src/mlib/config.h
-@@ -175,7 +175,13 @@
+@@ -204,7 +204,13 @@
   * @brief Expands to `noexcept` when compiled as C++, otherwise expands to
   * nothing
   */
@@ -38,25 +57,25 @@ index 6a1e45275b..797f278250 100644
 +// Don't define this expansion for the older gcc/g++
 +#define mlib_noexcept
 +#else
- #define mlib_noexcept MLIB_IF_CXX (noexcept)
+ #define mlib_noexcept MLIB_IF_CXX(noexcept)
 +#endif
 
  #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
  #define mlib_is_little_endian() (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)
-@@ -253,15 +259,29 @@
+@@ -282,15 +288,29 @@
 
- #define MLIB_FUNC MLIB_IF_GNU_LIKE (__func__) MLIB_IF_MSVC (__FUNCTION__)
+ #define MLIB_FUNC MLIB_IF_GNU_LIKE(__func__) MLIB_IF_MSVC(__FUNCTION__)
 
 +#if defined(__GNUC__) && !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
 +// Using GCC < 4.6
 +// Do not define `GCC diagnostic` pragma for GCC < 4.6.
 +#define mlib_diagnostic_push()
 +#else
 +// Not using GCC < 4.6
- #define mlib_diagnostic_push()                           \
-    MLIB_IF_GNU_LIKE (mlib_pragma (GCC diagnostic push);) \
-    MLIB_IF_MSVC (mlib_pragma (warning (push));)          \
-    mlib_static_assert (1, "")
+ #define mlib_diagnostic_push()                         \
+    MLIB_IF_GNU_LIKE(mlib_pragma(GCC diagnostic push);) \
+    MLIB_IF_MSVC(mlib_pragma(warning(push));)           \
+    mlib_static_assert(1, "")
 +#endif
 
 +#if defined(__GNUC__) && !defined(__clang__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 6))
@@ -65,15 +84,15 @@ index 6a1e45275b..797f278250 100644
 +#define mlib_diagnostic_pop()
 +#else
 +// Not using GCC < 4.6
- #define mlib_diagnostic_pop()                           \
-    MLIB_IF_GNU_LIKE (mlib_pragma (GCC diagnostic pop);) \
-    MLIB_IF_MSVC (mlib_pragma (warning (pop));)          \
-    mlib_static_assert (1, "")
+ #define mlib_diagnostic_pop()                         \
+    MLIB_IF_GNU_LIKE(mlib_pragma(GCC diagnostic pop);) \
+    MLIB_IF_MSVC(mlib_pragma(warning(pop));)           \
+    mlib_static_assert(1, "")
 +#endif
 
- #define mlib_gcc_warning_disable(Warning)                      \
-    MLIB_IF_GCC (mlib_pragma (GCC diagnostic ignored Warning);) \
-@@ -315,9 +335,15 @@
+ #define mlib_gcc_warning_disable(Warning)                    \
+    MLIB_IF_GCC(mlib_pragma(GCC diagnostic ignored Warning);) \
+@@ -344,9 +364,15 @@
  /**
   * @brief Emit a _Pragma that will disable warnings about the use of deprecated entities.
   */
@@ -82,9 +101,9 @@ index 6a1e45275b..797f278250 100644
 +#define mlib_disable_deprecation_warnings()
 +#else
 +// Not using GCC < 4.6
- #define mlib_disable_deprecation_warnings()                \
-    mlib_gnu_warning_disable ("-Wdeprecated-declarations"); \
-    mlib_msvc_warning (disable : 4996)
+ #define mlib_disable_deprecation_warnings()               \
+    mlib_gnu_warning_disable("-Wdeprecated-declarations"); \
+    mlib_msvc_warning(disable : 4996)
 +#endif
 
  /**

etc/purls.txt

@@ -8,7 +8,7 @@
 # `copyright` property. This information can be manually added.
 
 # libbson is obtained via `cmake/FetchMongoC.cmake`.
-pkg:github/mongodb/mongo-c-driver@v2.1.0?#src/libbson
+pkg:github/mongodb/mongo-c-driver@v2.3.0?#src/libbson
 
 # IntelDFP is obtained via `cmake/IntelDFP.cmake`
 pkg:generic/IntelRDFPMathLib@20U2?download_url=https://www.netlib.org/misc/intel/IntelRDFPMathLib20U2.tar.gz

src/mc-fle2-find-range-payload-v2.c

@@ -67,7 +67,7 @@ bool mc_FLE2FindRangePayloadV2_serialize(const mc_FLE2FindRangePayloadV2_t *payl
         }
         // Append "payload.g" array of EdgeTokenSets.
         bson_t g_bson;
-        if (!BSON_APPEND_ARRAY_BEGIN(&payload_bson, "g", &g_bson)) {
+        if (!BSON_APPEND_ARRAY_UNSAFE_BEGIN(&payload_bson, "g", &g_bson)) {
             return false;
         }