summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2018-10-15 09:40:44 +0100
committerNeil Fuller <nfuller@google.com>2018-10-15 09:43:47 +0100
commit95e1fddea278ec6d95cd15cde9129f07356f5360 (patch)
tree43caa90f9c4adf7ad3d73363e170a7d31393381f
parentd15e4b4fa1e9d0876827ad4fec078aa78a6ef36a (diff)
downloadbouncycastle-95e1fddea278ec6d95cd15cde9129f07356f5360.tar.gz
Add more bouncycastle to the @CorePlatformApi
Add constructor needed by wycheproof tests to the @CorePlatformApi so that they will be able to build against the stubs. Bug: 113148576 Test: build Change-Id: Iac19ae1992889fe0eba7d4fab8b75f65151cbe03
-rw-r--r--android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java2
-rw-r--r--srcgen/core-platform-api.txt2
2 files changed, 4 insertions, 0 deletions
diff --git a/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
index ae83cc64..78e548e0 100644
--- a/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/android_bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -44,6 +44,7 @@ import com.android.org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConver
* test for getInstance works.
* @hide This class is not part of the Android public SDK API
*/
+@libcore.api.CorePlatformApi
public final class BouncyCastleProvider extends Provider
implements ConfigurableProvider
{
@@ -140,6 +141,7 @@ public final class BouncyCastleProvider extends Provider
* using runtime registration of the provider using the
* <code>Security.addProvider()</code> mechanism.
*/
+ @libcore.api.CorePlatformApi
public BouncyCastleProvider()
{
super(PROVIDER_NAME, 1.57, info);
diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt
index cdc90495..909f922e 100644
--- a/srcgen/core-platform-api.txt
+++ b/srcgen/core-platform-api.txt
@@ -43,6 +43,7 @@ method:com.android.org.bouncycastle.asn1.x509.X509Name#X509Name(String)
method:com.android.org.bouncycastle.asn1.x509.X509Name#getInstance(Object)
method:com.android.org.bouncycastle.asn1.x509.X509Name#toString(boolean,Hashtable)
method:com.android.org.bouncycastle.jce.X509Principal#X509Principal(byte[])
+method:com.android.org.bouncycastle.jce.provider.BouncyCastleProvider#BouncyCastleProvider()
method:com.android.org.bouncycastle.util.io.pem.PemObject#getContent()
method:com.android.org.bouncycastle.util.io.pem.PemObject#getType()
method:com.android.org.bouncycastle.util.io.pem.PemObject#PemObject(String,byte[])
@@ -82,6 +83,7 @@ type:com.android.org.bouncycastle.asn1.x509.Time
type:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator
type:com.android.org.bouncycastle.asn1.x509.X509Name
type:com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers
+type:com.android.org.bouncycastle.jce.provider.BouncyCastleProvider
type:com.android.org.bouncycastle.jce.provider.X509CertificateObject
type:com.android.org.bouncycastle.jce.X509Principal
type:com.android.org.bouncycastle.util.io.pem.PemObject