libmongocrypt-helper 1.7.4.0.1002 → 1.11.0.0.1001

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/AssemblyInfo.cs

@@ -1,4 +1,4 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("MongoDB.Libmongocrypt.Test")]
-[assembly: InternalsVisibleTo("MongoDB.Libmongocrypt.Test32")]
+[assembly: InternalsVisibleTo("MongoDB.Libmongocrypt.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
+[assembly: InternalsVisibleTo("MongoDB.Libmongocrypt.Test32, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Binary.cs

@@ -48,7 +48,14 @@ namespace MongoDB.Libmongocrypt
         /// </value>
         public IntPtr Data
         {
-            get { return Library.mongocrypt_binary_data(_handle); }
+            get
+            {
+                if (!_handle.IsInvalid)
+                {
+                    return Marshal.ReadIntPtr(_handle.DangerousGetHandle());
+                }
+                return IntPtr.Zero;
+            }
         }
 
         /// <summary>
@@ -59,7 +66,14 @@ namespace MongoDB.Libmongocrypt
         /// </value>
         public uint Length
         {
-            get { return Library.mongocrypt_binary_len(_handle); }
+            get
+            {
+                if (!_handle.IsInvalid)
+                {
+                    return (uint)Marshal.ReadInt32(_handle.DangerousGetHandle(), IntPtr.Size);
+                }
+                return 0;
+            }
         }
 
         internal BinarySafeHandle Handle => _handle;

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClient.cs

@@ -105,11 +105,7 @@ namespace MongoDB.Libmongocrypt
         /// <summary>
         /// Starts an explicit encryption context.
         /// </summary>
-        /// <param name="key">The key id.</param>
-        /// <param name="encryptionAlgorithm">The encryption algorithm.</param>
-        /// <param name="message">The BSON message.</param>
-        /// <returns>A encryption context. </returns>
-        public CryptContext StartExplicitEncryptionContext(byte[] keyId, byte[] keyAltName, string queryType, long? contentionFactor, string encryptionAlgorithm, byte[] message)
+        public CryptContext StartExplicitEncryptionContext(byte[] keyId, byte[] keyAltName, string queryType, long? contentionFactor, string encryptionAlgorithm, byte[] message, byte[] rangeOptions, bool isExpressionMode = false)
         {
             var handle = Library.mongocrypt_ctx_new(_handle);
 
@@ -122,6 +118,11 @@ namespace MongoDB.Libmongocrypt
                 PinnedBinary.RunAsPinnedBinary(handle, keyAltName, _status, (h, pb) => Library.mongocrypt_ctx_setopt_key_alt_name(h, pb));
             }
 
+            if (rangeOptions != null)
+            {
+                PinnedBinary.RunAsPinnedBinary(handle, rangeOptions, _status, (h, pb) => Library.mongocrypt_ctx_setopt_algorithm_range(h, pb));
+            }
+
             handle.Check(_status, Library.mongocrypt_ctx_setopt_algorithm(handle, encryptionAlgorithm, -1));
 
             if (queryType != null)
@@ -135,7 +136,25 @@ namespace MongoDB.Libmongocrypt
                 handle.Check(_status, Library.mongocrypt_ctx_setopt_contention_factor(handle, contentionFactorInt));
             }
 
-            PinnedBinary.RunAsPinnedBinary(handle, message, _status, (h, pb) => Library.mongocrypt_ctx_explicit_encrypt_init(h, pb));
+            PinnedBinary.RunAsPinnedBinary(
+                handle, 
+                message, 
+                _status, 
+                (h, pb) =>
+                {
+                    if (isExpressionMode)
+                    {
+                        // mongocrypt_ctx_explicit_encrypt_expression_init shares the same code as mongocrypt_ctx_explicit_encrypt_init.
+                        // The only difference is the validation of the queryType argument:
+                        // * mongocrypt_ctx_explicit_encrypt_expression_init requires queryType of "rangePreview".
+                        // * mongocrypt_ctx_explicit_encrypt_init rejects queryType of "rangePreview".
+                        return Library.mongocrypt_ctx_explicit_encrypt_expression_init(h, pb);
+                    }
+                    else
+                    {
+                        return Library.mongocrypt_ctx_explicit_encrypt_init(h, pb);
+                    }
+                });
 
             return new CryptContext(handle);
         }

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/CryptClientFactory.cs

@@ -15,6 +15,7 @@
  */
 
 using System;
+using System.Linq;
 
 namespace MongoDB.Libmongocrypt
 {
@@ -34,6 +35,9 @@ namespace MongoDB.Libmongocrypt
         private static Library.Delegates.RandomCallback __randomCallback = new Library.Delegates.RandomCallback(SecureRandomCallback.GenerateRandom);
         private static Library.Delegates.CryptoHmacCallback __signRsaesPkcs1HmacCallback = new Library.Delegates.CryptoHmacCallback(SigningRSAESPKCSCallback.RsaSign);
 
+        // mongocrypt_is_crypto_available is only available in libmongocrypt version >= 1.9
+        private static readonly Version __mongocryptIsCryptoAvailableMinVersion = Version.Parse("1.9");
+
         /// <summary>Creates a CryptClient with the specified options.</summary>
         /// <param name="options">The options.</param>
         /// <returns>A CryptClient</returns>
@@ -42,14 +46,14 @@ namespace MongoDB.Libmongocrypt
             MongoCryptSafeHandle handle = null;
             Status status = null;
 
+            var cryptoAvailable = Version.Parse(Library.Version.Split('-', '+').First()) >= __mongocryptIsCryptoAvailableMinVersion && Library.mongocrypt_is_crypto_available();
+
             try
             {
                 handle = Library.mongocrypt_new();
                 status = new Status();
-
-                // The below code can be avoided on Windows. So, we don't call it on this system 
-                // to avoid restrictions on target frameworks that present in some of below
-                if (OperatingSystemHelper.CurrentOperatingSystem != OperatingSystemPlatform.Windows)
+                
+                if (!cryptoAvailable)
                 {
                     handle.Check(
                         status,

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/Library.cs

@@ -48,6 +48,9 @@ namespace MongoDB.Libmongocrypt
             _mongocrypt_ctx_setopt_key_encryption_key = new Lazy<Delegates.mongocrypt_ctx_setopt_key_encryption_key>(
                 () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_setopt_key_encryption_key>(
                     ("mongocrypt_ctx_setopt_key_encryption_key")), true);
+            
+            _mongocrypt_is_crypto_available = new Lazy<Delegates.mongocrypt_is_crypto_available>(
+                () => __loader.Value.GetFunction<Delegates.mongocrypt_is_crypto_available>("mongocrypt_is_crypto_available"), true);
 
             _mongocrypt_setopt_aes_256_ecb = new Lazy<Delegates.mongocrypt_setopt_aes_256_ecb>(
                 () => __loader.Value.GetFunction<Delegates.mongocrypt_setopt_aes_256_ecb>(
@@ -133,6 +136,9 @@ namespace MongoDB.Libmongocrypt
             _mongocrypt_ctx_setopt_algorithm = new Lazy<Delegates.mongocrypt_ctx_setopt_algorithm>(
                 () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_setopt_algorithm>(
                     ("mongocrypt_ctx_setopt_algorithm")), true);
+            _mongocrypt_ctx_setopt_algorithm_range = new Lazy<Delegates.mongocrypt_ctx_setopt_algorithm_range>(
+                () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_setopt_algorithm_range>(
+                    ("mongocrypt_ctx_setopt_algorithm_range")), true);
             _mongocrypt_ctx_setopt_contention_factor = new Lazy<Delegates.mongocrypt_ctx_setopt_contention_factor>(
                 () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_setopt_contention_factor>(
                     ("mongocrypt_ctx_setopt_contention_factor")), true);
@@ -151,6 +157,9 @@ namespace MongoDB.Libmongocrypt
             _mongocrypt_ctx_explicit_encrypt_init = new Lazy<Delegates.mongocrypt_ctx_explicit_encrypt_init>(
                 () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_explicit_encrypt_init>(
                     ("mongocrypt_ctx_explicit_encrypt_init")), true);
+            _mongocrypt_ctx_explicit_encrypt_expression_init = new Lazy<Delegates.mongocrypt_ctx_explicit_encrypt_expression_init>(
+                () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_explicit_encrypt_expression_init>(
+                    ("mongocrypt_ctx_explicit_encrypt_expression_init")), true);
             _mongocrypt_ctx_explicit_decrypt_init = new Lazy<Delegates.mongocrypt_ctx_explicit_decrypt_init>(
                 () => __loader.Value.GetFunction<Delegates.mongocrypt_ctx_explicit_decrypt_init>(
                     ("mongocrypt_ctx_explicit_decrypt_init")), true);
@@ -223,6 +232,8 @@ namespace MongoDB.Libmongocrypt
         internal static Delegates.mongocrypt_setopt_log_handler mongocrypt_setopt_log_handler => _mongocrypt_setopt_log_handler.Value;
         internal static Delegates.mongocrypt_setopt_kms_providers mongocrypt_setopt_kms_providers => _mongocrypt_setopt_kms_providers.Value;
         internal static Delegates.mongocrypt_ctx_setopt_key_encryption_key mongocrypt_ctx_setopt_key_encryption_key => _mongocrypt_ctx_setopt_key_encryption_key.Value;
+        
+        internal static Delegates.mongocrypt_is_crypto_available mongocrypt_is_crypto_available => _mongocrypt_is_crypto_available.Value;
 
         internal static Delegates.mongocrypt_setopt_aes_256_ecb mongocrypt_setopt_aes_256_ecb => _mongocrypt_setopt_aes_256_ecb.Value;
         internal static Delegates.mongocrypt_setopt_bypass_query_analysis mongocrypt_setopt_bypass_query_analysis => _mongocrypt_setopt_bypass_query_analysis.Value;
@@ -263,6 +274,7 @@ namespace MongoDB.Libmongocrypt
         internal static Delegates.mongocrypt_ctx_encrypt_init mongocrypt_ctx_encrypt_init => _mongocrypt_ctx_encrypt_init.Value;
         internal static Delegates.mongocrypt_ctx_decrypt_init mongocrypt_ctx_decrypt_init => _mongocrypt_ctx_decrypt_init.Value;
         internal static Delegates.mongocrypt_ctx_explicit_encrypt_init mongocrypt_ctx_explicit_encrypt_init => _mongocrypt_ctx_explicit_encrypt_init.Value;
+        internal static Delegates.mongocrypt_ctx_explicit_encrypt_expression_init mongocrypt_ctx_explicit_encrypt_expression_init => _mongocrypt_ctx_explicit_encrypt_expression_init.Value;
         internal static Delegates.mongocrypt_ctx_explicit_decrypt_init mongocrypt_ctx_explicit_decrypt_init => _mongocrypt_ctx_explicit_decrypt_init.Value;
         internal static Delegates.mongocrypt_ctx_datakey_init mongocrypt_ctx_datakey_init => _mongocrypt_ctx_datakey_init.Value;
         internal static Delegates.mongocrypt_ctx_provide_kms_providers mongocrypt_ctx_provide_kms_providers => _mongocrypt_ctx_provide_kms_providers.Value;
@@ -270,6 +282,7 @@ namespace MongoDB.Libmongocrypt
         internal static Delegates.mongocrypt_ctx_setopt_key_id mongocrypt_ctx_setopt_key_id => _mongocrypt_ctx_setopt_key_id.Value;
         internal static Delegates.mongocrypt_ctx_setopt_key_alt_name mongocrypt_ctx_setopt_key_alt_name => _mongocrypt_ctx_setopt_key_alt_name.Value;
         internal static Delegates.mongocrypt_ctx_setopt_algorithm mongocrypt_ctx_setopt_algorithm => _mongocrypt_ctx_setopt_algorithm.Value;
+        internal static Delegates.mongocrypt_ctx_setopt_algorithm_range mongocrypt_ctx_setopt_algorithm_range => _mongocrypt_ctx_setopt_algorithm_range.Value;
         internal static Delegates.mongocrypt_ctx_setopt_contention_factor mongocrypt_ctx_setopt_contention_factor => _mongocrypt_ctx_setopt_contention_factor.Value;
         internal static Delegates.mongocrypt_ctx_setopt_query_type mongocrypt_ctx_setopt_query_type => _mongocrypt_ctx_setopt_query_type.Value;
 
@@ -298,6 +311,8 @@ namespace MongoDB.Libmongocrypt
 
         private static readonly Lazy<Delegates.mongocrypt_setopt_kms_providers> _mongocrypt_setopt_kms_providers;
         private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_key_encryption_key> _mongocrypt_ctx_setopt_key_encryption_key;
+        
+        private static readonly Lazy<Delegates.mongocrypt_is_crypto_available> _mongocrypt_is_crypto_available;
 
         private static readonly Lazy<Delegates.mongocrypt_setopt_aes_256_ecb> _mongocrypt_setopt_aes_256_ecb;
         private static readonly Lazy<Delegates.mongocrypt_setopt_bypass_query_analysis> _mongocrypt_setopt_bypass_query_analysis;
@@ -342,6 +357,7 @@ namespace MongoDB.Libmongocrypt
         private static readonly Lazy<Delegates.mongocrypt_ctx_decrypt_init> _mongocrypt_ctx_decrypt_init;
 
         private static readonly Lazy<Delegates.mongocrypt_ctx_explicit_encrypt_init> _mongocrypt_ctx_explicit_encrypt_init;
+        private static readonly Lazy<Delegates.mongocrypt_ctx_explicit_encrypt_expression_init> _mongocrypt_ctx_explicit_encrypt_expression_init;        
 
         private static readonly Lazy<Delegates.mongocrypt_ctx_explicit_decrypt_init> _mongocrypt_ctx_explicit_decrypt_init;
 
@@ -353,6 +369,7 @@ namespace MongoDB.Libmongocrypt
         private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_key_id> _mongocrypt_ctx_setopt_key_id;
         private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_key_alt_name> _mongocrypt_ctx_setopt_key_alt_name;
         private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_algorithm> _mongocrypt_ctx_setopt_algorithm;
+        private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_algorithm_range> _mongocrypt_ctx_setopt_algorithm_range;
         private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_contention_factor> _mongocrypt_ctx_setopt_contention_factor;
         private static readonly Lazy<Delegates.mongocrypt_ctx_setopt_query_type> _mongocrypt_ctx_setopt_query_type;
 
@@ -389,6 +406,9 @@ namespace MongoDB.Libmongocrypt
 
             public delegate MongoCryptSafeHandle mongocrypt_new();
 
+            [return: MarshalAs(UnmanagedType.I1)]
+            public delegate bool mongocrypt_is_crypto_available();
+
             public delegate void LogCallback([MarshalAs(UnmanagedType.I4)] LogLevel level, IntPtr messasge,
                 uint message_length, IntPtr context);
 
@@ -479,7 +499,7 @@ namespace MongoDB.Libmongocrypt
             /// </summary>
             [return: MarshalAs(UnmanagedType.I1)]
             public delegate bool mongocrypt_setopt_encrypted_field_config_map(MongoCryptSafeHandle handle, BinarySafeHandle efc_map);
-            [return: MarshalAs(UnmanagedType.I1),]
+            [return: MarshalAs(UnmanagedType.I1)]
             public delegate bool mongocrypt_setopt_schema_map(MongoCryptSafeHandle handle, BinarySafeHandle schema);
             /// <summary>
             /// void mongocrypt_setopt_append_crypt_shared_lib_search_path(mongocrypt_t* crypt, const char* path);
@@ -561,9 +581,16 @@ namespace MongoDB.Libmongocrypt
             [return: MarshalAs(UnmanagedType.I1)]
             public delegate bool mongocrypt_ctx_decrypt_init(ContextSafeHandle handle, BinarySafeHandle binary);
 
+            /// <summary>
+            /// bool mongocrypt_ctx_explicit_encrypt_init(mongocrypt_ctx_t* ctx, mongocrypt_binary_t* msg)
+            /// </summary>
             [return: MarshalAs(UnmanagedType.I1)]
-            public delegate bool
-                mongocrypt_ctx_explicit_encrypt_init(ContextSafeHandle handle, BinarySafeHandle binary);
+            public delegate bool mongocrypt_ctx_explicit_encrypt_init(ContextSafeHandle handle, BinarySafeHandle binary);
+            /// <summary>
+            /// bool mongocrypt_ctx_explicit_encrypt_expression_init(mongocrypt_ctx_t* ctx, mongocrypt_binary_t* msg)
+            /// </summary>
+            [return: MarshalAs(UnmanagedType.I1)]
+            public delegate bool mongocrypt_ctx_explicit_encrypt_expression_init(ContextSafeHandle handle, BinarySafeHandle msg);
 
             [return: MarshalAs(UnmanagedType.I1)]
             public delegate bool
@@ -596,6 +623,11 @@ namespace MongoDB.Libmongocrypt
             [return: MarshalAs(UnmanagedType.I1)]
             public delegate bool mongocrypt_ctx_setopt_algorithm(ContextSafeHandle handle, [MarshalAs(UnmanagedType.LPStr)] string algorithm, int length);
             /// <summary>
+            /// bool mongocrypt_ctx_setopt_algorithm_range(mongocrypt_ctx_t* ctx, mongocrypt_binary_t* opts);
+            /// </summary>
+            [return: MarshalAs(UnmanagedType.I1)]
+            public delegate bool mongocrypt_ctx_setopt_algorithm_range(ContextSafeHandle handle, BinarySafeHandle opts);
+            /// <summary>
             /// bool mongocrypt_ctx_setopt_contention_factor(mongocrypt_ctx_t* ctx, int64_t contention_factor);
             /// </summary>
             [return: MarshalAs(UnmanagedType.I1)]

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/LibraryLoader.cs

@@ -28,6 +28,7 @@ namespace MongoDB.Libmongocrypt
     internal class LibraryLoader
     {
         private ISharedLibraryLoader _loader;
+        private static readonly string __libmongocryptLibPath = Environment.GetEnvironmentVariable("LIBMONGOCRYPT_PATH");
 
         public LibraryLoader()
         {
@@ -54,40 +55,13 @@ namespace MongoDB.Libmongocrypt
             switch (OperatingSystemHelper.CurrentOperatingSystem)
             {
                 case OperatingSystemPlatform.MacOS:
-                    {
-                        string[] suffixPaths = new[]
-                        {
-                            "../../runtimes/osx/native/",
-                            "runtimes/osx/native/",
-                            string.Empty
-                        };
-                        string path = FindLibrary(candidatePaths, suffixPaths, "libmongocrypt.dylib");
-                        _loader = new DarwinLibraryLoader(path);
-                    }
+                    _loader = new DarwinLibraryLoader(candidatePaths);
                     break;
                 case OperatingSystemPlatform.Linux:
-                    {
-                        string[] suffixPaths = new[]
-                        {
-                            "../../runtimes/linux/native/",
-                            "runtimes/linux/native/",
-                            string.Empty
-                        };
-                        string path = FindLibrary(candidatePaths, suffixPaths, "libmongocrypt.so");
-                        _loader = new LinuxLibrary(path);
-                    }
+                    _loader = new LinuxLibrary(candidatePaths);
                     break;
                 case OperatingSystemPlatform.Windows:
-                    {
-                        string[] suffixPaths = new[]
-                        {
-                            @"..\..\runtimes\win\native\",
-                            @".\runtimes\win\native\",
-                            string.Empty
-                        };
-                        string path = FindLibrary(candidatePaths, suffixPaths, "mongocrypt.dll");
-                        _loader = new WindowsLibrary(path);
-                    }
+                    _loader = new WindowsLibrary(candidatePaths);
                     break;
                 default:
                     // should not be reached. If we're here, then there is a bug in OperatingSystemHelper
@@ -95,7 +69,7 @@ namespace MongoDB.Libmongocrypt
             }
         }
 
-        private string FindLibrary(IList<string> basePaths, string[] suffixPaths, string library)
+        private static string FindLibrary(IList<string> basePaths, string[] suffixPaths, string library)
         {
             var candidates = new List<string>();
             foreach (var basePath in basePaths)
@@ -150,9 +124,17 @@ namespace MongoDB.Libmongocrypt
             public const int RTLD_GLOBAL = 0x8;
             public const int RTLD_NOW = 0x2;
 
+            private static readonly string[] __suffixPaths = 
+            {
+                "../../runtimes/osx/native/",
+                "runtimes/osx/native/",
+                string.Empty
+            };
+
             private readonly IntPtr _handle;
-            public DarwinLibraryLoader(string path)
+            public DarwinLibraryLoader(List<string> candidatePaths)
             {
+                var path = __libmongocryptLibPath ?? FindLibrary(candidatePaths, __suffixPaths, "libmongocrypt.dylib");
                 _handle = dlopen(path, RTLD_GLOBAL | RTLD_NOW);
                 if (_handle == IntPtr.Zero)
                 {
@@ -186,11 +168,37 @@ namespace MongoDB.Libmongocrypt
             // #define RTLD_GLOBAL     0x100
             public const int RTLD_GLOBAL = 0x100;
             public const int RTLD_NOW = 0x2;
+            private static readonly bool _use_libdl1;
+
+            static LinuxLibrary()
+            {
+                try
+                {
+                    Libdl1.dlerror();
+                    _use_libdl1 = true;
+                }
+                catch
+                {
+                    _use_libdl1 = false;
+                }
+            }
+            
+            private static readonly string[] __suffixPaths = 
+            {
+                "../../runtimes/linux/native/",
+                "runtimes/linux/native/",
+                string.Empty
+            };
 
             private readonly IntPtr _handle;
-            public LinuxLibrary(string path)
+            public LinuxLibrary(List<string> candidatePaths)
             {
-                _handle = dlopen(path, RTLD_GLOBAL | RTLD_NOW);
+                var path = __libmongocryptLibPath ?? FindLibrary(candidatePaths, __suffixPaths, "libmongocrypt.so");
+                
+                _handle = _use_libdl1
+                    ? Libdl1.dlopen(path, RTLD_GLOBAL | RTLD_NOW)
+                    : Libdl2.dlopen(path, RTLD_GLOBAL | RTLD_NOW);
+                
                 if (_handle == IntPtr.Zero)
                 {
                     throw new FileNotFoundException(path);
@@ -199,16 +207,8 @@ namespace MongoDB.Libmongocrypt
 
             public IntPtr GetFunction(string name)
             {
-                return dlsym(_handle, name);
+                return _use_libdl1 ? Libdl1.dlsym(_handle, name) : Libdl2.dlsym(_handle, name);
             }
-
-#pragma warning disable IDE1006 // Naming Styles
-            [DllImport("libdl")]
-            public static extern IntPtr dlopen(string filename, int flags);
-
-            [DllImport("libdl", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-            public static extern IntPtr dlsym(IntPtr handle, string symbol);
-#pragma warning restore IDE1006 // Naming Styles
         }
 
         /// <summary>
@@ -216,9 +216,17 @@ namespace MongoDB.Libmongocrypt
         /// </summary>
         private class WindowsLibrary : ISharedLibraryLoader
         {
+            private static readonly string[] __suffixPaths = 
+            {
+                @"..\..\runtimes\win\native\",
+                @".\runtimes\win\native\",
+                string.Empty
+            };
+            
             private readonly IntPtr _handle;
-            public WindowsLibrary(string path)
+            public WindowsLibrary(List<string> candidatePaths)
             {
+                var path = __libmongocryptLibPath ?? FindLibrary(candidatePaths, __suffixPaths, "mongocrypt.dll");
                 _handle = LoadLibrary(path);
                 if (_handle == IntPtr.Zero)
                 {
@@ -248,5 +256,34 @@ namespace MongoDB.Libmongocrypt
             [DllImport("kernel32", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
             public static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
         }
+        
+        private static class Libdl1
+        {
+            private const string LibName = "libdl";
+            
+#pragma warning disable IDE1006 // Naming Styles
+            [DllImport(LibName)]
+            public static extern IntPtr dlopen(string filename, int flags);
+
+            [DllImport(LibName, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+            public static extern IntPtr dlsym(IntPtr handle, string symbol);
+            
+            [DllImport(LibName)]
+            public static extern string dlerror();
+#pragma warning restore IDE1006 // Naming Styles
+        }
+        
+        private static class Libdl2
+        {
+            private const string LibName = "libdl.so.2";
+            
+#pragma warning disable IDE1006 // Naming Styles
+            [DllImport(LibName)]
+            public static extern IntPtr dlopen(string filename, int flags);
+
+            [DllImport(LibName, CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+            public static extern IntPtr dlsym(IntPtr handle, string symbol);
+#pragma warning restore IDE1006 // Naming Styles
+        }
     }
 }

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.csproj

@@ -24,11 +24,12 @@
     <PackageTags>mongodb;mongo;nosql</PackageTags>
     <PackageLanguage>en-US</PackageLanguage>
     <IncludeSymbols>true</IncludeSymbols>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <PropertyGroup>
     <LibMongoCryptBinaries>../../../cmake-build/$(Configuration)</LibMongoCryptBinaries>
-    <LibMongoCryptBinaries Condition="'$(Configuration)'=='Release' And '$(OS)' == 'Windows_NT'">../../../cmake-build/RelWithDebInfo/</LibMongoCryptBinaries>
   </PropertyGroup>
 
   <ItemGroup>

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Example/MongoDB.Libmongocrypt.Example.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.8.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
   </ItemGroup>
 
   <ItemGroup>

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test/BasicTests.cs

@@ -679,7 +679,7 @@ namespace MongoDB.Libmongocrypt.Test
 
         public CryptContext StartExplicitEncryptionContextWithKeyId(CryptClient client, byte[] keyId, string encryptionAlgorithm, byte[] message)
         {
-            return client.StartExplicitEncryptionContext(keyId, keyAltName: null, queryType: null, contentionFactor: null, encryptionAlgorithm, message);
+            return client.StartExplicitEncryptionContext(keyId, keyAltName: null, queryType: null, contentionFactor: null, encryptionAlgorithm, message, rangeOptions: null);
         }
 
         static IEnumerable<string> FindTestDirectories()

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test/MongoDB.Libmongocrypt.Test.csproj

@@ -6,6 +6,8 @@
 
     <Platforms>AnyCPU</Platforms>
     <IsPackable>false</IsPackable>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>

data/ext/libmongocrypt/libmongocrypt/bindings/cs/MongoDB.Libmongocrypt.Test32/MongoDB.Libmongocrypt.Test32.csproj

@@ -4,6 +4,8 @@
         <TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\MongoDB.Driver.snk</AssemblyOriginatorKeyFile>
     </PropertyGroup>
 
     <ItemGroup>

data/ext/libmongocrypt/libmongocrypt/bindings/cs/README.md

@@ -54,6 +54,9 @@ If you see `Windows Error: 126` during tests, like the example below, it means t
 2. cd <build>/bindings/cs
 3. dotnet build cs.build
 ```
+*Note*: You can use the ```LIBMONGOCRYPT_PATH``` environment variable to load a locally installed
+libmongocrypt build. You should specify the absolute path to the libmongocrypt library itself, not just the containing folder. For example on Linux:
+```$ export LIBMONGOCRYPT_PATH='/path/to/libmongocrypt.so'```.
 
 # Testing
 Do not modify xunit.runner.json

data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.cake

@@ -1,7 +1,7 @@
-#addin nuget:?package=Cake.FileHelpers&version=3.3.0
-#addin nuget:?package=Cake.Git&version=0.22.0
-#addin nuget:?package=Cake.Incubator&version=5.1.0
-#tool dotnet:?package=GitVersion.Tool&version=5.3.7
+#addin nuget:?package=Cake.FileHelpers&version=5.0.0
+#addin nuget:?package=Cake.Git&version=2.0.0
+#addin nuget:?package=Cake.Incubator&version=7.0.0
+#tool dotnet:?package=GitVersion.Tool&version=5.10.3
 
 using System;
 using System.Linq;
@@ -14,14 +14,17 @@ var gitVersion = GitVersion();
 var buildDirectory = MakeAbsolute(Directory(GetSettingValue("buildDirectory", "c:\\build")));
 var libmongocryptAllDirectory=buildDirectory.Combine("libmongocrypt-all");
 var downloadedMongocryptDirectory=buildDirectory.Combine("downloadedMongocryptDirectory");
-var localReleaseVersion = "local-0.0.0";
+var localReleaseVersion = "0.0.0-local";
 var releaseVersion = GetSettingValue("releaseVersion", localReleaseVersion);
-var fork = GetSettingValue("fork", "https://github.com/mongodb/libmongocrypt.git");
-var branch = GetSettingValue("branch", "master"); 
-var libmongocryptAllUrl = GetSettingValue("url", "https://mciuploads.s3.amazonaws.com/libmongocrypt/all/1.6.0/libmongocrypt-all.tar.gz");
+var fork = GetSettingValue("fork", "git@github.com:mongodb/libmongocrypt.git");
+var branch = GetSettingValue("branch", "master");
+
+// 1.10.0 - latest libmongocrypt release
+var libmongocryptAllUrl = GetSettingValue("url", "https://mciuploads.s3.amazonaws.com/libmongocrypt/all/1.10.0/libmongocrypt-all.tar.gz");
+
 var csharpBindingsGitTagName = $"csharp-v{releaseVersion}";
 var csharpBindingsDirectory = buildDirectory.Combine(csharpBindingsGitTagName);
-var libmongocryptRelWithDebInfoDirectory = csharpBindingsDirectory.Combine("cmake-build").Combine("RelWithDebInfo");
+var libmongocryptRelWithDebInfoDirectory = csharpBindingsDirectory.Combine("cmake-build").Combine($"{configuration}");
 var libmongocryptCsDirectory = csharpBindingsDirectory.Combine("bindings").Combine("cs");
 var libmongocryptSolutionDirectory = libmongocryptCsDirectory.Combine("MongoDB.Libmongocrypt");
 var libmongocryptSolutionFile = libmongocryptSolutionDirectory.CombineWithFilePath("MongoDB.Libmongocrypt.csproj");
@@ -56,16 +59,9 @@ Task("Prepare")
         UncompressToTheCurrentDirectory(nativeLibrariesArchive);
 
         Information("Cloning the libmongocrypt repo..");
-        GitClone(
-            fork, 
-            csharpBindingsDirectory, 
-            new GitCloneSettings
-            {
-                BranchName = branch,
-                Checkout = true,
-                IsBare = false,
-                RecurseSubmodules = true
-            });
+        EnsureDirectoryExists(csharpBindingsDirectory);
+        Git(csharpBindingsDirectory, $"clone {fork} -b {branch} .");
+        Information("Done git clone..");
 
         EnsureDirectoryExists(libmongocryptRelWithDebInfoDirectory);
         EnsureDirectoryExists(downloadedMongocryptDirectory);
@@ -76,7 +72,7 @@ Task("Prepare")
             libmongocryptAllDirectory.Combine("ubuntu1804-64").Combine("nocrypto").Combine("lib").CombineWithFilePath("libmongocrypt.so"),
             downloadedMongocryptDirectory.CombineWithFilePath("libmongocrypt.so"));
         CopyFile(
-            libmongocryptAllDirectory.Combine("macos").Combine("nocrypto").Combine("lib").CombineWithFilePath("libmongocrypt.dylib"),
+            libmongocryptAllDirectory.Combine("macos").Combine("lib").CombineWithFilePath("libmongocrypt.dylib"),
             downloadedMongocryptDirectory.CombineWithFilePath("libmongocrypt.dylib"));
         CopyDirectory(downloadedMongocryptDirectory, libmongocryptRelWithDebInfoDirectory);
     });
@@ -98,7 +94,7 @@ Task("Tests")
     (monikerInfo) =>
     {
         Information($"Test running {monikerInfo.Moniker}..");
-        var settings = new DotNetCoreTestSettings
+        var settings = new DotNetTestSettings
         {
             Configuration = configuration,
             Framework = monikerInfo.Moniker,
@@ -106,7 +102,7 @@ Task("Tests")
         };
         var projectFullPath = libmongocryptTestsSolutionDirectory.CombineWithFilePath("MongoDB.Libmongocrypt.Test.csproj").FullPath;
         Information(projectFullPath);
-        DotNetCoreTest(
+        DotNetTest(
             projectFullPath,
             settings
         );
@@ -119,7 +115,7 @@ Task("CreatePackage")
     {
         var projectFullPath = libmongocryptSolutionFile.FullPath;
         Information($"Project path: {projectFullPath}. ReleaseVersion: {releaseVersion}");
-        var settings = new DotNetCorePackSettings
+        var settings = new DotNetPackSettings
         {
             Configuration = configuration,
             OutputDirectory = artifactsDirectory,
@@ -128,7 +124,7 @@ Task("CreatePackage")
                { "Version", releaseVersion },
             }
         };
-        DotNetCorePack(
+        DotNetPack(
             projectFullPath,
             settings);
     });
@@ -141,9 +137,9 @@ Task("NugetPush")
         var nugetApi = GetSettingValue("NugetApiKey", null);
         var packageFilePath = artifactsDirectory.CombineWithFilePath($"{libmongocryptSolutionFile.GetFilenameWithoutExtension().ToString()}.{releaseVersion}.nupkg");
         Information(packageFilePath);
-        NuGetPush(
+        DotNetNuGetPush(
             packageFilePath,
-            new NuGetPushSettings 
+            new DotNetNuGetPushSettings 
             {
                 ApiKey = nugetApi,
                 Source = "https://api.nuget.org/v3/index.json"

data/ext/libmongocrypt/libmongocrypt/bindings/cs/Scripts/build.config

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+CAKE_VERSION=2.2.0
+DOTNET_VERSION=6.0.400