diff options
author | Pete Bentley <prb@google.com> | 2019-05-08 20:27:29 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-05-08 20:27:29 -0700 |
commit | 6ffc8e8a398cbd3699e6165a420923ce55cc7373 (patch) | |
tree | d340bc55054256c77d035d599485ba4c4d7110cd | |
parent | e912f01acba9562a617b0ab0169c1a44c94fd8db (diff) | |
parent | 7f368592677d262880b2016bddc3ce29f9c459cf (diff) | |
download | bouncycastle-android-10.0.0_r18.tar.gz |
Upstream partner request to add BC methods to core platform API.android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release
am: 7f36859267
Change-Id: I984b1a3ea99bfbfefd1b55deb7919a211048625c
4 files changed, 6 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) { diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt index d0dad67e..394f7d96 100644 --- a/srcgen/core-platform-api.txt +++ b/srcgen/core-platform-api.txt @@ -1,5 +1,6 @@ field:com.android.org.bouncycastle.asn1.DERNull#INSTANCE field:com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers#sha256WithRSAEncryption +field:com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers#sha512WithRSAEncryption field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#C field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#CN field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#E @@ -84,6 +85,7 @@ method:com.android.org.bouncycastle.jcajce.util.DefaultJcaJceHelper#createCipher method:com.android.org.bouncycastle.jce.provider.BouncyCastleProvider#BouncyCastleProvider() method:com.android.org.bouncycastle.jce.provider.X509CertificateObject#X509CertificateObject(com.android.org.bouncycastle.asn1.x509.Certificate) method:com.android.org.bouncycastle.jce.X509Principal#X509Principal(byte[]) +method:com.android.org.bouncycastle.jce.X509Principal#X509Principal(Vector,Hashtable) method:com.android.org.bouncycastle.util.io.pem.PemHeader#PemHeader(String,String) method:com.android.org.bouncycastle.util.io.pem.PemObject#getContent() method:com.android.org.bouncycastle.util.io.pem.PemObject#getType() @@ -94,6 +96,7 @@ method:com.android.org.bouncycastle.util.io.pem.PemReader#readPemObject() method:com.android.org.bouncycastle.util.io.pem.PemWriter#PemWriter(Writer) method:com.android.org.bouncycastle.util.io.pem.PemWriter#writeObject(PemObjectGenerator) method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#generate(PrivateKey,String) +method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setIssuerDN(X500Principal) method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setNotAfter(Date) method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setNotBefore(Date) method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setPublicKey(PublicKey) |