Snap for 5558509 from 7f368592677d262880b2016bddc3ce29f9c459cf to qt-release
Change-Id: I2c7a800d1a3d2e355e7a374384cdffd6ae7c6a87
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 98155aa..ba5231f 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 @@
/** 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 49f22c4..6aa4cf3 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 @@
* <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 54e198d..0ce7569 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 @@
* 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 d0dad67..394f7d9 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.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.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)
