diff options
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java index 82f1f94..05fced0 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java @@ -13,12 +13,10 @@ public interface PKCSObjectIdentifiers static final ASN1ObjectIdentifier pkcs_1 = new ASN1ObjectIdentifier("1.2.840.113549.1.1"); /** PKCS#1: 1.2.840.113549.1.1.1 */ static final ASN1ObjectIdentifier rsaEncryption = pkcs_1.branch("1"); - // BEGIN android-removed - // /** PKCS#1: 1.2.840.113549.1.1.2 */ - // static final ASN1ObjectIdentifier md2WithRSAEncryption = pkcs_1.branch("2"); - // /** PKCS#1: 1.2.840.113549.1.1.3 */ - // static final ASN1ObjectIdentifier md4WithRSAEncryption = pkcs_1.branch("3"); - // END android-removed + /** PKCS#1: 1.2.840.113549.1.1.2 */ + static final ASN1ObjectIdentifier md2WithRSAEncryption = pkcs_1.branch("2"); + /** PKCS#1: 1.2.840.113549.1.1.3 */ + static final ASN1ObjectIdentifier md4WithRSAEncryption = pkcs_1.branch("3"); /** PKCS#1: 1.2.840.113549.1.1.4 */ static final ASN1ObjectIdentifier md5WithRSAEncryption = pkcs_1.branch("4"); /** PKCS#1: 1.2.840.113549.1.1.5 */ @@ -98,19 +96,15 @@ public interface PKCSObjectIdentifiers // md2 OBJECT IDENTIFIER ::= // {iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 2} // - // BEGIN android-removed - // /** 1.2.840.113549.2.2 */ - // static final ASN1ObjectIdentifier md2 = digestAlgorithm.branch("2"); - // END android-removed + /** 1.2.840.113549.2.2 */ + static final ASN1ObjectIdentifier md2 = digestAlgorithm.branch("2"); // // md4 OBJECT IDENTIFIER ::= // {iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 4} // - // BEGIN android-removed - // /** 1.2.840.113549.2.4 */ - // static final ASN1ObjectIdentifier md4 = digestAlgorithm.branch("4"); - // END android-removed + /** 1.2.840.113549.2.4 */ + static final ASN1ObjectIdentifier md4 = digestAlgorithm.branch("4"); // // md5 OBJECT IDENTIFIER ::= |