diff options
| author | Kenny Root <kroot@google.com> | 2015-06-01 12:10:55 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-06-01 16:37:24 -0700 |
| commit | 0d5d3541c94c2fc81d1668bb6b0f4e2d3a666746 (patch) | |
| tree | a83cb019738a3e1601de75bdac5742e5787d97a0 /bcprov | |
| parent | 565eb1c386b12c83b5aa7f42bb9099062af17782 (diff) | |
| download | android_external_bouncycastle-0d5d3541c94c2fc81d1668bb6b0f4e2d3a666746.tar.gz android_external_bouncycastle-0d5d3541c94c2fc81d1668bb6b0f4e2d3a666746.tar.bz2 android_external_bouncycastle-0d5d3541c94c2fc81d1668bb6b0f4e2d3a666746.zip | |
Register DSA OID for KeyFactory not just Signature
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.
We also need to remove a manual OID alias added for Signatures which
probably indicates how this slipped through the cracks.
(cherry picked from commit 75fc34101f063fe3534de7340beb13c87786e6e1)
Bug: 21209493
Change-Id: I12a88ead61c626343d96a9c335bdf40e615894bd
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java | 6 | ||||
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java index 2bede7e..7c402f3 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java @@ -63,10 +63,12 @@ public class DSA provider.addAlgorithm("Alg.Alias.Signature.DSAWITHSHA1", "SHA1withDSA"); provider.addAlgorithm("Alg.Alias.Signature.SHA1WithDSA", "SHA1withDSA"); provider.addAlgorithm("Alg.Alias.Signature.DSAWithSHA1", "SHA1withDSA"); - - provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10040.4.3", "SHA1withDSA"); // END android-changed + // BEGIN android-removed + // provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10040.4.3", "DSA"); + // END android-removed + AsymmetricKeyInfoConverter keyFact = new KeyFactorySpi(); for (int i = 0; i != DSAUtil.dsaOids.length; i++) 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 }; |