Skip to content

Intermediate Certificate Validation Windows 2012+ fix #277

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
JoeShook merged 2 commits into from
Aug 1, 2017
Merged

Intermediate Certificate Validation Windows 2012+ fix #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64dd9f3
Fix for a problem with validating certificates in which the intermedi…
Jul 19, 2017
53b2969
Updated unit test to validate trust for intermediate anchor
Jul 31, 2017
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: 3 additions & 1 deletion csharp/agent/Certificates/TrustChainValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,12 @@ public bool IsTrustedCertificate(X509Certificate2 certificate, X509Certificate2C
return false;
}

// X509ChainEngine, which is used for CRL validation, requires Windows 2012 to run due to required changes in the CERT_CHAIN_ENGINE_CONFIG structure.
// For more information on version numbers, see https://msdn.microsoft.com/en-us/library/windows/desktop/ms724832.aspx
private static bool IsNewerThanWin2008R2()
{
return Environment.OSVersion.Version.Major > 6 ||
(Environment.OSVersion.Version.Major >= 6 && Environment.OSVersion.Version.Minor > 2);
(Environment.OSVersion.Version.Major >= 6 && Environment.OSVersion.Version.Minor >= 2);
}

private bool ChainElementHasProblems(X509ChainElement chainElement)
Expand Down
3 changes: 2 additions & 1 deletion csharp/agent/Certificates/X509ChainEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public unsafe X509ChainEngine(IEnumerable<X509Certificate2> trustedRoots)
cbSize = (uint)sizeof(NativeMethods.CERT_CHAIN_ENGINE_CONFIG),
dwFlags = NativeMethods.CERT_CHAIN_ENABLE_CACHE_AUTO_UPDATE | NativeMethods.CERT_CHAIN_ENABLE_SHARE_STORE,
// Need to retrieve underlying IntPtr. The struct cannot contain a Safehandle field as we need to be able to use sizeof()
hExclusiveRoot = this.safeCertStoreHandle.DangerousGetHandle()
hExclusiveRoot = this.safeCertStoreHandle.DangerousGetHandle(),
dwExclusiveFlags = NativeMethods.CERT_CHAIN_EXCLUSIVE_ENABLE_CA_FLAG
};

if (!NativeMethods.CertCreateCertificateChainEngine(new IntPtr(&certChainEngineConfig), out this.safeChainEngineHandle))
Expand Down
17 changes: 15 additions & 2 deletions csharp/unittests/agent/TrustChainTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,22 @@ public TrustChainTests()

[Fact]
public void TestValidTrustChain()
{
this.ValidateCertChainWithAnchor(m_trustedAnchors);
}


[Fact]
public void TestValidTrustedChainIntermediateAnchor()
{
var trustedIntermediate = m_resolver.GetCertificatesForDomain("inter1.xyz");
this.ValidateCertChainWithAnchor(trustedIntermediate);
}

private void ValidateCertChainWithAnchor(X509Certificate2Collection trustedIntermediate)
{
Assert.True(!m_endCerts.IsNullOrEmpty());
Assert.True(!m_trustedAnchors.IsNullOrEmpty());
Assert.True(!trustedIntermediate.IsNullOrEmpty());

//
// Ok, verify certs..
Expand All @@ -55,7 +68,7 @@ public void TestValidTrustChain()
{
X509Certificate2Collection issuers = m_validator.ResolveIntermediateIssuers(cert);
Assert.True(!issuers.IsNullOrEmpty() && issuers.Count == 3);
Assert.True(m_validator.IsTrustedCertificate(cert, m_trustedAnchors));
Assert.True(m_validator.IsTrustedCertificate(cert, trustedIntermediate));
}
}

Expand Down