Skip to content

re-enable TLS 13 tests on Windows #68009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wfurt merged 1 commit into from
Apr 15, 2022
Merged

re-enable TLS 13 tests on Windows #68009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamNetworkStreamTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,17 +492,10 @@ await TestConfiguration.WhenAllOrAnyFailedWithTimeout(
}

[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);
Expand Down
6 changes: 0 additions & 6 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }))
Expand Down
6 changes: 0 additions & 6 deletions src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamSystemDefaultsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
{
Expand Down