diff options
| author | Pete Bentley <prb@google.com> | 2019-05-08 19:17:53 +0100 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2019-05-09 01:18:50 +0100 |
| commit | 7f368592677d262880b2016bddc3ce29f9c459cf (patch) | |
| tree | d340bc55054256c77d035d599485ba4c4d7110cd /repackaged/bcprov/src | |
| parent | fa8c9cdbe04a06ea02a04cef4e81b8dc70e08113 (diff) | |
| download | bouncycastle-android10-c2f2-release.tar.gz | |
Upstream partner request to add BC methods to core platform API.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
This change adds methods and a field inadvertently missed in
http://r.android.com/954559 and http://ag/7277168
Bug: 129665886
Bug: 129440746
Test: m && flashall
Change-Id: Ia31cb34b09a6759da739b821deba7f0e82a57041
Merged-in: Ia31cb34b09a6759da739b821deba7f0e82a57041
(cherry picked from commit 5df38692a9fc3ba2f140f1d98c6dff424c398615)
Diffstat (limited to 'repackaged/bcprov/src')
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) { |