stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8081744: Clear out list corner case

Browse Source 
Reviewed-by: mullan, rhalade
This commit is contained in:
Jason Uh 2015-06-30 14:22:31 -07:00
parent 6279b4ab74
commit 22b80848d1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/java.base/share/classes/sun/security/provider/certpath/RevocationChecker.java
View File

@ -1068,20 +1068,17 @@ class RevocationChecker extends PKIXRevocationChecker {
boolean signFlag = true; boolean signFlag = true;
List<? extends Certificate> cpList = List<? extends Certificate> cpList =
cpbr.getCertPath().getCertificates(); cpbr.getCertPath().getCertificates();
if (cpList.isEmpty()) {
return;
}
try { try {
for (int i = cpList.size()-1; i >= 0; i-- ) { for (int i = cpList.size() - 1; i >= 0; i--) {
X509Certificate cert = (X509Certificate)cpList.get(i); X509Certificate cert = (X509Certificate) cpList.get(i);
if (debug != null) { if (debug != null) {
debug.println("RevocationChecker.buildToNewKey()" debug.println("RevocationChecker.buildToNewKey()"
+ " index " + i + " checking " + " index " + i + " checking "
+ cert); + cert);
} }
checkCRLs(cert, prevKey2, null, signFlag, true, checkCRLs(cert, prevKey2, null, signFlag, true,
stackedCerts, newAnchors); stackedCerts, newAnchors);
signFlag = certCanSignCrl(cert); signFlag = certCanSignCrl(cert);
prevKey2 = cert.getPublicKey(); prevKey2 = cert.getPublicKey();
} }
@ -1100,8 +1097,10 @@ class RevocationChecker extends PKIXRevocationChecker {
// If it doesn't check out, try to find a different key. // If it doesn't check out, try to find a different key.
// And if we can't find a key, then return false. // And if we can't find a key, then return false.
PublicKey newKey = cpbr.getPublicKey(); PublicKey newKey = cpbr.getPublicKey();
X509Certificate newCert = cpList.isEmpty() ?
null : (X509Certificate) cpList.get(0);
try { try {
checkCRLs(currCert, newKey, (X509Certificate) cpList.get(0), checkCRLs(currCert, newKey, newCert,
true, false, null, params.trustAnchors()); true, false, null, params.trustAnchors());
// If that passed, the cert is OK! // If that passed, the cert is OK!
return; return;