Skip to content
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

Jump to bottom

[Android] Resolve Android-specific active issues in System.Net.Security and System.Security.Cryptography #104352

Merged
merged 16 commits into from
Jul 19, 2024
Merged

[Android] Resolve Android-specific active issues in System.Net.Security and System.Security.Cryptography #104352

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
050598d
Enable ServerAsyncAuthenticate_MismatchProtocols_Fails
simonrozsival Jun 27, 2024
fd813a9
Enable subset of CertificateSelectionCallback_DelayedCertificate_OK
simonrozsival Jun 27, 2024
4d66b6e
Enable SslStream_StreamToStream_Alpn_NonMatchingProtocols_Fail and do…
simonrozsival Jun 27, 2024
5ce38e3
Enable ConnectWithRevocation_WithCallback and pass full chain to Serv…
simonrozsival Jun 27, 2024
40924b2
Enable or permanently disable tests in SslStreamNetworkStreamTest
simonrozsival Jun 27, 2024
650c5a7
Adjust host name data for Android in SslStreamSniTest
simonrozsival Jun 27, 2024
a17bdec
Fix expected outcome of TransportContext_ConnectToServerWithSsl_GetEx…
simonrozsival Jun 27, 2024
de390eb
Fix ChainTests active issue on Android
simonrozsival Jul 3, 2024
a355377
Fix failing test
simonrozsival Jul 3, 2024
1be0a16
TMP: Print full exception stacktrace
simonrozsival Jul 4, 2024
2a94f97
Adjust expected exception for server authentication protocol mismatch
simonrozsival Jul 4, 2024
0628fca
Revert "TMP: Print full exception stacktrace"
simonrozsival Jul 4, 2024
adc82c0
Adjust the expected exceptions for arm and x86/x64
simonrozsival Jul 4, 2024
3feb4cc
Fix assert
simonrozsival Jul 8, 2024
522d1c8
Merge branch 'main' into resolve-android-net-security-active-issues
simonrozsival Jul 19, 2024
6ccc908
Address review comments
simonrozsival Jul 19, 2024
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
Prev Previous commit
Next Next commit
Fix ChainTests active issue on Android
  • Loading branch information
@simonrozsival
simonrozsival committed Jul 3, 2024
commit de390eb780c2dceb8e3a9ad3287da563b5123471
21 changes: 18 additions & 3 deletions src/libraries/System.Security.Cryptography/tests/X509Certificates/ChainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1270,7 +1270,6 @@ public static void BuildChainForSelfSignedSha3Certificate()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/100224", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroid), nameof(PlatformDetection.IsArmOrArm64Process))]
public static void BuildChainForSelfSignedCertificate_WithSha256RsaSignature()
{
using (ChainHolder chainHolder = new ChainHolder())
Expand All @@ -1284,12 +1283,22 @@ public static void BuildChainForSelfSignedCertificate_WithSha256RsaSignature()
// minimum be marked UntrustedRoot.

Assert.False(chain.Build(cert));
AssertExtensions.HasFlag(X509ChainStatusFlags.UntrustedRoot, chain.AllStatusFlags());

if (PlatformDetection.IsAndroid)
{
// Android always validates trust as part of building a path,
// so violations comes back as PartialChain with no elements
Assert.Equal(X509ChainStatusFlags.PartialChain, chain.AllStatusFlags());
Assert.Equal(0, chain.ChainElements.Count);
}
else
{
AssertExtensions.HasFlag(X509ChainStatusFlags.UntrustedRoot, chain.AllStatusFlags());
}
}
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/100224", typeof(PlatformDetection), nameof(PlatformDetection.IsAndroid), nameof(PlatformDetection.IsArmOrArm64Process))]
public static void BuildChainForSelfSignedCertificate_WithUnknownOidSignature()
{
using (ChainHolder chainHolder = new ChainHolder())
Expand All @@ -1311,6 +1320,12 @@ public static void BuildChainForSelfSignedCertificate_WithUnknownOidSignature()
Assert.False(chain.Build(cert));
AssertExtensions.HasFlag(X509ChainStatusFlags.PartialChain, chain.AllStatusFlags());
}
else if (PlatformDetection.IsAndroid)
{
Assert.False(chain.Build(cert));
AssertExtensions.HasFlag(X509ChainStatusFlags.PartialChain, chain.AllStatusFlags());
Assert.Equal(0, chain.ChainElements.Count);
}
else if (PlatformDetection.IsOpenSslSupported)
{
Assert.False(chain.Build(cert));
Expand Down
Loading