Merge "More required bouncycastle Core Platform APIs"master-cuttlefish-testing-release

4 files changed, 14 insertions, 0 deletions

diff --git a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java
index 4cac0e38..b10f9975 100644
--- a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java
+++ b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java
@@ -100,6 +100,7 @@ import com.android.org.bouncycastle.util.encoders.Hex;
  * </p>
  * @hide This class is not part of the Android public SDK API
  */
+@libcore.api.CorePlatformApi
 public abstract class ASN1OctetString
     extends ASN1Primitive
     implements ASN1OctetStringParser
@@ -208,11 +209,13 @@ public abstract class ASN1OctetString
      *
      * @return the byte[] representing the OCTET STRING's content.
      */
+    @libcore.api.CorePlatformApi
     public byte[] getOctets()
     {
         return string;
     }
 
+    @libcore.api.CorePlatformApi
     public int hashCode()
     {
         return Arrays.hashCode(this.getOctets());
diff --git a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java
index 655888b3..a138e517 100644
--- a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java
+++ b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java
@@ -7,6 +7,7 @@ import java.io.IOException;
  * Carrier class for a DER encoding OCTET STRING
  * @hide This class is not part of the Android public SDK API
  */
+@libcore.api.CorePlatformApi
 public class DEROctetString
     extends ASN1OctetString
 {
diff --git a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java
index cd52cc07..e61cf0fd 100644
--- a/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java
+++ b/android_bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java
@@ -15,6 +15,7 @@ import com.android.org.bouncycastle.asn1.DERSequence;
 /**
  * @hide This class is not part of the Android public SDK API
  */
+@libcore.api.CorePlatformApi
 public class BasicConstraints
     extends ASN1Object
 {
@@ -28,6 +29,7 @@ public class BasicConstraints
         return getInstance(ASN1Sequence.getInstance(obj, explicit));
     }
 
+    @libcore.api.CorePlatformApi
     public static BasicConstraints getInstance(
         Object  obj)
     {
@@ -111,6 +113,7 @@ public class BasicConstraints
         this.pathLenConstraint = new ASN1Integer(pathLenConstraint);
     }
 
+    @libcore.api.CorePlatformApi
     public boolean isCA()
     {
         return (cA != null) && cA.isTrue();
diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt
index ee9a35ee..cdc90495 100644
--- a/srcgen/core-platform-api.txt
+++ b/srcgen/core-platform-api.txt
@@ -12,6 +12,8 @@ method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(byte[])
 method:com.android.org.bouncycastle.asn1.ASN1InputStream#readObject()
 method:com.android.org.bouncycastle.asn1.ASN1Integer#ASN1Integer(BigInteger)
 method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#getId()
+method:com.android.org.bouncycastle.asn1.ASN1OctetString#getOctets()
+method:com.android.org.bouncycastle.asn1.ASN1OctetString#hashCode()
 method:com.android.org.bouncycastle.asn1.DERBitString#DERBitString(byte[])
 method:com.android.org.bouncycastle.asn1.DERInteger#DERInteger(long)
 method:com.android.org.bouncycastle.asn1.DERSequence#DERSequence()
@@ -21,6 +23,8 @@ method:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo#getPrivateKeyAlgori
 method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#getAlgorithm()
 method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#AlgorithmIdentifier(ASN1ObjectIdentifier)
 method:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier#AlgorithmIdentifier(ASN1ObjectIdentifier,ASN1Encodable)
+method:com.android.org.bouncycastle.asn1.x509.BasicConstraints#getInstance(Object)
+method:com.android.org.bouncycastle.asn1.x509.BasicConstraints#isCA()
 method:com.android.org.bouncycastle.asn1.x509.Certificate#getInstance(Object)
 method:com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo#getInstance(Object)
 method:com.android.org.bouncycastle.asn1.x509.Time#Time(Date)
@@ -60,14 +64,17 @@ type:com.android.org.bouncycastle.asn1.ASN1EncodableVector
 type:com.android.org.bouncycastle.asn1.ASN1InputStream
 type:com.android.org.bouncycastle.asn1.ASN1Integer
 type:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier
+type:com.android.org.bouncycastle.asn1.ASN1OctetString
 type:com.android.org.bouncycastle.asn1.ASN1Primitive
 type:com.android.org.bouncycastle.asn1.DERBitString
 type:com.android.org.bouncycastle.asn1.DERInteger
 type:com.android.org.bouncycastle.asn1.DERNull
+type:com.android.org.bouncycastle.asn1.DEROctetString
 type:com.android.org.bouncycastle.asn1.DERSequence
 type:com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers
 type:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo
 type:com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier
+type:com.android.org.bouncycastle.asn1.x509.BasicConstraints
 type:com.android.org.bouncycastle.asn1.x509.Certificate
 type:com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
 type:com.android.org.bouncycastle.asn1.x509.TBSCertificate