diff options
author | Kenny Root <kroot@android.com> | 2014-10-17 22:52:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 22:52:20 +0000 |
commit | 4b898d5f5daafae7f3eae2951da07a9c1c608887 (patch) | |
tree | 6c876ccbb5560aa6f9b7d42eeae00495568e5bc4 /bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java | |
parent | b000361bb7f237a66450ed7eef49a2e8727b058e (diff) | |
parent | 0ced44f2869c61a7f2ba20c115416582b2740be5 (diff) | |
download | android_external_bouncycastle-4b898d5f5daafae7f3eae2951da07a9c1c608887.tar.gz android_external_bouncycastle-4b898d5f5daafae7f3eae2951da07a9c1c608887.tar.bz2 android_external_bouncycastle-4b898d5f5daafae7f3eae2951da07a9c1c608887.zip |
am 0ced44f2: Merge "Revert "Put the CertBlacklist in a NoPreloadHolder""
* commit '0ced44f2869c61a7f2ba20c115416582b2740be5':
Revert "Put the CertBlacklist in a NoPreloadHolder"
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java')
-rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java index 19dc768..8ed42a1 100644 --- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java +++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java @@ -37,9 +37,7 @@ public class PKIXCertPathValidatorSpi extends CertPathValidatorSpi { // BEGIN android-added - private static class NoPreloadHolder { - private final static CertBlacklist blacklist = new CertBlacklist(); - } + private final static CertBlacklist blacklist = new CertBlacklist(); // END android-added public CertPathValidatorResult engineValidate( @@ -89,7 +87,7 @@ public class PKIXCertPathValidatorSpi if (cert != null) { BigInteger serial = cert.getSerialNumber(); - if (NoPreloadHolder.blacklist.isSerialNumberBlackListed(serial)) { + if (blacklist.isSerialNumberBlackListed(serial)) { // emulate CRL exception message in RFC3280CertPathUtilities.checkCRLs String message = "Certificate revocation of serial 0x" + serial.toString(16); System.out.println(message); @@ -276,7 +274,7 @@ public class PKIXCertPathValidatorSpi for (index = certs.size() - 1; index >= 0; index--) { // BEGIN android-added - if (NoPreloadHolder.blacklist.isPublicKeyBlackListed(workingPublicKey)) { + if (blacklist.isPublicKeyBlackListed(workingPublicKey)) { // emulate CRL exception message in RFC3280CertPathUtilities.checkCRLs String message = "Certificate revocation of public key " + workingPublicKey; System.out.println(message); |