Skip to content

Commit cd3328d

Browse files
authored
enable TLS 13 tests on Windows (#68009)
1 parent 68dc27a commit cd3328d

File tree

5 files changed

+3
-22
lines changed

5 files changed

+3
-22
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,9 @@
146146
<Uri>https://github.com/dotnet/runtime-assets</Uri>
147147
<Sha>971b917c6c2061ea6a747f0345ac86882c02c466</Sha>
148148
</Dependency>
149-
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22179.2">
149+
<Dependency Name="System.Net.TestData" Version="7.0.0-beta.22213.1">
150150
<Uri>https://github.com/dotnet/runtime-assets</Uri>
151-
<Sha>971b917c6c2061ea6a747f0345ac86882c02c466</Sha>
151+
<Sha>2e12dc95e1c286961eaea774cf26c1f29098fb43</Sha>
152152
</Dependency>
153153
<Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22179.2">
154154
<Uri>https://github.com/dotnet/runtime-assets</Uri>

eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<SystemDrawingCommonTestDataVersion>7.0.0-beta.22179.2</SystemDrawingCommonTestDataVersion>
133133
<SystemIOCompressionTestDataVersion>7.0.0-beta.22179.2</SystemIOCompressionTestDataVersion>
134134
<SystemIOPackagingTestDataVersion>7.0.0-beta.22179.2</SystemIOPackagingTestDataVersion>
135-
<SystemNetTestDataVersion>7.0.0-beta.22179.2</SystemNetTestDataVersion>
135+
<SystemNetTestDataVersion>7.0.0-beta.22213.1</SystemNetTestDataVersion>
136136
<SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22179.2</SystemPrivateRuntimeUnicodeDataVersion>
137137
<SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22179.2</SystemRuntimeTimeZoneDataVersion>
138138
<SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22179.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>

src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs

-7
Original file line numberDiff line numberDiff line change
@@ -492,17 +492,10 @@ await TestConfiguration.WhenAllOrAnyFailedWithTimeout(
492492
}
493493

494494
[ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.SupportsTls13))]
495-
[ActiveIssue("https://github.com/dotnet/runtime/issues/58927", TestPlatforms.Windows)]
496495
[InlineData(true)]
497496
[InlineData(false)]
498497
public async Task SslStream_NegotiateClientCertificateAsyncTls13_Succeeds(bool sendClientCertificate)
499498
{
500-
if (PlatformDetection.IsWindows10Version22000OrGreater)
501-
{
502-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
503-
throw new SkipTestException("Unstable on Windows 11");
504-
}
505-
506499
bool negotiateClientCertificateCalled = false;
507500
using CancellationTokenSource cts = new CancellationTokenSource();
508501
cts.CancelAfter(TestConfiguration.PassingTestTimeout);

src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs

-6
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@ public static IEnumerable<object[]> SslStream_StreamToStream_Authentication_Succ
7272
[SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "X509 certificate store is not supported on iOS or tvOS.")]
7373
public async Task SslStream_StreamToStream_Authentication_Success(X509Certificate serverCert = null, X509Certificate clientCert = null)
7474
{
75-
if (PlatformDetection.IsWindows10Version20348OrGreater)
76-
{
77-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
78-
throw new SkipTestException("Unstable on Windows 11");
79-
}
80-
8175
(Stream stream1, Stream stream2) = TestHelper.GetConnectedStreams();
8276
using (var client = new SslStream(stream1, false, AllowAnyServerCertificate))
8377
using (var server = new SslStream(stream2, false, delegate { return true; }))

src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs

-6
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ public static IEnumerable<object[]> OneOrBothUseDefaulData()
7878
[MemberData(nameof(OneOrBothUseDefaulData))]
7979
public async Task ClientAndServer_OneOrBothUseDefault_Ok(SslProtocols? clientProtocols, SslProtocols? serverProtocols)
8080
{
81-
if (PlatformDetection.IsWindows10Version20348OrGreater)
82-
{
83-
// [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
84-
throw new SkipTestException("Unstable on Windows 11");
85-
}
86-
8781
using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate())
8882
using (X509Certificate2 clientCertificate = Configuration.Certificates.GetClientCertificate())
8983
{

0 commit comments

Comments
 (0)