diff options
| author | Kenny Root <kroot@google.com> | 2013-12-16 08:39:58 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-12-16 08:52:44 -0800 |
| commit | b7130ea4e4acaafb59cba3a5a1cadb08ed9c4853 (patch) | |
| tree | 862641c228598821eecbda1022b7dec3c29cf83d /patches | |
| parent | 0b880419f31446c7be53c6bda7e4922e9e8613db (diff) | |
| download | android_external_bouncycastle-b7130ea4e4acaafb59cba3a5a1cadb08ed9c4853.tar.gz android_external_bouncycastle-b7130ea4e4acaafb59cba3a5a1cadb08ed9c4853.tar.bz2 android_external_bouncycastle-b7130ea4e4acaafb59cba3a5a1cadb08ed9c4853.zip | |
Remove Signature.SHA{384,512}withDSA
Accidentally added during the upgrade to Bouncycastle 1.50.
Change-Id: I91439c1a53f7d46e56d966b551f06b120003a2a8
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/bcprov.patch | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/patches/bcprov.patch b/patches/bcprov.patch index 56925aa..25de3dc 100644 --- a/patches/bcprov.patch +++ b/patches/bcprov.patch @@ -1140,8 +1140,8 @@ diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/jcajce/provider/asymmetric/D } diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/jcajce/provider/asymmetric/DSA.java bcprov-jdk15on-150/org/bouncycastle/jcajce/provider/asymmetric/DSA.java --- bcprov-jdk15on-150.orig/org/bouncycastle/jcajce/provider/asymmetric/DSA.java 2013-12-03 20:18:20.000000000 +0000 -+++ bcprov-jdk15on-150/org/bouncycastle/jcajce/provider/asymmetric/DSA.java 2013-12-12 00:35:05.000000000 +0000 -@@ -27,40 +27,51 @@ ++++ bcprov-jdk15on-150/org/bouncycastle/jcajce/provider/asymmetric/DSA.java 2013-12-16 16:39:58.000000000 +0000 +@@ -27,40 +27,53 @@ provider.addAlgorithm("KeyPairGenerator.DSA", PREFIX + "KeyPairGeneratorSpi"); provider.addAlgorithm("KeyFactory.DSA", PREFIX + "KeyFactorySpi"); @@ -1170,18 +1170,13 @@ diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/jcajce/provider/asymmetric/D addSignatureAlgorithm(provider, "SHA224", "DSA", PREFIX + "DSASigner$dsa224", NISTObjectIdentifiers.dsa_with_sha224); addSignatureAlgorithm(provider, "SHA256", "DSA", PREFIX + "DSASigner$dsa256", NISTObjectIdentifiers.dsa_with_sha256); - addSignatureAlgorithm(provider, "SHA384", "DSA", PREFIX + "DSASigner$dsa384", NISTObjectIdentifiers.dsa_with_sha384); - addSignatureAlgorithm(provider, "SHA512", "DSA", PREFIX + "DSASigner$dsa512", NISTObjectIdentifiers.dsa_with_sha512); - -- provider.addAlgorithm("Alg.Alias.Signature.SHA/DSA", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.SHA1withDSA", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHDSA", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.1", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.3", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.DSAwithSHA1", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.DSAWITHSHA1", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.SHA1WithDSA", "DSA"); -- provider.addAlgorithm("Alg.Alias.Signature.DSAWithSHA1", "DSA"); +- addSignatureAlgorithm(provider, "SHA384", "DSA", PREFIX + "DSASigner$dsa384", NISTObjectIdentifiers.dsa_with_sha384); +- addSignatureAlgorithm(provider, "SHA512", "DSA", PREFIX + "DSASigner$dsa512", NISTObjectIdentifiers.dsa_with_sha512); ++ // BEGIN android-removed ++ // addSignatureAlgorithm(provider, "SHA384", "DSA", PREFIX + "DSASigner$dsa384", NISTObjectIdentifiers.dsa_with_sha384); ++ // addSignatureAlgorithm(provider, "SHA512", "DSA", PREFIX + "DSASigner$dsa512", NISTObjectIdentifiers.dsa_with_sha512); ++ // END android-removed ++ + // BEGIN android-added + provider.addAlgorithm("Alg.Alias.Signature.DSA", "SHA1withDSA"); + // END android-added @@ -1196,6 +1191,16 @@ diff -Naur bcprov-jdk15on-150.orig/org/bouncycastle/jcajce/provider/asymmetric/D + provider.addAlgorithm("Alg.Alias.Signature.SHA1WithDSA", "SHA1withDSA"); + provider.addAlgorithm("Alg.Alias.Signature.DSAWithSHA1", "SHA1withDSA"); +- provider.addAlgorithm("Alg.Alias.Signature.SHA/DSA", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.SHA1withDSA", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHDSA", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.1", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.3", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.DSAwithSHA1", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.DSAWITHSHA1", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.SHA1WithDSA", "DSA"); +- provider.addAlgorithm("Alg.Alias.Signature.DSAWithSHA1", "DSA"); +- - provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10040.4.3", "DSA"); + provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10040.4.3", "SHA1withDSA"); + // END android-changed |