diff options
| author | Kenny Root <kroot@google.com> | 2013-02-20 16:01:31 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-02-20 16:05:35 -0800 |
| commit | 200c44f2dde27abe81d5125f893e6b6ed9b69674 (patch) | |
| tree | 99954516e2535dfb5b522ef9f525cc5ef4d2feb3 /bcprov | |
| parent | 0caeb7ed943911549bb6fdcc59a99d2c23b3e5de (diff) | |
| download | android_external_bouncycastle-200c44f2dde27abe81d5125f893e6b6ed9b69674.tar.gz android_external_bouncycastle-200c44f2dde27abe81d5125f893e6b6ed9b69674.tar.bz2 android_external_bouncycastle-200c44f2dde27abe81d5125f893e6b6ed9b69674.zip | |
Fix CertPath APIs
There was a missing getCertPathEncodings() implementation and the "PEM"
encoding wasn't fully removed.
Change-Id: I514910eec34ad39e0a2d56677ffdd400b38c6bc9
Diffstat (limited to 'bcprov')
2 files changed, 6 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java index 2ed6ca6..5b79864 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java @@ -334,7 +334,9 @@ public class CertificateFactory public Iterator engineGetCertPathEncodings() { - return null; // TODO: PKIXCertPath.certPathEncodings.iterator(); + // BEGIN android-changed + return PKIXCertPath.certPathEncodings.iterator(); + // END android-changed } public CertPath engineGenerateCertPath( diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java index e13412d..9b14731 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java @@ -53,7 +53,9 @@ public class PKIXCertPath { List encodings = new ArrayList(); encodings.add("PkiPath"); - encodings.add("PEM"); + // BEGIN android-removed + // encodings.add("PEM"); + // END android-removed encodings.add("PKCS7"); certPathEncodings = Collections.unmodifiableList(encodings); } |