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)

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)