libmongocrypt-helper 1.7.4.0.1002 → 1.8.0.0.1001

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

@@ -1,8 +1,8 @@
 #ifndef MONGOCRYPT_DLL_PRIVATE_H
 #define MONGOCRYPT_DLL_PRIVATE_H
 
-#include <mlib/str.h>
 #include <mlib/error.h>
+#include <mlib/str.h>
 
 #include <stdlib.h>
 
@@ -14,17 +14,16 @@
 #define MCR_DLL_SUFFIX ".so"
 #endif
 
-#define MCR_DLL_NULL \
-   ((mcr_dll){._native_handle = NULL, .error_string = MSTR_NULL})
+#define MCR_DLL_NULL ((mcr_dll){._native_handle = NULL, .error_string = MSTR_NULL})
 
 /**
  * @brief A dynamically-loaded library i.e. returned by LoadLibrary() or
  * dlopen()
  */
 typedef struct mcr_dll {
-   // (All supported platforms use a void* as the library handle type)
-   void *_native_handle;
-   mstr error_string;
+    // (All supported platforms use a void* as the library handle type)
+    void *_native_handle;
+    mstr error_string;
 } mcr_dll;
 
 /**
@@ -42,20 +41,17 @@ typedef struct mcr_dll {
  * a filename), it will be resolved relative to the application's working
  * directory.
  */
-mcr_dll
-mcr_dll_open (const char *lib);
+mcr_dll mcr_dll_open(const char *lib);
 
 /**
  * @brief Close a dynamic library opened with @ref mcr_dll_open
  *
  * @param dll A dynamic library handle
  */
