| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/cms/CMSSignedGenerator.java bcpkix-jdk15on-148/org/bouncycastle/cms/CMSSignedGenerator.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/cms/CMSSignedGenerator.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/cms/CMSSignedGenerator.java 2013-01-31 02:26:40.000000000 +0000 |
| @@ -22,7 +22,9 @@ |
| import org.bouncycastle.asn1.DERTaggedObject; |
| import org.bouncycastle.asn1.cms.AttributeTable; |
| import org.bouncycastle.asn1.cms.CMSObjectIdentifiers; |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; |
| import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; |
| @@ -30,7 +32,9 @@ |
| import org.bouncycastle.asn1.x509.AlgorithmIdentifier; |
| import org.bouncycastle.asn1.x509.AttributeCertificate; |
| import org.bouncycastle.asn1.x9.X9ObjectIdentifiers; |
| -import org.bouncycastle.jce.interfaces.GOST3410PrivateKey; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.jce.interfaces.GOST3410PrivateKey; |
| +// END android-removed |
| import org.bouncycastle.util.Store; |
| import org.bouncycastle.x509.X509AttributeCertificate; |
| import org.bouncycastle.x509.X509Store; |
| @@ -43,25 +47,33 @@ |
| public static final String DATA = CMSObjectIdentifiers.data.getId(); |
| |
| public static final String DIGEST_SHA1 = OIWObjectIdentifiers.idSHA1.getId(); |
| - public static final String DIGEST_SHA224 = NISTObjectIdentifiers.id_sha224.getId(); |
| + // BEGIN android-removed |
| + // public static final String DIGEST_SHA224 = NISTObjectIdentifiers.id_sha224.getId(); |
| + // END android-removed |
| public static final String DIGEST_SHA256 = NISTObjectIdentifiers.id_sha256.getId(); |
| public static final String DIGEST_SHA384 = NISTObjectIdentifiers.id_sha384.getId(); |
| public static final String DIGEST_SHA512 = NISTObjectIdentifiers.id_sha512.getId(); |
| public static final String DIGEST_MD5 = PKCSObjectIdentifiers.md5.getId(); |
| - public static final String DIGEST_GOST3411 = CryptoProObjectIdentifiers.gostR3411.getId(); |
| - public static final String DIGEST_RIPEMD128 = TeleTrusTObjectIdentifiers.ripemd128.getId(); |
| - public static final String DIGEST_RIPEMD160 = TeleTrusTObjectIdentifiers.ripemd160.getId(); |
| - public static final String DIGEST_RIPEMD256 = TeleTrusTObjectIdentifiers.ripemd256.getId(); |
| + // BEGIN android-removed |
| + // public static final String DIGEST_GOST3411 = CryptoProObjectIdentifiers.gostR3411.getId(); |
| + // public static final String DIGEST_RIPEMD128 = TeleTrusTObjectIdentifiers.ripemd128.getId(); |
| + // public static final String DIGEST_RIPEMD160 = TeleTrusTObjectIdentifiers.ripemd160.getId(); |
| + // public static final String DIGEST_RIPEMD256 = TeleTrusTObjectIdentifiers.ripemd256.getId(); |
| + // END android-removed |
| |
| public static final String ENCRYPTION_RSA = PKCSObjectIdentifiers.rsaEncryption.getId(); |
| public static final String ENCRYPTION_DSA = X9ObjectIdentifiers.id_dsa_with_sha1.getId(); |
| public static final String ENCRYPTION_ECDSA = X9ObjectIdentifiers.ecdsa_with_SHA1.getId(); |
| public static final String ENCRYPTION_RSA_PSS = PKCSObjectIdentifiers.id_RSASSA_PSS.getId(); |
| - public static final String ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94.getId(); |
| - public static final String ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001.getId(); |
| + // BEGIN android-removed |
| + // public static final String ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94.getId(); |
| + // public static final String ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001.getId(); |
| + // END android-removed |
| |
| private static final String ENCRYPTION_ECDSA_WITH_SHA1 = X9ObjectIdentifiers.ecdsa_with_SHA1.getId(); |
| - private static final String ENCRYPTION_ECDSA_WITH_SHA224 = X9ObjectIdentifiers.ecdsa_with_SHA224.getId(); |
| + // BEGIN android-removed |
| + // private static final String ENCRYPTION_ECDSA_WITH_SHA224 = X9ObjectIdentifiers.ecdsa_with_SHA224.getId(); |
| + // END android-removed |
| private static final String ENCRYPTION_ECDSA_WITH_SHA256 = X9ObjectIdentifiers.ecdsa_with_SHA256.getId(); |
| private static final String ENCRYPTION_ECDSA_WITH_SHA384 = X9ObjectIdentifiers.ecdsa_with_SHA384.getId(); |
| private static final String ENCRYPTION_ECDSA_WITH_SHA512 = X9ObjectIdentifiers.ecdsa_with_SHA512.getId(); |
| @@ -74,13 +86,17 @@ |
| NO_PARAMS.add(ENCRYPTION_DSA); |
| NO_PARAMS.add(ENCRYPTION_ECDSA); |
| NO_PARAMS.add(ENCRYPTION_ECDSA_WITH_SHA1); |
| - NO_PARAMS.add(ENCRYPTION_ECDSA_WITH_SHA224); |
| + // BEGIN android-removed |
| + // NO_PARAMS.add(ENCRYPTION_ECDSA_WITH_SHA224); |
| + // END android-removed |
| NO_PARAMS.add(ENCRYPTION_ECDSA_WITH_SHA256); |
| NO_PARAMS.add(ENCRYPTION_ECDSA_WITH_SHA384); |
| NO_PARAMS.add(ENCRYPTION_ECDSA_WITH_SHA512); |
| |
| EC_ALGORITHMS.put(DIGEST_SHA1, ENCRYPTION_ECDSA_WITH_SHA1); |
| - EC_ALGORITHMS.put(DIGEST_SHA224, ENCRYPTION_ECDSA_WITH_SHA224); |
| + // BEGIN android-removed |
| + // EC_ALGORITHMS.put(DIGEST_SHA224, ENCRYPTION_ECDSA_WITH_SHA224); |
| + // END android-removed |
| EC_ALGORITHMS.put(DIGEST_SHA256, ENCRYPTION_ECDSA_WITH_SHA256); |
| EC_ALGORITHMS.put(DIGEST_SHA384, ENCRYPTION_ECDSA_WITH_SHA384); |
| EC_ALGORITHMS.put(DIGEST_SHA512, ENCRYPTION_ECDSA_WITH_SHA512); |
| @@ -138,14 +154,16 @@ |
| throw new IllegalArgumentException("can't mix ECDSA with anything but SHA family digests"); |
| } |
| } |
| - else if (key instanceof GOST3410PrivateKey || "GOST3410".equalsIgnoreCase(key.getAlgorithm())) |
| - { |
| - encOID = ENCRYPTION_GOST3410; |
| - } |
| - else if ("ECGOST3410".equalsIgnoreCase(key.getAlgorithm())) |
| - { |
| - encOID = ENCRYPTION_ECGOST3410; |
| - } |
| + // BEGIN android-removed |
| + // else if (key instanceof GOST3410PrivateKey || "GOST3410".equalsIgnoreCase(key.getAlgorithm())) |
| + // { |
| + // encOID = ENCRYPTION_GOST3410; |
| + // } |
| + // else if ("ECGOST3410".equalsIgnoreCase(key.getAlgorithm())) |
| + // { |
| + // encOID = ENCRYPTION_ECGOST3410; |
| + // } |
| + // END android-removed |
| |
| return encOID; |
| } |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/cms/CMSSignedHelper.java bcpkix-jdk15on-148/org/bouncycastle/cms/CMSSignedHelper.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/cms/CMSSignedHelper.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/cms/CMSSignedHelper.java 2013-01-31 02:26:40.000000000 +0000 |
| @@ -23,7 +23,9 @@ |
| import org.bouncycastle.asn1.ASN1Set; |
| import org.bouncycastle.asn1.ASN1TaggedObject; |
| import org.bouncycastle.asn1.DERNull; |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.eac.EACObjectIdentifiers; |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; |
| @@ -53,31 +55,43 @@ |
| |
| static |
| { |
| - addEntries(NISTObjectIdentifiers.dsa_with_sha224, "SHA224", "DSA"); |
| + // BEGIN android-removed |
| + // addEntries(NISTObjectIdentifiers.dsa_with_sha224, "SHA224", "DSA"); |
| + // END android-removed |
| addEntries(NISTObjectIdentifiers.dsa_with_sha256, "SHA256", "DSA"); |
| addEntries(NISTObjectIdentifiers.dsa_with_sha384, "SHA384", "DSA"); |
| addEntries(NISTObjectIdentifiers.dsa_with_sha512, "SHA512", "DSA"); |
| addEntries(OIWObjectIdentifiers.dsaWithSHA1, "SHA1", "DSA"); |
| - addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA"); |
| - addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // BEGIN android-removed |
| + // addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA"); |
| + // addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // END android-removed |
| addEntries(OIWObjectIdentifiers.md5WithRSA, "MD5", "RSA"); |
| addEntries(OIWObjectIdentifiers.sha1WithRSA, "SHA1", "RSA"); |
| - addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA"); |
| - addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // BEGIN android-removed |
| + // addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA"); |
| + // addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // END android-removed |
| addEntries(PKCSObjectIdentifiers.md5WithRSAEncryption, "MD5", "RSA"); |
| addEntries(PKCSObjectIdentifiers.sha1WithRSAEncryption, "SHA1", "RSA"); |
| - addEntries(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224", "RSA"); |
| + // BEGIN android-removed |
| + // addEntries(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224", "RSA"); |
| + // END android-removed |
| addEntries(PKCSObjectIdentifiers.sha256WithRSAEncryption, "SHA256", "RSA"); |
| addEntries(PKCSObjectIdentifiers.sha384WithRSAEncryption, "SHA384", "RSA"); |
| addEntries(PKCSObjectIdentifiers.sha512WithRSAEncryption, "SHA512", "RSA"); |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA1, "SHA1", "ECDSA"); |
| - addEntries(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224", "ECDSA"); |
| + // BEGIN android-removed |
| + // addEntries(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224", "ECDSA"); |
| + // END android-removed |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA256, "SHA256", "ECDSA"); |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA384, "SHA384", "ECDSA"); |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA512, "SHA512", "ECDSA"); |
| addEntries(X9ObjectIdentifiers.id_dsa_with_sha1, "SHA1", "DSA"); |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1", "ECDSA"); |
| - addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224", "ECDSA"); |
| + // BEGIN android-removed |
| + // addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224", "ECDSA"); |
| + // END android-removed |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_256, "SHA256", "ECDSA"); |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_384, "SHA384", "ECDSA"); |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512", "ECDSA"); |
| @@ -90,30 +104,38 @@ |
| encryptionAlgs.put(PKCSObjectIdentifiers.rsaEncryption.getId(), "RSA"); |
| encryptionAlgs.put(TeleTrusTObjectIdentifiers.teleTrusTRSAsignatureAlgorithm, "RSA"); |
| encryptionAlgs.put(X509ObjectIdentifiers.id_ea_rsa.getId(), "RSA"); |
| - encryptionAlgs.put(CMSSignedDataGenerator.ENCRYPTION_RSA_PSS, "RSAandMGF1"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94.getId(), "GOST3410"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001.getId(), "ECGOST3410"); |
| - encryptionAlgs.put("1.3.6.1.4.1.5849.1.6.2", "ECGOST3410"); |
| - encryptionAlgs.put("1.3.6.1.4.1.5849.1.1.5", "GOST3410"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001.getId(), "ECGOST3410"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94.getId(), "GOST3410"); |
| - |
| - digestAlgs.put(PKCSObjectIdentifiers.md2.getId(), "MD2"); |
| - digestAlgs.put(PKCSObjectIdentifiers.md4.getId(), "MD4"); |
| + // BEGIN android-removed |
| + // encryptionAlgs.put(CMSSignedDataGenerator.ENCRYPTION_RSA_PSS, "RSAandMGF1"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94.getId(), "GOST3410"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001.getId(), "ECGOST3410"); |
| + // encryptionAlgs.put("1.3.6.1.4.1.5849.1.6.2", "ECGOST3410"); |
| + // encryptionAlgs.put("1.3.6.1.4.1.5849.1.1.5", "GOST3410"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001.getId(), "ECGOST3410"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94.getId(), "GOST3410"); |
| + // |
| + // digestAlgs.put(PKCSObjectIdentifiers.md2.getId(), "MD2"); |
| + // digestAlgs.put(PKCSObjectIdentifiers.md4.getId(), "MD4"); |
| + // END android-removed |
| digestAlgs.put(PKCSObjectIdentifiers.md5.getId(), "MD5"); |
| digestAlgs.put(OIWObjectIdentifiers.idSHA1.getId(), "SHA1"); |
| - digestAlgs.put(NISTObjectIdentifiers.id_sha224.getId(), "SHA224"); |
| + // BEGIN android-removed |
| + // digestAlgs.put(NISTObjectIdentifiers.id_sha224.getId(), "SHA224"); |
| + // END android-removed |
| digestAlgs.put(NISTObjectIdentifiers.id_sha256.getId(), "SHA256"); |
| digestAlgs.put(NISTObjectIdentifiers.id_sha384.getId(), "SHA384"); |
| digestAlgs.put(NISTObjectIdentifiers.id_sha512.getId(), "SHA512"); |
| - digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128.getId(), "RIPEMD128"); |
| - digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160.getId(), "RIPEMD160"); |
| - digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256.getId(), "RIPEMD256"); |
| - digestAlgs.put(CryptoProObjectIdentifiers.gostR3411.getId(), "GOST3411"); |
| - digestAlgs.put("1.3.6.1.4.1.5849.1.2.1", "GOST3411"); |
| + // BEGIN android-removed |
| + // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128.getId(), "RIPEMD128"); |
| + // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160.getId(), "RIPEMD160"); |
| + // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256.getId(), "RIPEMD256"); |
| + // digestAlgs.put(CryptoProObjectIdentifiers.gostR3411.getId(), "GOST3411"); |
| + // digestAlgs.put("1.3.6.1.4.1.5849.1.2.1", "GOST3411"); |
| + // END android-removed |
| |
| digestAliases.put("SHA1", new String[] { "SHA-1" }); |
| - digestAliases.put("SHA224", new String[] { "SHA-224" }); |
| + // BEGIN android-removed |
| + // digestAliases.put("SHA224", new String[] { "SHA-224" }); |
| + // END android-removed |
| digestAliases.put("SHA256", new String[] { "SHA-256" }); |
| digestAliases.put("SHA384", new String[] { "SHA-384" }); |
| digestAliases.put("SHA512", new String[] { "SHA-512" }); |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java bcpkix-jdk15on-148/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java 2012-09-17 23:04:47.000000000 +0000 |
| @@ -4,7 +4,9 @@ |
| import java.util.Map; |
| |
| import org.bouncycastle.asn1.ASN1ObjectIdentifier; |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.eac.EACObjectIdentifiers; |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; |
| @@ -28,31 +30,43 @@ |
| |
| public DefaultCMSSignatureAlgorithmNameGenerator() |
| { |
| - addEntries(NISTObjectIdentifiers.dsa_with_sha224, "SHA224", "DSA"); |
| + // BEGIN android-removed |
| + // addEntries(NISTObjectIdentifiers.dsa_with_sha224, "SHA224", "DSA"); |
| + // END android-removed |
| addEntries(NISTObjectIdentifiers.dsa_with_sha256, "SHA256", "DSA"); |
| addEntries(NISTObjectIdentifiers.dsa_with_sha384, "SHA384", "DSA"); |
| addEntries(NISTObjectIdentifiers.dsa_with_sha512, "SHA512", "DSA"); |
| addEntries(OIWObjectIdentifiers.dsaWithSHA1, "SHA1", "DSA"); |
| - addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA"); |
| - addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // BEGIN android-removed |
| + // addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA"); |
| + // addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // END android-removed |
| addEntries(OIWObjectIdentifiers.md5WithRSA, "MD5", "RSA"); |
| addEntries(OIWObjectIdentifiers.sha1WithRSA, "SHA1", "RSA"); |
| - addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA"); |
| - addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // BEGIN android-removed |
| + // addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA"); |
| + // addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA"); |
| + // END android-removed |
| addEntries(PKCSObjectIdentifiers.md5WithRSAEncryption, "MD5", "RSA"); |
| addEntries(PKCSObjectIdentifiers.sha1WithRSAEncryption, "SHA1", "RSA"); |
| - addEntries(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224", "RSA"); |
| + // BEGIN android-removed |
| + // addEntries(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224", "RSA"); |
| + // END android-removed |
| addEntries(PKCSObjectIdentifiers.sha256WithRSAEncryption, "SHA256", "RSA"); |
| addEntries(PKCSObjectIdentifiers.sha384WithRSAEncryption, "SHA384", "RSA"); |
| addEntries(PKCSObjectIdentifiers.sha512WithRSAEncryption, "SHA512", "RSA"); |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA1, "SHA1", "ECDSA"); |
| - addEntries(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224", "ECDSA"); |
| + // BEGIN android-removed |
| + // addEntries(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224", "ECDSA"); |
| + // END android-removed |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA256, "SHA256", "ECDSA"); |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA384, "SHA384", "ECDSA"); |
| addEntries(X9ObjectIdentifiers.ecdsa_with_SHA512, "SHA512", "ECDSA"); |
| addEntries(X9ObjectIdentifiers.id_dsa_with_sha1, "SHA1", "DSA"); |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1", "ECDSA"); |
| - addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224", "ECDSA"); |
| + // BEGIN android-removed |
| + // addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224", "ECDSA"); |
| + // END android-removed |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_256, "SHA256", "ECDSA"); |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_384, "SHA384", "ECDSA"); |
| addEntries(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512", "ECDSA"); |
| @@ -66,26 +80,32 @@ |
| encryptionAlgs.put(TeleTrusTObjectIdentifiers.teleTrusTRSAsignatureAlgorithm, "RSA"); |
| encryptionAlgs.put(X509ObjectIdentifiers.id_ea_rsa, "RSA"); |
| encryptionAlgs.put(PKCSObjectIdentifiers.id_RSASSA_PSS, "RSAandMGF1"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94, "GOST3410"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001, "ECGOST3410"); |
| - encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.6.2"), "ECGOST3410"); |
| - encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.1.5"), "GOST3410"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "ECGOST3410"); |
| - encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3410"); |
| - |
| - digestAlgs.put(PKCSObjectIdentifiers.md2, "MD2"); |
| - digestAlgs.put(PKCSObjectIdentifiers.md4, "MD4"); |
| + // BEGIN android-removed |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94, "GOST3410"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001, "ECGOST3410"); |
| + // encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.6.2"), "ECGOST3410"); |
| + // encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.1.5"), "GOST3410"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "ECGOST3410"); |
| + // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3410"); |
| + // |
| + // digestAlgs.put(PKCSObjectIdentifiers.md2, "MD2"); |
| + // digestAlgs.put(PKCSObjectIdentifiers.md4, "MD4"); |
| + // END android-removed |
| digestAlgs.put(PKCSObjectIdentifiers.md5, "MD5"); |
| digestAlgs.put(OIWObjectIdentifiers.idSHA1, "SHA1"); |
| - digestAlgs.put(NISTObjectIdentifiers.id_sha224, "SHA224"); |
| + // BEGIN android-removed |
| + // digestAlgs.put(NISTObjectIdentifiers.id_sha224, "SHA224"); |
| + // END android-removed |
| digestAlgs.put(NISTObjectIdentifiers.id_sha256, "SHA256"); |
| digestAlgs.put(NISTObjectIdentifiers.id_sha384, "SHA384"); |
| digestAlgs.put(NISTObjectIdentifiers.id_sha512, "SHA512"); |
| - digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128"); |
| - digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160, "RIPEMD160"); |
| - digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256, "RIPEMD256"); |
| - digestAlgs.put(CryptoProObjectIdentifiers.gostR3411, "GOST3411"); |
| - digestAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.2.1"), "GOST3411"); |
| + // BEGIN android-removed |
| + // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128"); |
| + // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160, "RIPEMD160"); |
| + // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256, "RIPEMD256"); |
| + // digestAlgs.put(CryptoProObjectIdentifiers.gostR3411, "GOST3411"); |
| + // digestAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.2.1"), "GOST3411"); |
| + // END android-removed |
| } |
| |
| /** |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java bcpkix-jdk15on-148/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java 2012-09-17 23:04:47.000000000 +0000 |
| @@ -16,21 +16,29 @@ |
| |
| static |
| { |
| - RSA_PKCS1d5.add(PKCSObjectIdentifiers.md2WithRSAEncryption); |
| - RSA_PKCS1d5.add(PKCSObjectIdentifiers.md4WithRSAEncryption); |
| + // BEGIN android-removed |
| + // RSA_PKCS1d5.add(PKCSObjectIdentifiers.md2WithRSAEncryption); |
| + // RSA_PKCS1d5.add(PKCSObjectIdentifiers.md4WithRSAEncryption); |
| + // END android-removed |
| RSA_PKCS1d5.add(PKCSObjectIdentifiers.md5WithRSAEncryption); |
| RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha1WithRSAEncryption); |
| - RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // BEGIN android-removed |
| + // RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // END android-removed |
| RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha256WithRSAEncryption); |
| RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha384WithRSAEncryption); |
| RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha512WithRSAEncryption); |
| - RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSAEncryption); |
| - RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSA); |
| + // BEGIN android-removed |
| + // RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSAEncryption); |
| + // RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSA); |
| + // END android-removed |
| RSA_PKCS1d5.add(OIWObjectIdentifiers.md5WithRSA); |
| RSA_PKCS1d5.add(OIWObjectIdentifiers.sha1WithRSA); |
| - RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| - RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| - RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // BEGIN android-removed |
| + // RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| + // RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| + // RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // END android-removed |
| } |
| |
| public AlgorithmIdentifier findEncryptionAlgorithm(AlgorithmIdentifier signatureAlgorithm) |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java bcpkix-jdk15on-148/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java 2013-01-31 02:26:40.000000000 +0000 |
| @@ -5,7 +5,9 @@ |
| |
| import org.bouncycastle.asn1.ASN1ObjectIdentifier; |
| import org.bouncycastle.asn1.DERNull; |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; |
| import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; |
| @@ -25,53 +27,71 @@ |
| // |
| // digests |
| // |
| - digestOids.put(OIWObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4); |
| - digestOids.put(OIWObjectIdentifiers.md4WithRSA, PKCSObjectIdentifiers.md4); |
| + // BEGIN android-removed |
| + // digestOids.put(OIWObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4); |
| + // digestOids.put(OIWObjectIdentifiers.md4WithRSA, PKCSObjectIdentifiers.md4); |
| + // END android-removed |
| digestOids.put(OIWObjectIdentifiers.sha1WithRSA, OIWObjectIdentifiers.idSHA1); |
| |
| - digestOids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, NISTObjectIdentifiers.id_sha224); |
| + // BEGIN android-removed |
| + // digestOids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, NISTObjectIdentifiers.id_sha224); |
| + // END android-removed |
| digestOids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, NISTObjectIdentifiers.id_sha256); |
| digestOids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, NISTObjectIdentifiers.id_sha384); |
| digestOids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, NISTObjectIdentifiers.id_sha512); |
| - digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2); |
| - digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4); |
| + // BEGIN android-removed |
| + // digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2); |
| + // digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4); |
| + // END android-removed |
| digestOids.put(PKCSObjectIdentifiers.md5WithRSAEncryption, PKCSObjectIdentifiers.md5); |
| digestOids.put(PKCSObjectIdentifiers.sha1WithRSAEncryption, OIWObjectIdentifiers.idSHA1); |
| |
| digestOids.put(X9ObjectIdentifiers.ecdsa_with_SHA1, OIWObjectIdentifiers.idSHA1); |
| - digestOids.put(X9ObjectIdentifiers.ecdsa_with_SHA224, NISTObjectIdentifiers.id_sha224); |
| + // BEGIN android-removed |
| + // digestOids.put(X9ObjectIdentifiers.ecdsa_with_SHA224, NISTObjectIdentifiers.id_sha224); |
| + // END android-removed |
| digestOids.put(X9ObjectIdentifiers.ecdsa_with_SHA256, NISTObjectIdentifiers.id_sha256); |
| digestOids.put(X9ObjectIdentifiers.ecdsa_with_SHA384, NISTObjectIdentifiers.id_sha384); |
| digestOids.put(X9ObjectIdentifiers.ecdsa_with_SHA512, NISTObjectIdentifiers.id_sha512); |
| digestOids.put(X9ObjectIdentifiers.id_dsa_with_sha1, OIWObjectIdentifiers.idSHA1); |
| |
| - digestOids.put(NISTObjectIdentifiers.dsa_with_sha224, NISTObjectIdentifiers.id_sha224); |
| + // BEGIN android-removed |
| + // digestOids.put(NISTObjectIdentifiers.dsa_with_sha224, NISTObjectIdentifiers.id_sha224); |
| + // END android-removed |
| digestOids.put(NISTObjectIdentifiers.dsa_with_sha256, NISTObjectIdentifiers.id_sha256); |
| digestOids.put(NISTObjectIdentifiers.dsa_with_sha384, NISTObjectIdentifiers.id_sha384); |
| digestOids.put(NISTObjectIdentifiers.dsa_with_sha512, NISTObjectIdentifiers.id_sha512); |
| |
| - digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128); |
| - digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160); |
| - digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256); |
| - |
| - digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411); |
| - digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411); |
| + // BEGIN android-removed |
| + // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128); |
| + // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160); |
| + // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256); |
| + // |
| + // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411); |
| + // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411); |
| + // END android-removed |
| |
| digestNameToOids.put("SHA-1", OIWObjectIdentifiers.idSHA1); |
| - digestNameToOids.put("SHA-224", NISTObjectIdentifiers.id_sha224); |
| + // BEGIN android-removed |
| + // digestNameToOids.put("SHA-224", NISTObjectIdentifiers.id_sha224); |
| + // END android-removed |
| digestNameToOids.put("SHA-256", NISTObjectIdentifiers.id_sha256); |
| digestNameToOids.put("SHA-384", NISTObjectIdentifiers.id_sha384); |
| digestNameToOids.put("SHA-512", NISTObjectIdentifiers.id_sha512); |
| |
| - digestNameToOids.put("GOST3411", CryptoProObjectIdentifiers.gostR3411); |
| - |
| - digestNameToOids.put("MD2", PKCSObjectIdentifiers.md2); |
| - digestNameToOids.put("MD4", PKCSObjectIdentifiers.md4); |
| + // BEGIN android-removed |
| + // digestNameToOids.put("GOST3411", CryptoProObjectIdentifiers.gostR3411); |
| + // |
| + // digestNameToOids.put("MD2", PKCSObjectIdentifiers.md2); |
| + // digestNameToOids.put("MD4", PKCSObjectIdentifiers.md4); |
| + // END android-removed |
| digestNameToOids.put("MD5", PKCSObjectIdentifiers.md5); |
| |
| - digestNameToOids.put("RIPEMD128", TeleTrusTObjectIdentifiers.ripemd128); |
| - digestNameToOids.put("RIPEMD160", TeleTrusTObjectIdentifiers.ripemd160); |
| - digestNameToOids.put("RIPEMD256", TeleTrusTObjectIdentifiers.ripemd256); |
| + // BEGIN android-removed |
| + // digestNameToOids.put("RIPEMD128", TeleTrusTObjectIdentifiers.ripemd128); |
| + // digestNameToOids.put("RIPEMD160", TeleTrusTObjectIdentifiers.ripemd160); |
| + // digestNameToOids.put("RIPEMD256", TeleTrusTObjectIdentifiers.ripemd256); |
| + // END android-removed |
| } |
| |
| public AlgorithmIdentifier find(AlgorithmIdentifier sigAlgId) |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java bcpkix-jdk15on-148/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java 2013-01-31 02:26:40.000000000 +0000 |
| @@ -9,7 +9,9 @@ |
| import org.bouncycastle.asn1.ASN1Integer; |
| import org.bouncycastle.asn1.ASN1ObjectIdentifier; |
| import org.bouncycastle.asn1.DERNull; |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; |
| import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; |
| @@ -32,19 +34,25 @@ |
| private static final ASN1ObjectIdentifier ENCRYPTION_DSA = X9ObjectIdentifiers.id_dsa_with_sha1; |
| private static final ASN1ObjectIdentifier ENCRYPTION_ECDSA = X9ObjectIdentifiers.ecdsa_with_SHA1; |
| private static final ASN1ObjectIdentifier ENCRYPTION_RSA_PSS = PKCSObjectIdentifiers.id_RSASSA_PSS; |
| - private static final ASN1ObjectIdentifier ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94; |
| - private static final ASN1ObjectIdentifier ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001; |
| + // BEGIN android-removed |
| + // private static final ASN1ObjectIdentifier ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94; |
| + // private static final ASN1ObjectIdentifier ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001; |
| + // END android-removed |
| |
| static |
| { |
| - algorithms.put("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption); |
| - algorithms.put("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption); |
| + // BEGIN android-removed |
| + // algorithms.put("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption); |
| + // algorithms.put("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption); |
| + // END android-removed |
| algorithms.put("MD5WITHRSAENCRYPTION", PKCSObjectIdentifiers.md5WithRSAEncryption); |
| algorithms.put("MD5WITHRSA", PKCSObjectIdentifiers.md5WithRSAEncryption); |
| algorithms.put("SHA1WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha1WithRSAEncryption); |
| algorithms.put("SHA1WITHRSA", PKCSObjectIdentifiers.sha1WithRSAEncryption); |
| - algorithms.put("SHA224WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| - algorithms.put("SHA224WITHRSA", PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // BEGIN android-removed |
| + // algorithms.put("SHA224WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // algorithms.put("SHA224WITHRSA", PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // END android-removed |
| algorithms.put("SHA256WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha256WithRSAEncryption); |
| algorithms.put("SHA256WITHRSA", PKCSObjectIdentifiers.sha256WithRSAEncryption); |
| algorithms.put("SHA384WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha384WithRSAEncryption); |
| @@ -52,45 +60,59 @@ |
| algorithms.put("SHA512WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha512WithRSAEncryption); |
| algorithms.put("SHA512WITHRSA", PKCSObjectIdentifiers.sha512WithRSAEncryption); |
| algorithms.put("SHA1WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS); |
| - algorithms.put("SHA224WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS); |
| + // BEGIN android-removed |
| + // algorithms.put("SHA224WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS); |
| + // END android-removed |
| algorithms.put("SHA256WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS); |
| algorithms.put("SHA384WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS); |
| algorithms.put("SHA512WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS); |
| - algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| - algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| - algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| - algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| - algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| - algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // BEGIN android-removed |
| + // algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| + // algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| + // algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| + // algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| + // algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // END android-removed |
| algorithms.put("SHA1WITHDSA", X9ObjectIdentifiers.id_dsa_with_sha1); |
| algorithms.put("DSAWITHSHA1", X9ObjectIdentifiers.id_dsa_with_sha1); |
| - algorithms.put("SHA224WITHDSA", NISTObjectIdentifiers.dsa_with_sha224); |
| + // BEGIN android-removed |
| + // algorithms.put("SHA224WITHDSA", NISTObjectIdentifiers.dsa_with_sha224); |
| + // END android-removed |
| algorithms.put("SHA256WITHDSA", NISTObjectIdentifiers.dsa_with_sha256); |
| algorithms.put("SHA384WITHDSA", NISTObjectIdentifiers.dsa_with_sha384); |
| algorithms.put("SHA512WITHDSA", NISTObjectIdentifiers.dsa_with_sha512); |
| algorithms.put("SHA1WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1); |
| algorithms.put("ECDSAWITHSHA1", X9ObjectIdentifiers.ecdsa_with_SHA1); |
| - algorithms.put("SHA224WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA224); |
| + // BEGIN android-removed |
| + // algorithms.put("SHA224WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA224); |
| + // END android-removed |
| algorithms.put("SHA256WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256); |
| algorithms.put("SHA384WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384); |
| algorithms.put("SHA512WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512); |
| - algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94); |
| - algorithms.put("GOST3411WITHGOST3410-94", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94); |
| - algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| - algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| - algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| + // BEGIN android-removed |
| + // algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94); |
| + // algorithms.put("GOST3411WITHGOST3410-94", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94); |
| + // algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| + // algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| + // algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| + // END android-removed |
| |
| // |
| // According to RFC 3279, the ASN.1 encoding SHALL (id-dsa-with-sha1) or MUST (ecdsa-with-SHA*) omit the parameters field. |
| // The parameters field SHALL be NULL for RSA based signature algorithms. |
| // |
| noParams.add(X9ObjectIdentifiers.ecdsa_with_SHA1); |
| - noParams.add(X9ObjectIdentifiers.ecdsa_with_SHA224); |
| + // BEGIN android-removed |
| + // noParams.add(X9ObjectIdentifiers.ecdsa_with_SHA224); |
| + // END android-removed |
| noParams.add(X9ObjectIdentifiers.ecdsa_with_SHA256); |
| noParams.add(X9ObjectIdentifiers.ecdsa_with_SHA384); |
| noParams.add(X9ObjectIdentifiers.ecdsa_with_SHA512); |
| noParams.add(X9ObjectIdentifiers.id_dsa_with_sha1); |
| - noParams.add(NISTObjectIdentifiers.dsa_with_sha224); |
| + // BEGIN android-removed |
| + // noParams.add(NISTObjectIdentifiers.dsa_with_sha224); |
| + // END android-removed |
| noParams.add(NISTObjectIdentifiers.dsa_with_sha256); |
| noParams.add(NISTObjectIdentifiers.dsa_with_sha384); |
| noParams.add(NISTObjectIdentifiers.dsa_with_sha512); |
| @@ -98,20 +120,26 @@ |
| // |
| // RFC 4491 |
| // |
| - noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94); |
| - noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| + // BEGIN android-removed |
| + // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94); |
| + // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001); |
| + // END android-removed |
| |
| // |
| // PKCS 1.5 encrypted algorithms |
| // |
| pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha1WithRSAEncryption); |
| - pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // BEGIN android-removed |
| + // pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha224WithRSAEncryption); |
| + // END android-removed |
| pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha256WithRSAEncryption); |
| pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha384WithRSAEncryption); |
| pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha512WithRSAEncryption); |
| - pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| - pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| - pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // BEGIN android-removed |
| + // pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128); |
| + // pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160); |
| + // pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256); |
| + // END android-removed |
| |
| // |
| // explicit params |
| @@ -119,8 +147,10 @@ |
| AlgorithmIdentifier sha1AlgId = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE); |
| params.put("SHA1WITHRSAANDMGF1", createPSSParams(sha1AlgId, 20)); |
| |
| - AlgorithmIdentifier sha224AlgId = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224, DERNull.INSTANCE); |
| - params.put("SHA224WITHRSAANDMGF1", createPSSParams(sha224AlgId, 28)); |
| + // BEGIN android-removed |
| + // AlgorithmIdentifier sha224AlgId = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224, DERNull.INSTANCE); |
| + // params.put("SHA224WITHRSAANDMGF1", createPSSParams(sha224AlgId, 28)); |
| + // END android-removed |
| |
| AlgorithmIdentifier sha256AlgId = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256, DERNull.INSTANCE); |
| params.put("SHA256WITHRSAANDMGF1", createPSSParams(sha256AlgId, 32)); |
| @@ -134,19 +164,25 @@ |
| // |
| // digests |
| // |
| - digestOids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, NISTObjectIdentifiers.id_sha224); |
| + // BEGIN android-removed |
| + // digestOids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, NISTObjectIdentifiers.id_sha224); |
| + // END android-removed |
| digestOids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, NISTObjectIdentifiers.id_sha256); |
| digestOids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, NISTObjectIdentifiers.id_sha384); |
| digestOids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, NISTObjectIdentifiers.id_sha512); |
| - digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2); |
| - digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4); |
| + // BEGIN android-removed |
| + // digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2); |
| + // digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4); |
| + // END android-removed |
| digestOids.put(PKCSObjectIdentifiers.md5WithRSAEncryption, PKCSObjectIdentifiers.md5); |
| digestOids.put(PKCSObjectIdentifiers.sha1WithRSAEncryption, OIWObjectIdentifiers.idSHA1); |
| - digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128); |
| - digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160); |
| - digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256); |
| - digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411); |
| - digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411); |
| + // BEGIN android-removed |
| + // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128); |
| + // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160); |
| + // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256); |
| + // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411); |
| + // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411); |
| + // END android-removed |
| } |
| |
| private static AlgorithmIdentifier generate(String signatureAlgorithm) |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/operator/bc/BcUtil.java bcpkix-jdk15on-148/org/bouncycastle/operator/bc/BcUtil.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/operator/bc/BcUtil.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/operator/bc/BcUtil.java 2012-09-17 23:04:47.000000000 +0000 |
| @@ -1,21 +1,29 @@ |
| package org.bouncycastle.operator.bc; |
| |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers; |
| import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; |
| import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers; |
| import org.bouncycastle.asn1.x509.AlgorithmIdentifier; |
| import org.bouncycastle.crypto.Digest; |
| -import org.bouncycastle.crypto.digests.GOST3411Digest; |
| -import org.bouncycastle.crypto.digests.MD2Digest; |
| -import org.bouncycastle.crypto.digests.MD4Digest; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.crypto.digests.GOST3411Digest; |
| +// import org.bouncycastle.crypto.digests.MD2Digest; |
| +// import org.bouncycastle.crypto.digests.MD4Digest; |
| +// END android-removed |
| import org.bouncycastle.crypto.digests.MD5Digest; |
| -import org.bouncycastle.crypto.digests.RIPEMD128Digest; |
| -import org.bouncycastle.crypto.digests.RIPEMD160Digest; |
| -import org.bouncycastle.crypto.digests.RIPEMD256Digest; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.crypto.digests.RIPEMD128Digest; |
| +// import org.bouncycastle.crypto.digests.RIPEMD160Digest; |
| +// import org.bouncycastle.crypto.digests.RIPEMD256Digest; |
| +// END android-removed |
| import org.bouncycastle.crypto.digests.SHA1Digest; |
| -import org.bouncycastle.crypto.digests.SHA224Digest; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.crypto.digests.SHA224Digest; |
| +// END android-removed |
| import org.bouncycastle.crypto.digests.SHA256Digest; |
| import org.bouncycastle.crypto.digests.SHA384Digest; |
| import org.bouncycastle.crypto.digests.SHA512Digest; |
| @@ -32,10 +40,12 @@ |
| { |
| dig = new SHA1Digest(); |
| } |
| - else if (digAlg.getAlgorithm().equals(NISTObjectIdentifiers.id_sha224)) |
| - { |
| - dig = new SHA224Digest(); |
| - } |
| + // BEGIN android-removed |
| + // else if (digAlg.getAlgorithm().equals(NISTObjectIdentifiers.id_sha224)) |
| + // { |
| + // dig = new SHA224Digest(); |
| + // } |
| + // END android-removed |
| else if (digAlg.getAlgorithm().equals(NISTObjectIdentifiers.id_sha256)) |
| { |
| dig = new SHA256Digest(); |
| @@ -52,30 +62,32 @@ |
| { |
| dig = new MD5Digest(); |
| } |
| - else if (digAlg.getAlgorithm().equals(PKCSObjectIdentifiers.md4)) |
| - { |
| - dig = new MD4Digest(); |
| - } |
| - else if (digAlg.getAlgorithm().equals(PKCSObjectIdentifiers.md2)) |
| - { |
| - dig = new MD2Digest(); |
| - } |
| - else if (digAlg.getAlgorithm().equals(CryptoProObjectIdentifiers.gostR3411)) |
| - { |
| - dig = new GOST3411Digest(); |
| - } |
| - else if (digAlg.getAlgorithm().equals(TeleTrusTObjectIdentifiers.ripemd128)) |
| - { |
| - dig = new RIPEMD128Digest(); |
| - } |
| - else if (digAlg.getAlgorithm().equals(TeleTrusTObjectIdentifiers.ripemd160)) |
| - { |
| - dig = new RIPEMD160Digest(); |
| - } |
| - else if (digAlg.getAlgorithm().equals(TeleTrusTObjectIdentifiers.ripemd256)) |
| - { |
| - dig = new RIPEMD256Digest(); |
| - } |
| + // BEGIN android-removed |
| + // else if (digAlg.getAlgorithm().equals(PKCSObjectIdentifiers.md4)) |
| + // { |
| + // dig = new MD4Digest(); |
| + // } |
| + // else if (digAlg.getAlgorithm().equals(PKCSObjectIdentifiers.md2)) |
| + // { |
| + // dig = new MD2Digest(); |
| + // } |
| + // else if (digAlg.getAlgorithm().equals(CryptoProObjectIdentifiers.gostR3411)) |
| + // { |
| + // dig = new GOST3411Digest(); |
| + // } |
| + // else if (digAlg.getAlgorithm().equals(TeleTrusTObjectIdentifiers.ripemd128)) |
| + // { |
| + // dig = new RIPEMD128Digest(); |
| + // } |
| + // else if (digAlg.getAlgorithm().equals(TeleTrusTObjectIdentifiers.ripemd160)) |
| + // { |
| + // dig = new RIPEMD160Digest(); |
| + // } |
| + // else if (digAlg.getAlgorithm().equals(TeleTrusTObjectIdentifiers.ripemd256)) |
| + // { |
| + // dig = new RIPEMD256Digest(); |
| + // } |
| + // END android-removed |
| else |
| { |
| throw new OperatorCreationException("cannot recognise digest"); |
| diff -Naur bcpkix-jdk15on-148.orig/org/bouncycastle/operator/jcajce/OperatorHelper.java bcpkix-jdk15on-148/org/bouncycastle/operator/jcajce/OperatorHelper.java |
| --- bcpkix-jdk15on-148.orig/org/bouncycastle/operator/jcajce/OperatorHelper.java 2013-02-08 17:54:18.000000000 +0000 |
| +++ bcpkix-jdk15on-148/org/bouncycastle/operator/jcajce/OperatorHelper.java 2013-01-31 02:26:40.000000000 +0000 |
| @@ -20,7 +20,9 @@ |
| import org.bouncycastle.asn1.ASN1Encodable; |
| import org.bouncycastle.asn1.ASN1ObjectIdentifier; |
| import org.bouncycastle.asn1.DERNull; |
| -import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// BEGIN android-removed |
| +// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers; |
| +// END android-removed |
| import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers; |
| import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; |
| import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers; |
| @@ -47,24 +49,34 @@ |
| // reverse mappings |
| // |
| oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.5"), "SHA1WITHRSA"); |
| - oids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224WITHRSA"); |
| + // BEGIN android-removed |
| + // oids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224WITHRSA"); |
| + // END android-removed |
| oids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, "SHA256WITHRSA"); |
| oids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, "SHA384WITHRSA"); |
| oids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, "SHA512WITHRSA"); |
| - oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410"); |
| - oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410"); |
| + // BEGIN android-removed |
| + // oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410"); |
| + // oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410"); |
| + // END android-removed |
| |
| oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.4"), "MD5WITHRSA"); |
| - oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"), "MD2WITHRSA"); |
| + // BEGIN android-removed |
| + // oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"), "MD2WITHRSA"); |
| + // END android-removed |
| oids.put(new ASN1ObjectIdentifier("1.2.840.10040.4.3"), "SHA1WITHDSA"); |
| oids.put(X9ObjectIdentifiers.ecdsa_with_SHA1, "SHA1WITHECDSA"); |
| - oids.put(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224WITHECDSA"); |
| + // BEGIN android-removed |
| + // oids.put(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224WITHECDSA"); |
| + // END android-removed |
| oids.put(X9ObjectIdentifiers.ecdsa_with_SHA256, "SHA256WITHECDSA"); |
| oids.put(X9ObjectIdentifiers.ecdsa_with_SHA384, "SHA384WITHECDSA"); |
| oids.put(X9ObjectIdentifiers.ecdsa_with_SHA512, "SHA512WITHECDSA"); |
| oids.put(OIWObjectIdentifiers.sha1WithRSA, "SHA1WITHRSA"); |
| oids.put(OIWObjectIdentifiers.dsaWithSHA1, "SHA1WITHDSA"); |
| - oids.put(NISTObjectIdentifiers.dsa_with_sha224, "SHA224WITHDSA"); |
| + // BEGIN android-removed |
| + // oids.put(NISTObjectIdentifiers.dsa_with_sha224, "SHA224WITHDSA"); |
| + // END android-removed |
| oids.put(NISTObjectIdentifiers.dsa_with_sha256, "SHA256WITHDSA"); |
| |
| oids.put(OIWObjectIdentifiers.idSHA1, "SHA-1"); |
| @@ -305,10 +317,12 @@ |
| { |
| return "SHA1"; |
| } |
| - else if (NISTObjectIdentifiers.id_sha224.equals(digestAlgOID)) |
| - { |
| - return "SHA224"; |
| - } |
| + // BEGIN android-removed |
| + // else if (NISTObjectIdentifiers.id_sha224.equals(digestAlgOID)) |
| + // { |
| + // return "SHA224"; |
| + // } |
| + // END android-removed |
| else if (NISTObjectIdentifiers.id_sha256.equals(digestAlgOID)) |
| { |
| return "SHA256"; |
| @@ -321,22 +335,24 @@ |
| { |
| return "SHA512"; |
| } |
| - else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID)) |
| - { |
| - return "RIPEMD128"; |
| - } |
| - else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID)) |
| - { |
| - return "RIPEMD160"; |
| - } |
| - else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID)) |
| - { |
| - return "RIPEMD256"; |
| - } |
| - else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID)) |
| - { |
| - return "GOST3411"; |
| - } |
| + // BEGIN android-removed |
| + // else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID)) |
| + // { |
| + // return "RIPEMD128"; |
| + // } |
| + // else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID)) |
| + // { |
| + // return "RIPEMD160"; |
| + // } |
| + // else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID)) |
| + // { |
| + // return "RIPEMD256"; |
| + // } |
| + // else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID)) |
| + // { |
| + // return "GOST3411"; |
| + // } |
| + // END android-removed |
| else |
| { |
| return digestAlgOID.getId(); |
