Skip to content

[ci-fix] Needs review: Fix Android X509 DynamicChainTests name-constraint expectations (refs #128890) #129651

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

Draft
github-actions wants to merge 3 commits into
base: main
Choose a base branch
from
+23 −7
Draft

[ci-fix] Needs review: Fix Android X509 DynamicChainTests name-constraint expectations (refs #128890) #129651

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebe60ab
Fix Android X509 DynamicChainTests name constraint expectations (refs…
github-actions[bot] Jun 20, 2026
0393b08
ci: trigger checks
github-actions[bot] Jun 20, 2026
f5141b6
Refactor Android name constraint helper expectations
Copilot Jul 14, 2026
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
30 changes: 23 additions & 7 deletions src/libraries/System.Security.Cryptography/tests/X509Certificates/DynamicChainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,6 @@ public static void CustomTrustModeWithNoCustomTrustCerts()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/128890", TestPlatforms.Android)]
public static void NameConstraintViolation_PermittedTree_Dns()
{
SubjectAlternativeNameBuilder builder = new SubjectAlternativeNameBuilder();
Expand All @@ -543,7 +542,6 @@ public static void NameConstraintViolation_PermittedTree_Dns()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/128890", TestPlatforms.Android)]
public static void NameConstraintViolation_ExcludedTree_Dns()
{
SubjectAlternativeNameBuilder builder = new SubjectAlternativeNameBuilder();
Expand Down Expand Up @@ -600,7 +598,6 @@ public static void NameConstraintViolation_InvalidGeneralNames()
}

[ConditionalFact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/128890", TestPlatforms.Android)]
public static void NameConstraintViolation_ExcludedTree_Upn()
{
if (PlatformDetection.UsesAppleCrypto && !AppleHasExcludedSubTreeHandling)
Expand Down Expand Up @@ -638,6 +635,13 @@ public static void NameConstraintViolation_ExcludedTree_Upn()
string encoded = writer.Encode(Convert.ToHexString);

TestNameConstrainedChain(encoded, builder, (bool result, X509Chain chain) => {
if (PlatformDetection.IsAndroid)
{
// Android does not enforce UPN (OtherName) name constraints.
Assert.True(result, "chain.Build");
return;
}

Assert.False(result, "chain.Build");

if (PlatformDetection.IsWindows)
Expand All @@ -654,7 +658,6 @@ public static void NameConstraintViolation_ExcludedTree_Upn()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/128890", TestPlatforms.Android)]
public static void NameConstraintViolation_PermittedTree_Upn()
{
SubjectAlternativeNameBuilder builder = new SubjectAlternativeNameBuilder();
Expand Down Expand Up @@ -687,6 +690,13 @@ public static void NameConstraintViolation_PermittedTree_Upn()
string encoded = writer.Encode(Convert.ToHexString);

TestNameConstrainedChain(encoded, builder, (bool result, X509Chain chain) => {
if (PlatformDetection.IsAndroid)
{
// Android does not enforce UPN (OtherName) name constraints.
Assert.True(result, "chain.Build");
return;
}

Assert.False(result, "chain.Build");

if (PlatformDetection.IsWindows)
Expand Down Expand Up @@ -1171,9 +1181,15 @@ private static X509ChainStatusFlags PlatformNameConstraints(X509ChainStatusFlags
}
else if (OperatingSystem.IsAndroid())
{
// Android always validates name constraints as part of building a path
// so violations comes back as PartialChain with no elements.
flags = X509ChainStatusFlags.PartialChain;
// Android always validates name constraints as part of building a path,
// but reports DNS violations as InvalidNameConstraints and other unsupported
// forms as PartialChain with no elements.
flags = flags switch
{
X509ChainStatusFlags.HasExcludedNameConstraint or X509ChainStatusFlags.HasNotPermittedNameConstraint =>
X509ChainStatusFlags.InvalidNameConstraints,
_ => X509ChainStatusFlags.PartialChain,
};
}

return flags;
Expand Down
Loading