Skip to content

Fix trust anchor matching for cross-signed certificates #175

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

Open
BernhardK91 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix trust anchor matching for cross-signed certificates #175

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
8 changes: 6 additions & 2 deletions ...odeckb2b-certmanager/src/main/java/org/holodeckb2b/security/trust/DefaultCertManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,16 @@ public IValidationResult validateCertificate(List<X509Certificate> certs, IValid

log.trace("Calculate cert path to validate (i.e. find first trust anchor)");
// We only validate the given certificate path up to the first certificate that is listed as a trust anchor,
// so remove any certificate from the given path that is already in the set of trust anchors
// so remove any certificate from the given path that is already in the set of trust anchors.
// Match by subject + public key instead of exact certificate equality, so that cross-signed
// certificates (same key, different issuer/signature) are recognized as trust anchors.
List<X509Certificate> cpToCheck = new ArrayList<>();
boolean foundAnchor = false;
for(int i = 0; !foundAnchor && i < certs.size(); i++) {
X509Certificate c = certs.get(i);
if (!(foundAnchor = trustAnchors.parallelStream().anyMatch(a -> a.getTrustedCert().equals(c))))
if (!(foundAnchor = trustAnchors.parallelStream().anyMatch(a ->
a.getTrustedCert().getSubjectX500Principal().equals(c.getSubjectX500Principal()) &&
a.getTrustedCert().getPublicKey().equals(c.getPublicKey()))))
cpToCheck.add(c);
}

Expand Down