diff options
| author | Kenny Root <kroot@google.com> | 2015-06-01 12:10:55 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-06-01 20:01:06 +0000 |
| commit | f2ca73c07d072282905ed43d2b866278caabe12f (patch) | |
| tree | cd6b947d57f1974e052d5d78ad1744b1d4838289 | |
| parent | c51d6837f84377c47bc0f43d58c80f09f460e194 (diff) | |
| download | android_external_bouncycastle-f2ca73c07d072282905ed43d2b866278caabe12f.tar.gz android_external_bouncycastle-f2ca73c07d072282905ed43d2b866278caabe12f.tar.bz2 android_external_bouncycastle-f2ca73c07d072282905ed43d2b866278caabe12f.zip | |
Register DSAwithSHA1 OID for KeyFactory
X.509 certificates made with DSA signatures have the X9 DSA with SHA1
OID typically, so we need Bouncycastle to register this OID as an alias
for the DSA KeyFactory.
(cherry picked from commit 36995a1668ccfc521253ffae6f705d0af028ca3e)
Bug: 21209493
Change-Id: I1c2fe6d7f638974ab54589bf757e66ff452ad395
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java | 3 | ||||
| -rw-r--r-- | patches/bcprov.patch | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java index 5e940ec..c7e2aa9 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java @@ -23,6 +23,9 @@ public class DSAUtil public static final ASN1ObjectIdentifier[] dsaOids = { X9ObjectIdentifiers.id_dsa, + // BEGIN android-added + X9ObjectIdentifiers.id_dsa_with_sha1, + // END android-added OIWObjectIdentifiers.dsaWithSHA1 }; diff --git a/patches/bcprov.patch b/patches/bcprov.patch index b8e7783..286bf67 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -1799,7 +1799,7 @@ diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/X // // certificate factories. diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java bcprov-jdk15on-152/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java ---- bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java 2015-03-01 12:03:02.000000000 +0000 +--- bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java 2015-03-01 20:03:02.000000000 +0000 +++ bcprov-jdk15on-152/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java 2013-12-12 00:35:05.000000000 +0000 @@ -23,13 +23,20 @@ import org.bouncycastle.crypto.DSA; @@ -1994,6 +1994,19 @@ diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/d static public class noneDSA extends DSASigner +diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java bcprov-jdk15on-152/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java +--- bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java 2015-03-01 20:03:02.000000000 +0000 ++++ bcprov-jdk15on-152/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java 2015-06-01 19:10:55.000000000 +0000 +@@ -23,6 +23,9 @@ + public static final ASN1ObjectIdentifier[] dsaOids = + { + X9ObjectIdentifiers.id_dsa, ++ // BEGIN android-added ++ X9ObjectIdentifiers.id_dsa_with_sha1, ++ // END android-added + OIWObjectIdentifiers.dsaWithSHA1 + }; + diff -Naur bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java bcprov-jdk15on-152/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java --- bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java 2015-03-01 12:03:02.000000000 +0000 +++ bcprov-jdk15on-152/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java 2014-07-28 19:51:54.000000000 +0000 |