diff options
| author | Pete Bentley <prb@google.com> | 2019-05-08 19:17:53 +0100 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2019-05-08 19:17:53 +0100 |
| commit | 5df38692a9fc3ba2f140f1d98c6dff424c398615 (patch) | |
| tree | 620265651400713895b76c4088f5adec6bf1af04 /repackaged/bcprov/src/main | |
| parent | fc3983f6a4c9491d0c7a86408f3336ded3f98c27 (diff) | |
| download | bouncycastle-5df38692a9fc3ba2f140f1d98c6dff424c398615.tar.gz | |
Upstream partner request to add BC methods to core platform API.
This change adds methods and a field inadvertently missed in
http://r.android.com/954559
Bug: 129665886
Bug: 129440746
Test: m && flashall
Change-Id: Ia31cb34b09a6759da739b821deba7f0e82a57041
Diffstat (limited to 'repackaged/bcprov/src/main')
3 files changed, 3 insertions, 0 deletions
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java index 98155aa8..ba5231fd 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java @@ -45,6 +45,7 @@ public interface PKCSObjectIdentifiers /** PKCS#1: 1.2.840.113549.1.1.12 */ ASN1ObjectIdentifier sha384WithRSAEncryption = pkcs_1.branch("12"); /** PKCS#1: 1.2.840.113549.1.1.13 */ + @libcore.api.CorePlatformApi ASN1ObjectIdentifier sha512WithRSAEncryption = pkcs_1.branch("13"); /** PKCS#1: 1.2.840.113549.1.1.14 */ ASN1ObjectIdentifier sha224WithRSAEncryption = pkcs_1.branch("14"); diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/X509Principal.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/X509Principal.java index 49f22c4a..6aa4cf3e 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/X509Principal.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/X509Principal.java @@ -89,6 +89,7 @@ public class X509Principal * <p> * it's is assumed the table contains OID/String pairs. */ + @libcore.api.CorePlatformApi public X509Principal( Vector ordering, Hashtable attributes) diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V1CertificateGenerator.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V1CertificateGenerator.java index 54e198da..0ce75691 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V1CertificateGenerator.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V1CertificateGenerator.java @@ -85,6 +85,7 @@ public class X509V1CertificateGenerator * Set the issuer distinguished name - the issuer is the entity whose private key is used to sign the * certificate. */ + @libcore.api.CorePlatformApi public void setIssuerDN( X500Principal issuer) { |