Skip to content

Commit e52bb04

Browse files
authored
CSHARP-5263: Remove TLS1.0 and 1.1 (#1459)
1 parent f2536e7 commit e52bb04

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

src/MongoDB.Driver/Core/Configuration/SslStreamSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public SslStreamSettings(
5656
_checkCertificateRevocation = checkCertificateRevocation.WithDefault(false);
5757
_clientCertificates = Ensure.IsNotNull(clientCertificates.WithDefault(Enumerable.Empty<X509Certificate>()), "clientCertificates").ToList();
5858
_clientCertificateSelectionCallback = clientCertificateSelectionCallback.WithDefault(null);
59-
_enabledSslProtocols = enabledProtocols.WithDefault(SslProtocolsTls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls);
59+
_enabledSslProtocols = enabledProtocols.WithDefault(SslProtocolsTls13 | SslProtocols.Tls12);
6060
_serverCertificateValidationCallback = serverCertificateValidationCallback.WithDefault(null);
6161
}
6262

src/MongoDB.Driver/SslSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class SslSettings : IEquatable<SslSettings>
3838
private bool _checkCertificateRevocation = false;
3939
private X509CertificateCollection _clientCertificateCollection;
4040
private LocalCertificateSelectionCallback _clientCertificateSelectionCallback;
41-
private SslProtocols _enabledSslProtocols = SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls;
41+
private SslProtocols _enabledSslProtocols = SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12;
4242
private RemoteCertificateValidationCallback _serverCertificateValidationCallback;
4343

4444
// the following fields are set when the SslSettings are frozen

tests/MongoDB.Driver.Tests/ClusterKeyTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private ClusterKey CreateSubject(string notEqualFieldName = null)
228228
var sslSettings = new SslSettings
229229
{
230230
CheckCertificateRevocation = true,
231-
EnabledSslProtocols = SslProtocols.Tls
231+
EnabledSslProtocols = SslProtocols.Tls12
232232
};
233233
var useTls = false;
234234
var waitQueueSize = 20;
@@ -385,7 +385,7 @@ internal ClusterKey CreateSubjectWith(
385385
var sslSettings = new SslSettings
386386
{
387387
CheckCertificateRevocation = true,
388-
EnabledSslProtocols = SslProtocols.Tls
388+
EnabledSslProtocols = SslProtocols.Tls12
389389
};
390390
var useTls = false;
391391
var waitQueueSize = 20;

tests/MongoDB.Driver.Tests/ClusterRegistryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
using MongoDB.Bson;
2323
using MongoDB.Bson.TestHelpers;
2424
using MongoDB.Driver.Core.Clusters;
25-
using MongoDB.Driver.Core.Servers;
2625
using MongoDB.Driver.Core.Compression;
2726
using MongoDB.Driver.Core.Configuration;
2827
using MongoDB.Driver.Core.Misc;
28+
using MongoDB.Driver.Core.Servers;
2929
using MongoDB.Driver.Core.TestHelpers.Logging;
3030
using Xunit;
3131
using Xunit.Abstractions;
@@ -59,7 +59,7 @@ public void GetOrCreateCluster_should_return_a_cluster_with_the_correct_settings
5959
var sslSettings = new SslSettings
6060
{
6161
CheckCertificateRevocation = true,
62-
EnabledSslProtocols = SslProtocols.Tls
62+
EnabledSslProtocols = SslProtocols.Tls12
6363
};
6464
var kmsProviders = new Dictionary<string, IReadOnlyDictionary<string, object>>()
6565
{

tests/MongoDB.Driver.Tests/Core/Configuration/SslStreamSettingsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void constructor_should_initialize_instance()
3434
subject.CheckCertificateRevocation.Should().BeFalse();
3535
subject.ClientCertificates.Should().BeEmpty();
3636
subject.ClientCertificateSelectionCallback.Should().BeNull();
37-
subject.EnabledSslProtocols.Should().Be(SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls);
37+
subject.EnabledSslProtocols.Should().Be(SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12);
3838
subject.ServerCertificateValidationCallback.Should().BeNull();
3939
}
4040

@@ -170,8 +170,8 @@ public void With_clientCertificateSelectionCallback_should_return_expected_resul
170170
[Fact]
171171
public void With_enabledProtocols_should_return_expected_result()
172172
{
173-
var oldEnabledProtocols = SslProtocols.Tls;
174-
var newEnabledProtocols = SslProtocols.Tls12;
173+
var oldEnabledProtocols = SslProtocols.Tls12;
174+
var newEnabledProtocols = SslStreamSettings.SslProtocolsTls13;
175175
var subject = new SslStreamSettings(enabledProtocols: oldEnabledProtocols);
176176

177177
var result = subject.With(enabledProtocols: newEnabledProtocols);

tests/MongoDB.Driver.Tests/MongoClientSettingsTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ public void ToClusterKey_should_copy_relevant_values()
14001400
var sslSettings = new SslSettings
14011401
{
14021402
CheckCertificateRevocation = true,
1403-
EnabledSslProtocols = SslProtocols.Tls
1403+
EnabledSslProtocols = SslProtocols.Tls12
14041404
};
14051405

14061406
var subject = new MongoClientSettings

tests/MongoDB.Driver.Tests/SslSettingsTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
* limitations under the License.
1414
*/
1515

16-
using FluentAssertions;
1716
using System;
1817
using System.IO;
1918
using System.Linq;
2019
using System.Net.Security;
2120
using System.Reflection;
2221
using System.Security.Authentication;
2322
using System.Security.Cryptography.X509Certificates;
23+
using FluentAssertions;
2424
using MongoDB.Driver.Core.Configuration;
2525
using Xunit;
2626

@@ -104,7 +104,7 @@ public void TestClone()
104104
CheckCertificateRevocation = false,
105105
ClientCertificates = new[] { new X509Certificate2(certificateFileName, "password") },
106106
ClientCertificateSelectionCallback = ClientCertificateSelectionCallback,
107-
EnabledSslProtocols = SslProtocols.Tls,
107+
EnabledSslProtocols = SslProtocols.Tls12,
108108
ServerCertificateValidationCallback = ServerCertificateValidationCallback
109109
};
110110

@@ -119,7 +119,7 @@ public void TestDefaults()
119119
settings.CheckCertificateRevocation.Should().BeFalse();
120120
Assert.Equal(null, settings.ClientCertificates);
121121
Assert.Equal(null, settings.ClientCertificateSelectionCallback);
122-
Assert.Equal(SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls, settings.EnabledSslProtocols);
122+
Assert.Equal(SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12, settings.EnabledSslProtocols);
123123
Assert.Equal(null, settings.ServerCertificateValidationCallback);
124124
}
125125

@@ -157,9 +157,9 @@ public void TestEquals()
157157
public void TestEnabledSslProtocols()
158158
{
159159
var settings = new SslSettings();
160-
Assert.Equal(SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12 | SslProtocols.Tls11 | SslProtocols.Tls, settings.EnabledSslProtocols);
160+
Assert.Equal(SslStreamSettings.SslProtocolsTls13 | SslProtocols.Tls12, settings.EnabledSslProtocols);
161161

162-
var enabledSslProtocols = SslProtocols.Tls;
162+
var enabledSslProtocols = SslProtocols.Tls12;
163163
settings.EnabledSslProtocols = enabledSslProtocols;
164164
Assert.Equal(enabledSslProtocols, settings.EnabledSslProtocols);
165165

0 commit comments

Comments
 (0)