-static inline void
-mcr_dll_close (mcr_dll dll)
-{
-   extern void mcr_dll_close_handle (mcr_dll);
-   mcr_dll_close_handle (dll);
-   mstr_free (dll.error_string);
+static inline void mcr_dll_close(mcr_dll dll) {
+    extern void mcr_dll_close_handle(mcr_dll);
+    mcr_dll_close_handle(dll);
+    mstr_free(dll.error_string);
 }
 
 /**
@@ -65,21 +61,18 @@ mcr_dll_close (mcr_dll dll)
  * @param symbol The name of a symbol to open
  * @return void* A pointer to that symbol, or NULL if not found
  */
-void *
-mcr_dll_sym (mcr_dll dll, const char *symbol);
+void *mcr_dll_sym(mcr_dll dll, const char *symbol);
 
 /**
  * @brief Determine whether the given DLL is a handle to an open library
  */
-static inline bool
-mcr_dll_is_open (mcr_dll dll)
-{
-   return dll._native_handle != NULL;
+static inline bool mcr_dll_is_open(mcr_dll dll) {
+    return dll._native_handle != NULL;
 }
 
 typedef struct mcr_dll_path_result {
-   mstr path;
-   mstr error_string;
+    mstr path;
+    mstr error_string;
 } mcr_dll_path_result;
 
 /**
@@ -91,7 +84,6 @@ typedef struct mcr_dll_path_result {
  *
  * @note Caller must free both `retval.path` and `retval.error_string`.
  */
-mcr_dll_path_result
-mcr_dll_path (mcr_dll dll);
+mcr_dll_path_result mcr_dll_path(mcr_dll dll);
 
 #endif // MONGOCRYPT_DLL_PRIVATE_H

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

@@ -28,62 +28,59 @@
 #define __has_builtin(x) 0
 #endif
 
-#if defined(__clang__) && __has_builtin(__builtin_bswap16) && \
-   __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)
-#define MONGOCRYPT_UINT16_SWAP_LE_BE(v) __builtin_bswap16 (v)
-#define MONGOCRYPT_UINT32_SWAP_LE_BE(v) __builtin_bswap32 (v)
-#define MONGOCRYPT_UINT64_SWAP_LE_BE(v) __builtin_bswap64 (v)
+#if defined(__clang__) && __has_builtin(__builtin_bswap16) && __has_builtin(__builtin_bswap32)                         \
+    && __has_builtin(__builtin_bswap64)
+#define MONGOCRYPT_UINT16_SWAP_LE_BE(v) __builtin_bswap16(v)
+#define MONGOCRYPT_UINT32_SWAP_LE_BE(v) __builtin_bswap32(v)
+#define MONGOCRYPT_UINT64_SWAP_LE_BE(v) __builtin_bswap64(v)
 #elif defined(__GNUC__) && (__GNUC__ >= 4)
 #if __GNUC__ > 4 || (defined(__GNUC_MINOR__) && __GNUC_MINOR__ >= 3)
-#define MONGOCRYPT_UINT32_SWAP_LE_BE(v) __builtin_bswap32 ((uint32_t) v)
-#define MONGOCRYPT_UINT64_SWAP_LE_BE(v) __builtin_bswap64 ((uint64_t) v)
+#define MONGOCRYPT_UINT32_SWAP_LE_BE(v) __builtin_bswap32((uint32_t)v)
+#define MONGOCRYPT_UINT64_SWAP_LE_BE(v) __builtin_bswap64((uint64_t)v)
 #endif
 #if __GNUC__ > 4 || (defined(__GNUC_MINOR__) && __GNUC_MINOR__ >= 8)
-#define MONGOCRYPT_UINT16_SWAP_LE_BE(v) __builtin_bswap16 ((uint32_t) v)
+#define MONGOCRYPT_UINT16_SWAP_LE_BE(v) __builtin_bswap16((uint32_t)v)
 #endif
 #endif
 
 #ifndef MONGOCRYPT_UINT16_SWAP_LE_BE
-#define MONGOCRYPT_UINT16_SWAP_LE_BE(v) \
-   __mongocrypt_uint16_swap_slow ((uint16_t) v)
+#define MONGOCRYPT_UINT16_SWAP_LE_BE(v) __mongocrypt_uint16_swap_slow((uint16_t)v)
 #endif
 
 #ifndef MONGOCRYPT_UINT32_SWAP_LE_BE
-#define MONGOCRYPT_UINT32_SWAP_LE_BE(v) \
-   __mongocrypt_uint32_swap_slow ((uint32_t) v)
+#define MONGOCRYPT_UINT32_SWAP_LE_BE(v) __mongocrypt_uint32_swap_slow((uint32_t)v)
 #endif
 
 #ifndef MONGOCRYPT_UINT64_SWAP_LE_BE
-#define MONGOCRYPT_UINT64_SWAP_LE_BE(v) \
-   __mongocrypt_uint64_swap_slow ((uint64_t) v)
+#define MONGOCRYPT_UINT64_SWAP_LE_BE(v) __mongocrypt_uint64_swap_slow((uint64_t)v)
 #endif
 
 #if defined(MONGOCRYPT_LITTLE_ENDIAN)
-#define MONGOCRYPT_UINT16_FROM_LE(v) ((uint16_t) v)
-#define MONGOCRYPT_UINT16_TO_LE(v) ((uint16_t) v)
-#define MONGOCRYPT_UINT16_FROM_BE(v) MONGOCRYPT_UINT16_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT16_TO_BE(v) MONGOCRYPT_UINT16_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT32_FROM_LE(v) ((uint32_t) v)
-#define MONGOCRYPT_UINT32_TO_LE(v) ((uint32_t) v)
-#define MONGOCRYPT_UINT32_FROM_BE(v) MONGOCRYPT_UINT32_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT32_TO_BE(v) MONGOCRYPT_UINT32_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT64_FROM_LE(v) ((uint64_t) v)
-#define MONGOCRYPT_UINT64_TO_LE(v) ((uint64_t) v)
-#define MONGOCRYPT_UINT64_FROM_BE(v) MONGOCRYPT_UINT64_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT64_TO_BE(v) MONGOCRYPT_UINT64_SWAP_LE_BE (v)
+#define MONGOCRYPT_UINT16_FROM_LE(v) ((uint16_t)v)
+#define MONGOCRYPT_UINT16_TO_LE(v) ((uint16_t)v)
+#define MONGOCRYPT_UINT16_FROM_BE(v) MONGOCRYPT_UINT16_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT16_TO_BE(v) MONGOCRYPT_UINT16_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT32_FROM_LE(v) ((uint32_t)v)
+#define MONGOCRYPT_UINT32_TO_LE(v) ((uint32_t)v)
+#define MONGOCRYPT_UINT32_FROM_BE(v) MONGOCRYPT_UINT32_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT32_TO_BE(v) MONGOCRYPT_UINT32_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT64_FROM_LE(v) ((uint64_t)v)
+#define MONGOCRYPT_UINT64_TO_LE(v) ((uint64_t)v)
+#define MONGOCRYPT_UINT64_FROM_BE(v) MONGOCRYPT_UINT64_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT64_TO_BE(v) MONGOCRYPT_UINT64_SWAP_LE_BE(v)
 #elif defined(MONGOCRYPT_BIG_ENDIAN)
-#define MONGOCRYPT_UINT16_FROM_LE(v) MONGOCRYPT_UINT16_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT16_TO_LE(v) MONGOCRYPT_UINT16_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT16_FROM_BE(v) ((uint16_t) v)
-#define MONGOCRYPT_UINT16_TO_BE(v) ((uint16_t) v)
-#define MONGOCRYPT_UINT32_FROM_LE(v) MONGOCRYPT_UINT32_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT32_TO_LE(v) MONGOCRYPT_UINT32_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT32_FROM_BE(v) ((uint32_t) v)
-#define MONGOCRYPT_UINT32_TO_BE(v) ((uint32_t) v)
-#define MONGOCRYPT_UINT64_FROM_LE(v) MONGOCRYPT_UINT64_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT64_TO_LE(v) MONGOCRYPT_UINT64_SWAP_LE_BE (v)
-#define MONGOCRYPT_UINT64_FROM_BE(v) ((uint64_t) v)
-#define MONGOCRYPT_UINT64_TO_BE(v) ((uint64_t) v)
+#define MONGOCRYPT_UINT16_FROM_LE(v) MONGOCRYPT_UINT16_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT16_TO_LE(v) MONGOCRYPT_UINT16_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT16_FROM_BE(v) ((uint16_t)v)
+#define MONGOCRYPT_UINT16_TO_BE(v) ((uint16_t)v)
+#define MONGOCRYPT_UINT32_FROM_LE(v) MONGOCRYPT_UINT32_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT32_TO_LE(v) MONGOCRYPT_UINT32_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT32_FROM_BE(v) ((uint32_t)v)
+#define MONGOCRYPT_UINT32_TO_BE(v) ((uint32_t)v)
+#define MONGOCRYPT_UINT64_FROM_LE(v) MONGOCRYPT_UINT64_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT64_TO_LE(v) MONGOCRYPT_UINT64_SWAP_LE_BE(v)
+#define MONGOCRYPT_UINT64_FROM_BE(v) ((uint64_t)v)
+#define MONGOCRYPT_UINT64_TO_BE(v) ((uint64_t)v)
 #else
 #error "The endianness of target architecture is unknown."
 #endif
@@ -104,13 +101,11 @@
  *--------------------------------------------------------------------------
  */
 
-static inline uint16_t
-__mongocrypt_uint16_swap_slow (uint16_t v) /* IN */
+static inline uint16_t __mongocrypt_uint16_swap_slow(uint16_t v) /* IN */
 {
-   return (uint16_t) ((v & 0x00FF) << 8) | (uint16_t) ((v & 0xFF00) >> 8);
+    return (uint16_t)((v & 0x00FF) << 8) | (uint16_t)((v & 0xFF00) >> 8);
 }
 
-
 /*
  *--------------------------------------------------------------------------
  *
@@ -127,14 +122,11 @@ __mongocrypt_uint16_swap_slow (uint16_t v) /* IN */
  *--------------------------------------------------------------------------
  */
 
-static inline uint32_t
-__mongocrypt_uint32_swap_slow (uint32_t v) /* IN */
+static inline uint32_t __mongocrypt_uint32_swap_slow(uint32_t v) /* IN */
 {
-   return ((v & 0x000000FFU) << 24) | ((v & 0x0000FF00U) << 8) |
-          ((v & 0x00FF0000U) >> 8) | ((v & 0xFF000000U) >> 24);
+    return ((v & 0x000000FFU) << 24) | ((v & 0x0000FF00U) << 8) | ((v & 0x00FF0000U) >> 8) | ((v & 0xFF000000U) >> 24);
 }
 
-
 /*
  *--------------------------------------------------------------------------
  *
@@ -151,18 +143,12 @@ __mongocrypt_uint32_swap_slow (uint32_t v) /* IN */
  *--------------------------------------------------------------------------
  */
 
-static inline uint64_t
-__mongocrypt_uint64_swap_slow (uint64_t v) /* IN */
+static inline uint64_t __mongocrypt_uint64_swap_slow(uint64_t v) /* IN */
 {
-   return ((v & 0x00000000000000FFULL) << 56) |
-          ((v & 0x000000000000FF00ULL) << 40) |
-          ((v & 0x0000000000FF0000ULL) << 24) |
-          ((v & 0x00000000FF000000ULL) << 8) |
-          ((v & 0x000000FF00000000ULL) >> 8) |
-          ((v & 0x0000FF0000000000ULL) >> 24) |
-          ((v & 0x00FF000000000000ULL) >> 40) |
-          ((v & 0xFF00000000000000ULL) >> 56);
+    return ((v & 0x00000000000000FFULL) << 56) | ((v & 0x000000000000FF00ULL) << 40)
+         | ((v & 0x0000000000FF0000ULL) << 24) | ((v & 0x00000000FF000000ULL) << 8) | ((v & 0x000000FF00000000ULL) >> 8)
+         | ((v & 0x0000FF0000000000ULL) >> 24) | ((v & 0x00FF000000000000ULL) >> 40)
+         | ((v & 0xFF00000000000000ULL) >> 56);
 }
 
-
 #endif /* MONGOCRYPT_ENDIAN_PRIVATE_H */

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

@@ -20,45 +20,41 @@
 #include "mongocrypt-status-private.h"
 
 typedef struct {
-   /* e.g. https://kevin.keyvault.azure.net:443/path/path/?query=value */
-   char *original;
-   char *protocol;  /* e.g. https */
-   char *host;      /* e.g. kevin.keyvault.azure.net */
-   char *port;      /* e.g. 443 */
-   char *domain;    /* e.g. keyvault.azure.net */
-   char *subdomain; /* e.g. kevin */
-   char *path;      /* e.g. path/path */
-   char *query;     /* e.g. query=value */
-   /* host_and_port is the form that should be returned to drivers. */
-   char *host_and_port; /* e.g. kevin.keyvault.azure.net:443 */
+    /* e.g. https://kevin.keyvault.azure.net:443/path/path/?query=value */
+    char *original;
+    char *protocol;  /* e.g. https */
+    char *host;      /* e.g. kevin.keyvault.azure.net */
+    char *port;      /* e.g. 443 */
+    char *domain;    /* e.g. keyvault.azure.net */
+    char *subdomain; /* e.g. kevin */
+    char *path;      /* e.g. path/path */
+    char *query;     /* e.g. query=value */
+    /* host_and_port is the form that should be returned to drivers. */
+    char *host_and_port; /* e.g. kevin.keyvault.azure.net:443 */
 } _mongocrypt_endpoint_t;
 
-_mongocrypt_endpoint_t *
-_mongocrypt_endpoint_copy (_mongocrypt_endpoint_t *src);
+_mongocrypt_endpoint_t *_mongocrypt_endpoint_copy(_mongocrypt_endpoint_t *src);
 
-void
-_mongocrypt_endpoint_destroy (_mongocrypt_endpoint_t *endpoint);
+void _mongocrypt_endpoint_destroy(_mongocrypt_endpoint_t *endpoint);
 
 typedef struct {
-   /* allow_empty_subdomain does not require "host" to contain dot separators.
-    * If allow_empty_subdomain is true, then "localhost" is a valid endpoint. */
-   bool allow_empty_subdomain;
+    /* allow_empty_subdomain does not require "host" to contain dot separators.
+     * If allow_empty_subdomain is true, then "localhost" is a valid endpoint. */
+    bool allow_empty_subdomain;
 } _mongocrypt_endpoint_parse_opts_t;
 
 /* Parses a subset of URIs of the form:
  * [protocol://][host[:port]][path][?query]
  */
-_mongocrypt_endpoint_t *
-_mongocrypt_endpoint_new (const char *endpoint_raw,
-                          int32_t len,
-                          _mongocrypt_endpoint_parse_opts_t *opts,
-                          mongocrypt_status_t *status);
+_mongocrypt_endpoint_t *_mongocrypt_endpoint_new(const char *endpoint_raw,
+                                                 int32_t len,
+                                                 _mongocrypt_endpoint_parse_opts_t *opts,
+                                                 mongocrypt_status_t *status);
 
 /* _mongocrypt_apply_default_port checks if the endpoint string *endpoint_raw
  * contains a port. If *endpoint_raw does not contain a port, *endpoint_raw is
  * freed and overwritten to a copy of *endpoint_raw with ":<port>" appended.
  */
-void
-_mongocrypt_apply_default_port (char **endpoint_raw, char *port);
+void _mongocrypt_apply_default_port(char **endpoint_raw, char *port);
 
 #endif /* MONGOCRYPT_ENDPOINT_PRIVATE_H */