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 /patches | |
| 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 'patches')
| -rw-r--r-- | patches/bcprov.patch | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 934ed83..628b381 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -3049,9 +3049,23 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/u }; +diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java +--- bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java 2013-02-10 00:37:58.000000000 +0000 ++++ bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/x509/CertificateFactory.java 2013-02-21 00:01:31.000000000 +0000 +@@ -334,7 +334,9 @@ + + public Iterator engineGetCertPathEncodings() + { +- return null; // TODO: PKIXCertPath.certPathEncodings.iterator(); ++ // BEGIN android-changed ++ return PKIXCertPath.certPathEncodings.iterator(); ++ // END android-changed + } + + public CertPath engineGenerateCertPath( diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java --- bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java 2013-02-10 00:37:58.000000000 +0000 -+++ bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java 2012-09-17 23:04:47.000000000 +0000 ++++ bcprov-jdk15on-148/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java 2013-02-21 00:01:31.000000000 +0000 @@ -36,7 +36,9 @@ import org.bouncycastle.asn1.pkcs.SignedData; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -3063,7 +3077,18 @@ diff -Naur bcprov-jdk15on-148.orig/org/bouncycastle/jcajce/provider/asymmetric/x /** * CertPath implementation for X.509 certificates. -@@ -298,27 +300,29 @@ +@@ -51,7 +53,9 @@ + { + 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); + } +@@ -298,27 +302,29 @@ return toDEREncoded(new ContentInfo( PKCSObjectIdentifiers.signedData, sd)); } |