enable TLS 13 tests on Windows (#68009)

dotnet · Apr 15, 2022 · cd3328d · cd3328d
1 parent 68dc27a
commit cd3328d
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 22 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -146,9 +146,9 @@
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
       <Sha>971b917c6c2061ea6a747f0345ac86882c02c466</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="7.0.0-beta.22179.2">
+    <Dependency Name="System.Net.TestData" Version="7.0.0-beta.22213.1">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>971b917c6c2061ea6a747f0345ac86882c02c466</Sha>
+      <Sha>2e12dc95e1c286961eaea774cf26c1f29098fb43</Sha>
     </Dependency>
     <Dependency Name="System.Private.Runtime.UnicodeData" Version="7.0.0-beta.22179.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -132,7 +132,7 @@
     <SystemDrawingCommonTestDataVersion>7.0.0-beta.22179.2</SystemDrawingCommonTestDataVersion>
     <SystemIOCompressionTestDataVersion>7.0.0-beta.22179.2</SystemIOCompressionTestDataVersion>
     <SystemIOPackagingTestDataVersion>7.0.0-beta.22179.2</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>7.0.0-beta.22179.2</SystemNetTestDataVersion>
+    <SystemNetTestDataVersion>7.0.0-beta.22213.1</SystemNetTestDataVersion>
     <SystemPrivateRuntimeUnicodeDataVersion>7.0.0-beta.22179.2</SystemPrivateRuntimeUnicodeDataVersion>
     <SystemRuntimeTimeZoneDataVersion>7.0.0-beta.22179.2</SystemRuntimeTimeZoneDataVersion>
     <SystemSecurityCryptographyX509CertificatesTestDataVersion>7.0.0-beta.22179.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>

diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
@@ -492,17 +492,10 @@ public async Task SslStream_NegotiateClientCertificateAsync_PendingDecryptedData
         }
 
         [ConditionalTheory(typeof(PlatformDetection), nameof(PlatformDetection.SupportsTls13))]
-        [ActiveIssue("https://github.com/dotnet/runtime/issues/58927", TestPlatforms.Windows)]
         [InlineData(true)]
         [InlineData(false)]
         public async Task SslStream_NegotiateClientCertificateAsyncTls13_Succeeds(bool sendClientCertificate)
         {
-            if (PlatformDetection.IsWindows10Version22000OrGreater)
-            {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
-                throw new SkipTestException("Unstable on Windows 11");
-            }
-
             bool negotiateClientCertificateCalled = false;
             using CancellationTokenSource cts = new CancellationTokenSource();
             cts.CancelAfter(TestConfiguration.PassingTestTimeout);

diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
@@ -72,12 +72,6 @@ public static IEnumerable<object[]> SslStream_StreamToStream_Authentication_Succ
         [SkipOnPlatform(TestPlatforms.iOS | TestPlatforms.tvOS, "X509 certificate store is not supported on iOS or tvOS.")]
         public async Task SslStream_StreamToStream_Authentication_Success(X509Certificate serverCert = null, X509Certificate clientCert = null)
         {
-            if (PlatformDetection.IsWindows10Version20348OrGreater)
-            {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
-                throw new SkipTestException("Unstable on Windows 11");
-            }
-
             (Stream stream1, Stream stream2) = TestHelper.GetConnectedStreams();
             using (var client = new SslStream(stream1, false, AllowAnyServerCertificate))
             using (var server = new SslStream(stream2, false, delegate { return true; }))

diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs
@@ -78,12 +78,6 @@ public static IEnumerable<object[]> OneOrBothUseDefaulData()
         [MemberData(nameof(OneOrBothUseDefaulData))]
         public async Task ClientAndServer_OneOrBothUseDefault_Ok(SslProtocols? clientProtocols, SslProtocols? serverProtocols)
         {
-            if (PlatformDetection.IsWindows10Version20348OrGreater)
-            {
-                // [ActiveIssue("https://github.com/dotnet/runtime/issues/58927")]
-                throw new SkipTestException("Unstable on Windows 11");
-            }
-
             using (X509Certificate2 serverCertificate = Configuration.Certificates.GetServerCertificate())
             using (X509Certificate2 clientCertificate = Configuration.Certificates.GetClientCertificate())
             {