Small correction and simplification

Author: papafe

src/MongoDB.Driver.Encryption/KmsRequest.cs

@@ -95,12 +95,9 @@ public Binary GetMessage()
 
         /// <summary>
         /// Indicates a network-level failure.
-        /// It will set an error status if the request should not be retried.
         /// </summary>
-        public void Fail()
-        {
-            Check(Library.mongocrypt_kms_ctx_fail(_id));
-        }
+        /// <returns>A boolean indicating whether the failed request may be retried.</returns>
+        public bool Fail() => Library.mongocrypt_kms_ctx_fail(_id);
 
         /// <summary>
         /// Feeds the response back to the libmongocrypt

src/MongoDB.Driver.Encryption/LibMongoCryptControllerBase.cs

@@ -306,38 +306,40 @@ private async Task SendKmsRequestAsync(KmsRequest request, CancellationToken can
 
                 var tlsStreamSettings = GetTlsStreamSettings(request.KmsProvider);
                 var sslStreamFactory = new SslStreamFactory(tlsStreamSettings, _networkStreamFactory);
-                using (var sslStream = await sslStreamFactory.CreateStreamAsync(endpoint, cancellation).ConfigureAwait(false))
-                using (var binary = request.GetMessage())
-                {
-                    var requestBytes = binary.ToArray();
+                using var sslStream = await sslStreamFactory.CreateStreamAsync(endpoint, cancellation).ConfigureAwait(false);
+                using var binary = request.GetMessage();
 
-                    var sleepMs = request.Sleep;
-                    if (sleepMs > 0)
-                    {
-                        await Task.Delay(sleepMs, cancellation).ConfigureAwait(false);
-                    }
+                var requestBytes = binary.ToArray();
 
-                    await sslStream.WriteAsync(requestBytes, 0, requestBytes.Length).ConfigureAwait(false);
+                var sleepMs = request.Sleep;
+                if (sleepMs > 0)
+                {
+                    await Task.Delay(sleepMs, cancellation).ConfigureAwait(false);
+                }
 
-                    while (request.BytesNeeded > 0)
-                    {
-                        var buffer = new byte[request.BytesNeeded]; // BytesNeeded is the maximum number of bytes that libmongocrypt wants to receive.
-                        var count = await sslStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
+                await sslStream.WriteAsync(requestBytes, 0, requestBytes.Length).ConfigureAwait(false);
 
-                        if (count == 0)
-                        {
-                            throw new IOException();
-                        }
+                while (request.BytesNeeded > 0)
+                {
+                    var buffer = new byte[request.BytesNeeded]; // BytesNeeded is the maximum number of bytes that libmongocrypt wants to receive.
+                    var count = await sslStream.ReadAsync(buffer, 0, buffer.Length).ConfigureAwait(false);
 
-                        var responseBytes = new byte[count];
-                        Buffer.BlockCopy(buffer, 0, responseBytes, 0, count);
-                        request.Feed(responseBytes);
+                    if (count == 0)
+                    {
+                        throw new IOException();
                     }
+
+                    var responseBytes = new byte[count];
+                    Buffer.BlockCopy(buffer, 0, responseBytes, 0, count);
+                    request.Feed(responseBytes);
                 }
             }
             catch (Exception ex) when (ex is IOException or SocketException)
             {
-                request.Fail();
+                if (!request.Fail())
+                {
+                    throw;
+                }
             }
         }
 

tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs

@@ -1522,7 +1522,8 @@ HttpClient GetClient()
                 {
                     ClientCertificates =
                     {
-                        new X509Certificate2(Environment.GetEnvironmentVariable("MONGO_X509_CLIENT_CERTIFICATE_PATH")!)
+                        new X509Certificate2(Environment.GetEnvironmentVariable("MONGO_X509_CLIENT_CERTIFICATE_PATH")!,
+                            Environment.GetEnvironmentVariable("MONGO_X509_CLIENT_CERTIFICATE_PASSWORD"))
                     },
                 };