diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-11-01 11:04:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-01 11:04:39 -0700 |
| commit | 52112f9fb5f241aa27e330047fb9d534ca4d466f (patch) | |
| tree | 285d8e0db6df2a8068dc28578e8abd8a0ad52765 /bcprov | |
| parent | 9912a9c85825650db59395651b30bc1b0279a3fd (diff) | |
| parent | 036093e8793923cf6b6bd920d7a2254ab0afa8a1 (diff) | |
| download | android_external_bouncycastle-52112f9fb5f241aa27e330047fb9d534ca4d466f.tar.gz android_external_bouncycastle-52112f9fb5f241aa27e330047fb9d534ca4d466f.tar.bz2 android_external_bouncycastle-52112f9fb5f241aa27e330047fb9d534ca4d466f.zip | |
am 036093e8: Fix registration of MD5withRSA Signatures
* commit '036093e8793923cf6b6bd920d7a2254ab0afa8a1':
Fix registration of MD5withRSA Signatures
Diffstat (limited to 'bcprov')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java index dcf52c8..3037069 100644 --- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java +++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java @@ -122,19 +122,25 @@ public class RSA // addDigestSignature(provider, "MD2", PREFIX + "DigestSignatureSpi$MD2", PKCSObjectIdentifiers.md2WithRSAEncryption); // } // - // if (provider.hasAlgorithm("MessageDigest", "MD2")) + // // BEGIN android-changed + // if (provider.hasAlgorithm("MessageDigest", "MD4")) + // // END android-changed // { // addDigestSignature(provider, "MD4", PREFIX + "DigestSignatureSpi$MD4", PKCSObjectIdentifiers.md4WithRSAEncryption); // } - // - // if (provider.hasAlgorithm("MessageDigest", "MD2")) - // { - // addDigestSignature(provider, "MD5", PREFIX + "DigestSignatureSpi$MD5", PKCSObjectIdentifiers.md5WithRSAEncryption); - // provider.addAlgorithm("Signature.MD5withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$MD5WithRSAEncryption"); - // provider.addAlgorithm("Alg.Alias.Signature.MD5WithRSA/ISO9796-2", "MD5withRSA/ISO9796-2"); - // } // END android-removed + // BEGIN android-changed + if (provider.hasAlgorithm("MessageDigest", "MD5")) + // END android-changed + { + addDigestSignature(provider, "MD5", PREFIX + "DigestSignatureSpi$MD5", PKCSObjectIdentifiers.md5WithRSAEncryption); + // BEGIN android-removed + // provider.addAlgorithm("Signature.MD5withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$MD5WithRSAEncryption"); + // provider.addAlgorithm("Alg.Alias.Signature.MD5WithRSA/ISO9796-2", "MD5withRSA/ISO9796-2"); + // END android-removed + } + if (provider.hasAlgorithm("MessageDigest", "SHA1")) { // BEGIN android-removed |