Skip to content

Fix tests on macOS 26 beta 6 #118652

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
merged 5 commits into from
Aug 14, 2025
Merged

Fix tests on macOS 26 beta 6 #118652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2494977
Fix test on macOS 26
vcsjones Aug 12, 2025
08e78f2
Don't assert the chain depth
vcsjones Aug 12, 2025
3c22afd
Fix other test
vcsjones Aug 12, 2025
c2e4b78
Let linux have no concept of a blocked key list
vcsjones Aug 13, 2025
7e88ebf
Merge branch 'main' into fix-tests-apple-26
vcsjones Aug 13, 2025
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
1 change: 1 addition & 0 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public static partial class PlatformDetection
public static bool IsNotMacOsAppleSilicon => !IsMacOsAppleSilicon;
public static bool IsAppSandbox => Environment.GetEnvironmentVariable("APP_SANDBOX_CONTAINER_ID") != null;
public static bool IsNotAppSandbox => !IsAppSandbox;
public static bool IsApplePlatform26OrLater => IsApplePlatform && Environment.OSVersion.Version.Major >= 26;

public static Version OpenSslVersion => !IsApplePlatform && !IsWindows && !IsAndroid ?
GetOpenSslVersion() :
Expand Down
14 changes: 7 additions & 7 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 @@ -288,13 +288,13 @@ public static void SystemTrustCertificateWithCustomRootTrust(bool addCertificate

// Check some known conditions.

if (PlatformDetection.UsesAppleCrypto)
if (OperatingSystem.IsLinux() || PlatformDetection.IsApplePlatform26OrLater)
{
Assert.Equal(3, chain.ChainElements.Count);
Assert.Equal(2, chain.ChainElements.Count);
}
else if (OperatingSystem.IsLinux())
else if (PlatformDetection.IsApplePlatform)
{
Assert.Equal(2, chain.ChainElements.Count);
Assert.Equal(3, chain.ChainElements.Count);
}
}
}
Expand Down Expand Up @@ -1112,7 +1112,6 @@ public static void BuildChainForFraudulentCertificate()
}

[Fact]
[SkipOnPlatform(TestPlatforms.Linux, "Not supported on Linux.")]
public static void BuildChainForCertificateSignedWithDisallowedKey()
{
// The intermediate certificate is from the now defunct CA DigiNotar.
Expand Down Expand Up @@ -1178,12 +1177,13 @@ public static void BuildChainForCertificateSignedWithDisallowedKey()
chain.ChainPolicy.ExtraStore.Add(intermediateCert);
Assert.False(chain.Build(cert));

if (PlatformDetection.IsAndroid)
if (PlatformDetection.IsAndroid || PlatformDetection.IsApplePlatform26OrLater || PlatformDetection.IsLinux)
{
// Android always validates trust as part of building a path,
// so violations comes back as PartialChain with no elements
// Apple 26 no longer block these SKIs since the roots are no longer trusted at all and are expired.
// Linux has no concept of a blocked key list, they just remove certificates from a trust store.
Assert.Equal(X509ChainStatusFlags.PartialChain, chain.AllStatusFlags());
Assert.Equal(0, chain.ChainElements.Count);
}
else
{
Expand Down
Loading