archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8200566: DistributionPointFetcher fails to fetch CRLs if the DistributionPoints field contains more than one DistributionPoint and the first one fails

Browse source 
Reviewed-by: weijun
This commit is contained in:
Sean Mullan 2024-04-08 20:08:56 +00:00
parent 7e5ef79f95
commit e702646545
2 changed files with 256 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/java.base/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -101,16 +101,28 @@ public class DistributionPointFetcher {
}
return Collections.emptySet();
}
List<DistributionPoint> points =
ext.getDistributionPoints();
List<DistributionPoint> points = ext.getDistributionPoints();
Set<X509CRL> results = new HashSet<>();
CertStoreException savedCSE = null;
for (Iterator<DistributionPoint> t = points.iterator();
t.hasNext() && !Arrays.equals(reasonsMask, ALL_REASONS); ) {
DistributionPoint point = t.next();
Collection<X509CRL> crls = getCRLs(selector, certImpl,
point, reasonsMask, signFlag, prevKey, prevCert, provider,
certStores, trustAnchors, validity, variant, anchor);
results.addAll(crls);
try {
DistributionPoint point = t.next();
Collection<X509CRL> crls = getCRLs(selector, certImpl,
point, reasonsMask, signFlag, prevKey, prevCert, provider,
certStores, trustAnchors, validity, variant, anchor);
results.addAll(crls);
} catch (CertStoreException cse) {
if (savedCSE == null) {
savedCSE = cse;
} else {
savedCSE.addSuppressed(cse);
}
}
}
// only throw CertStoreException if no CRLs are retrieved
if (results.isEmpty() && savedCSE != null) {
throw savedCSE;
}
if (debug != null) {
debug.println("Returning " + results.size() + " CRLs");
@ -182,7 +194,11 @@ public class DistributionPointFetcher {
}
}
} catch (CertStoreException cse) {
savedCSE = cse;
if (savedCSE == null) {
savedCSE = cse;
} else {
savedCSE.addSuppressed(cse);
}
}
}
// only throw CertStoreException if no CRLs are retrieved