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

[release/6.0] OpenSslX509ChainProcessor: ignore NotSignatureValid on last element. #70343

Merged
merged 1 commit into from
Jun 9, 2022
Merged

[release/6.0] OpenSslX509ChainProcessor: ignore NotSignatureValid on last element. #70343

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
56 changes: 51 additions & 5 deletions ...tography.X509Certificates/src/Internal/Cryptography/Pal.Unix/OpenSslX509ChainProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ private X509ChainElement[] BuildChainElements(

List<X509ChainStatus>? statusBuilder = null;

bool overallHasNotSignatureValid = false;
using (SafeX509StackHandle chainStack = Interop.Crypto.X509StoreCtxGetChain(_storeCtx))
{
int chainSize = Interop.Crypto.GetX509StackFieldCount(chainStack);
Expand All @@ -839,7 +840,20 @@ private X509ChainElement[] BuildChainElements(
statusBuilder ??= new List<X509ChainStatus>();
overallStatus ??= new List<X509ChainStatus>();

AddElementStatus(elementErrors.Value, statusBuilder, overallStatus);
bool hadSignatureNotValid = overallHasNotSignatureValid;
AddElementStatus(elementErrors.Value, statusBuilder, overallStatus, ref overallHasNotSignatureValid);

// Clear NotSignatureValid for the last element when overall chain is not PartialChain or UntrustedRoot.
bool isLastElement = i == chainSize - 1;
if (isLastElement && !hadSignatureNotValid && overallHasNotSignatureValid)
{
if (!ContainsStatus(overallStatus, X509ChainStatusFlags.PartialChain) &&
!ContainsStatus(overallStatus, X509ChainStatusFlags.UntrustedRoot))
{
RemoveStatus(statusBuilder, X509ChainStatusFlags.NotSignatureValid);
RemoveStatus(overallStatus, X509ChainStatusFlags.NotSignatureValid);
}
}
status = statusBuilder.ToArray();
statusBuilder.Clear();
}
Expand Down Expand Up @@ -931,11 +945,12 @@ private static void ProcessPolicy(
private static void AddElementStatus(
ErrorCollection errorCodes,
List<X509ChainStatus> elementStatus,
List<X509ChainStatus> overallStatus)
List<X509ChainStatus> overallStatus,
ref bool overallHasNotSignatureValid)
{
foreach (var errorCode in errorCodes)
foreach (Interop.Crypto.X509VerifyStatusCode errorCode in errorCodes)
{
AddElementStatus(errorCode, elementStatus, overallStatus);
AddElementStatus(errorCode, elementStatus, overallStatus, ref overallHasNotSignatureValid);
}

foreach (X509ChainStatus element in elementStatus)
Expand All @@ -960,7 +975,8 @@ private static void AddElementStatus(
private static void AddElementStatus(
Interop.Crypto.X509VerifyStatusCode errorCode,
List<X509ChainStatus> elementStatus,
List<X509ChainStatus> overallStatus)
List<X509ChainStatus> overallStatus,
ref bool overallHasNotSignatureValid)
{
X509ChainStatusFlags statusFlag = MapVerifyErrorToChainStatus(errorCode);

Expand All @@ -987,6 +1003,36 @@ private static void AddElementStatus(

elementStatus.Add(chainStatus);
AddUniqueStatus(overallStatus, ref chainStatus);

if (statusFlag == X509ChainStatusFlags.NotSignatureValid)
{
overallHasNotSignatureValid = true;
}
}

private static bool ContainsStatus(List<X509ChainStatus> list, X509ChainStatusFlags statusCode)
{
for (int i = 0; i < list.Count; i++)
{
if (list[i].Status == statusCode)
{
return true;
}
}

return false;
}

private static void RemoveStatus(List<X509ChainStatus> list, X509ChainStatusFlags statusCode)
{
for (int i = 0; i < list.Count; i++)
{
if (list[i].Status == statusCode)
{
list.RemoveAt(i);
return;
}
}
}

private static void AddUniqueStatus(List<X509ChainStatus> list, ref X509ChainStatus status)
Expand Down
87 changes: 87 additions & 0 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/DynamicChainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Formats.Asn1;
using System.IO;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
Expand Down Expand Up @@ -832,6 +834,91 @@ public static void PolicyConstraints_Mapped()
}
}

public enum BuildChainWithNotSignatureValidTest : int
{
TrustedRoot,
UntrustedRoot,
PartialChain,
TrustedRootEndCertNotSignatureValid,
PartialChainEndCertNotSignatureValid
}

public static IEnumerable<object[]> BuildChainWithNotSignatureValidData()
{
yield return new object[] { true, X509ChainStatusFlags.NoError, BuildChainWithNotSignatureValidTest.TrustedRoot };
yield return new object[] { false, X509ChainStatusFlags.UntrustedRoot | X509ChainStatusFlags.NotSignatureValid, BuildChainWithNotSignatureValidTest.UntrustedRoot };
yield return new object[] { false, X509ChainStatusFlags.PartialChain, BuildChainWithNotSignatureValidTest.PartialChain };
yield return new object[] { false, X509ChainStatusFlags.NotSignatureValid, BuildChainWithNotSignatureValidTest.TrustedRootEndCertNotSignatureValid };
yield return new object[] { false, X509ChainStatusFlags.PartialChain | X509ChainStatusFlags.NotSignatureValid, BuildChainWithNotSignatureValidTest.PartialChainEndCertNotSignatureValid };
}

[Theory]
[MemberData(nameof(BuildChainWithNotSignatureValidData))]
[PlatformSpecific(TestPlatforms.Linux)] // NotSignatureValid gets ignored on the root certificate.
public static void BuildChainWithNotSignatureValid(
bool chainBuildsSuccessfully,
X509ChainStatusFlags chainFlags,
BuildChainWithNotSignatureValidTest test)
{
TestDataGenerator.MakeTestChain3(
out X509Certificate2 endCert,
out X509Certificate2 intermediateCert,
out X509Certificate2 rootCert,
testName: test.ToString());

X509Certificate2 tampered;
switch (test)
{
case BuildChainWithNotSignatureValidTest.TrustedRootEndCertNotSignatureValid:
case BuildChainWithNotSignatureValidTest.PartialChainEndCertNotSignatureValid:
tampered = TamperSignature(endCert);
endCert.Dispose();
endCert = tampered;
break;
default:
// Make root cert signature invalid.
tampered = TamperSignature(rootCert);
rootCert.Dispose();
rootCert = tampered;
break;
}

using (endCert)
using (intermediateCert)
using (rootCert)
using (ChainHolder chainHolder = new ChainHolder())
{
X509Chain chainTest = chainHolder.Chain;
chainTest.ChainPolicy.RevocationMode = X509RevocationMode.NoCheck;
chainTest.ChainPolicy.VerificationTime = endCert.NotBefore.AddSeconds(1);
chainTest.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust;

switch (test)
{
case BuildChainWithNotSignatureValidTest.TrustedRoot:
case BuildChainWithNotSignatureValidTest.TrustedRootEndCertNotSignatureValid:
chainTest.ChainPolicy.ExtraStore.Add(intermediateCert);
chainTest.ChainPolicy.CustomTrustStore.Add(rootCert);
break;
case BuildChainWithNotSignatureValidTest.PartialChain:
chainTest.ChainPolicy.CustomTrustStore.Add(rootCert);
break;
case BuildChainWithNotSignatureValidTest.PartialChainEndCertNotSignatureValid:
chainTest.ChainPolicy.ExtraStore.Add(intermediateCert);
break;
case BuildChainWithNotSignatureValidTest.UntrustedRoot:
chainTest.ChainPolicy.ExtraStore.Add(intermediateCert);
chainTest.ChainPolicy.ExtraStore.Add(rootCert);
break;
default:
throw new InvalidDataException();
}

Assert.Equal(chainBuildsSuccessfully, chainTest.Build(endCert));
Assert.Equal(chainFlags, chainTest.AllStatusFlags());
}
}

private static X509ChainStatusFlags PlatformBasicConstraints(X509ChainStatusFlags flags)
{
if (OperatingSystem.IsAndroid())
Expand Down