diff options
| author | Kenny Root <kroot@google.com> | 2015-06-01 20:12:51 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-06-01 20:12:51 +0000 |
| commit | 565eb1c386b12c83b5aa7f42bb9099062af17782 (patch) | |
| tree | e9040b649495bd6a82e57f4a00d335ede9962a33 | |
| parent | f2ca73c07d072282905ed43d2b866278caabe12f (diff) | |
| download | android_external_bouncycastle-565eb1c386b12c83b5aa7f42bb9099062af17782.tar.gz android_external_bouncycastle-565eb1c386b12c83b5aa7f42bb9099062af17782.tar.bz2 android_external_bouncycastle-565eb1c386b12c83b5aa7f42bb9099062af17782.zip | |
Revert "Register DSAwithSHA1 OID for KeyFactory"
This reverts commit f2ca73c07d072282905ed43d2b866278caabe12f.
Change-Id: If6c261b71521f79582ca0a742a1aa02be31c70fe
| -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, 1 insertions, 17 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 c7e2aa9..5e940ec 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,9 +23,6 @@ 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 286bf67..b8e7783 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 20:03:02.000000000 +0000 +--- bcprov-jdk15on-152.orig/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java 2015-03-01 12: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,19 +1994,6 @@ 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 |