Remove CorePlatformApi annotation from BouncyCastle am: 7b7841790c am: 50ac609810

Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/1561875

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8677961553d4d6c7f4c5095aeb895789215894e0

51 files changed, 0 insertions, 342 deletions

diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1BitString.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1BitString.java
index 9975e8fa..7324c5f4 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1BitString.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1BitString.java
@@ -13,7 +13,6 @@ import com.android.org.bouncycastle.util.io.Streams;
  * Base class for BIT STRING objects
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1BitString
     extends ASN1Primitive
     implements ASN1String
@@ -214,7 +213,6 @@ public abstract class ASN1BitString
         return getString();
     }
 
-    @libcore.api.CorePlatformApi
     public int hashCode()
     {
         return padBits ^ Arrays.hashCode(this.getBytes());
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Encodable.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Encodable.java
index aa0f2a18..9c9eceac 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Encodable.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Encodable.java
@@ -5,7 +5,6 @@ package com.android.org.bouncycastle.asn1;
  * Basic interface to produce serialisers for ASN.1 encodings.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public interface ASN1Encodable
 {
     /**
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1EncodableVector.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1EncodableVector.java
index 3715a948..3e49d657 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1EncodableVector.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1EncodableVector.java
@@ -8,7 +8,6 @@ import java.util.Vector;
  * Mutable class for building ASN.1 constructed objects such as SETs or SEQUENCEs.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class ASN1EncodableVector
 {
     private final Vector v = new Vector();
@@ -17,7 +16,6 @@ public class ASN1EncodableVector
      * Base constructor.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public ASN1EncodableVector()
     {
     }
@@ -28,7 +26,6 @@ public class ASN1EncodableVector
      * @param obj the encodable to add.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void add(ASN1Encodable obj)
     {
         v.addElement(obj);
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1InputStream.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1InputStream.java
index 99ce8d6d..4f919b02 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1InputStream.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1InputStream.java
@@ -16,7 +16,6 @@ import com.android.org.bouncycastle.util.io.Streams;
  * returned.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class ASN1InputStream
     extends FilterInputStream
     implements BERTags
@@ -27,7 +26,6 @@ public class ASN1InputStream
     private final byte[][] tmpBuffers;
 
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    @libcore.api.CorePlatformApi
     public ASN1InputStream(
         InputStream is)
     {
@@ -41,7 +39,6 @@ public class ASN1InputStream
      * @param input array containing ASN.1 encoded data.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public ASN1InputStream(
         byte[] input)
     {
@@ -218,7 +215,6 @@ public class ASN1InputStream
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public ASN1Primitive readObject()
         throws IOException
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Integer.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Integer.java
index 07919e07..52e5ca43 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Integer.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Integer.java
@@ -11,7 +11,6 @@ import com.android.org.bouncycastle.util.Properties;
  * Class representing the ASN.1 INTEGER type.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class ASN1Integer
     extends ASN1Primitive
 {
@@ -90,7 +89,6 @@ public class ASN1Integer
      * @param value the BigInteger representing the value desired.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public ASN1Integer(
         BigInteger value)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Null.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Null.java
index a0876fc7..e6dcdf9d 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Null.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Null.java
@@ -10,7 +10,6 @@ import java.io.IOException;
  * A NULL object - use DERNull.INSTANCE for populating structures.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1Null
     extends ASN1Primitive
 {
@@ -60,7 +59,6 @@ public abstract class ASN1Null
         return null;
     }
 
-    @libcore.api.CorePlatformApi
     public int hashCode()
     {
         return -1;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java
index c8afd018..4f3f5bbc 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Object.java
@@ -10,11 +10,9 @@ import com.android.org.bouncycastle.util.Encodable;
  * Base class for defining an ASN.1 object.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1Object
     implements ASN1Encodable, Encodable
 {
-    @libcore.api.CorePlatformApi
     public ASN1Object() {
     }
 
@@ -24,7 +22,6 @@ public abstract class ASN1Object
      * @return BER/DER byte encoded object.
      * @throws java.io.IOException on encoding error.
      */
-    @libcore.api.CorePlatformApi
     public byte[] getEncoded()
         throws IOException
     {
@@ -43,7 +40,6 @@ public abstract class ASN1Object
      * @return byte encoded object.
      * @throws IOException on encoding error.
      */
-    @libcore.api.CorePlatformApi
     public byte[] getEncoded(
         String encoding)
         throws IOException
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1ObjectIdentifier.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1ObjectIdentifier.java
index d49d4c80..25980b40 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1ObjectIdentifier.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1ObjectIdentifier.java
@@ -13,7 +13,6 @@ import com.android.org.bouncycastle.util.Arrays;
  * Class representing the ASN.1 OBJECT IDENTIFIER type.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class ASN1ObjectIdentifier
     extends ASN1Primitive
 {
@@ -28,7 +27,6 @@ public class ASN1ObjectIdentifier
      * @return an ASN1ObjectIdentifier instance, or null.
      * @throws IllegalArgumentException if the object cannot be converted.
      */
-    @libcore.api.CorePlatformApi
     public static ASN1ObjectIdentifier getInstance(
         Object obj)
     {
@@ -174,7 +172,6 @@ public class ASN1ObjectIdentifier
      *
      * @param identifier a string representation of an OID.
      */
-    @libcore.api.CorePlatformApi
     public ASN1ObjectIdentifier(
         String identifier)
     {
@@ -212,7 +209,6 @@ public class ASN1ObjectIdentifier
      *
      * @return the string representation of the OID carried by this object.
      */
-    @libcore.api.CorePlatformApi
     public String getId()
     {
         return identifier;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java
index ded2e140..d6e81e28 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1OctetString.java
@@ -98,7 +98,6 @@ import com.android.org.bouncycastle.util.encoders.Hex;
  * (Contrast with 8.21.6.)
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1OctetString
     extends ASN1Primitive
     implements ASN1OctetStringParser
@@ -207,13 +206,11 @@ 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/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Primitive.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Primitive.java
index 8ad3a8b2..b272f944 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Primitive.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Primitive.java
@@ -7,7 +7,6 @@ import java.io.IOException;
  * Base class for ASN.1 primitive objects. These are the actual objects used to generate byte encodings.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1Primitive
     extends ASN1Object
 {
@@ -23,7 +22,6 @@ public abstract class ASN1Primitive
      * @return the base ASN.1 object represented by the byte stream.
      * @exception IOException if there is a problem parsing the data, or parsing the stream did not exhaust the available data.
      */
-    @libcore.api.CorePlatformApi
     public static ASN1Primitive fromByteArray(byte[] data)
         throws IOException
     {
@@ -56,7 +54,6 @@ public abstract class ASN1Primitive
         return (o instanceof ASN1Encodable) && asn1Equals(((ASN1Encodable)o).toASN1Primitive());
     }
 
-    @libcore.api.CorePlatformApi
     public ASN1Primitive toASN1Primitive()
     {
         return this;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Sequence.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Sequence.java
index e84992f7..99196c2c 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Sequence.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1Sequence.java
@@ -58,7 +58,6 @@ import com.android.org.bouncycastle.util.Arrays;
  * </p>
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1Sequence
     extends ASN1Primitive
     implements com.android.org.bouncycastle.util.Iterable<ASN1Encodable>
@@ -277,7 +276,6 @@ public abstract class ASN1Sequence
      * @param index the sequence number (starting at zero) of the object
      * @return the object at the sequence position indicated by index.
      */
-    @libcore.api.CorePlatformApi
     public ASN1Encodable getObjectAt(
         int index)
     {
@@ -289,13 +287,11 @@ public abstract class ASN1Sequence
      *
      * @return the number of objects in this sequence.
      */
-    @libcore.api.CorePlatformApi
     public int size()
     {
         return seq.size();
     }
 
-    @libcore.api.CorePlatformApi
     public int hashCode()
     {
         Enumeration             e = this.getObjects();
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1TaggedObject.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1TaggedObject.java
index 809173bd..41b3e468 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1TaggedObject.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/ASN1TaggedObject.java
@@ -9,7 +9,6 @@ import java.io.IOException;
  * rules (as with sequences).
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class ASN1TaggedObject
     extends ASN1Primitive
     implements ASN1TaggedObjectParser
@@ -129,7 +128,6 @@ public abstract class ASN1TaggedObject
         return true;
     }
     
-    @libcore.api.CorePlatformApi
     public int hashCode()
     {
         int code = tagNo;
@@ -183,7 +181,6 @@ public abstract class ASN1TaggedObject
      * trying to extract a tagged object you should be going via the
      * appropriate getInstance method.
      */
-    @libcore.api.CorePlatformApi
     public ASN1Primitive getObject()
     {
         if (obj != null)
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERBitString.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERBitString.java
index ab740061..d482549f 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERBitString.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERBitString.java
@@ -7,7 +7,6 @@ import java.io.IOException;
  * A BIT STRING with DER encoding - the first byte contains the count of padding bits included in the byte array's last byte.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class DERBitString
     extends ASN1BitString
 {
@@ -98,7 +97,6 @@ public class DERBitString
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public DERBitString(
         byte[]  data)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERNull.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERNull.java
index a86a335b..fba340db 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERNull.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERNull.java
@@ -9,12 +9,10 @@ import java.io.IOException;
  * Preferably use the constant:  DERNull.INSTANCE.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class DERNull
     extends ASN1Null
 {
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public static final DERNull INSTANCE = new DERNull();
 
     private static final byte[]  zeroBytes = new byte[0];
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java
index bd635cd0..859b5147 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROctetString.java
@@ -7,7 +7,6 @@ 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
 {
@@ -17,7 +16,6 @@ public class DEROctetString
      * @param string the octets making up the octet string.
      */
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    @libcore.api.CorePlatformApi
     public DEROctetString(
         byte[]  string)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSequence.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSequence.java
index 92697c91..f169aa15 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSequence.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSequence.java
@@ -11,7 +11,6 @@ import java.util.Enumeration;
  * For X.690 syntax rules, see {@link ASN1Sequence}.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class DERSequence
     extends ASN1Sequence
 {
@@ -21,7 +20,6 @@ public class DERSequence
      * Create an empty sequence
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public DERSequence()
     {
     }
@@ -41,7 +39,6 @@ public class DERSequence
      * @param v the vector of objects to make up the sequence.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public DERSequence(
         ASN1EncodableVector v)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERTaggedObject.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERTaggedObject.java
index 8f78e310..db19ce1e 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERTaggedObject.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERTaggedObject.java
@@ -9,7 +9,6 @@ import java.io.IOException;
  * rules (as with sequences).
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class DERTaggedObject
     extends ASN1TaggedObject
 {
@@ -28,7 +27,6 @@ public class DERTaggedObject
         super(explicit, tagNo, obj);
     }
 
-    @libcore.api.CorePlatformApi
     public DERTaggedObject(int tagNo, ASN1Encodable encodable)
     {
         super(true, tagNo, encodable);
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERUTF8String.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERUTF8String.java
index d4f15bf9..bbf74927 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERUTF8String.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERUTF8String.java
@@ -10,7 +10,6 @@ import com.android.org.bouncycastle.util.Strings;
  * DER UTF8String object.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class DERUTF8String
     extends ASN1Primitive
     implements ASN1String
@@ -89,13 +88,11 @@ public class DERUTF8String
      *
      * @param string the string to be carried in the UTF8String object,
      */
-    @libcore.api.CorePlatformApi
     public DERUTF8String(String string)
     {
         this.string = Strings.toUTF8ByteArray(string);
     }
 
-    @libcore.api.CorePlatformApi
     public String getString()
     {
         return Strings.fromUTF8ByteArray(string);
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 717c6f77..dc4c4622 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
@@ -9,7 +9,6 @@ import com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier;
  * @hide This class is not part of the Android public SDK API
  *
  */
-@libcore.api.CorePlatformApi
 public interface PKCSObjectIdentifiers
 {
     /** PKCS#1: 1.2.840.113549.1.1 */
@@ -40,12 +39,10 @@ public interface PKCSObjectIdentifiers
     ASN1ObjectIdentifier    id_RSASSA_PSS             = pkcs_1.branch("10");
     /** PKCS#1: 1.2.840.113549.1.1.11 */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     ASN1ObjectIdentifier    sha256WithRSAEncryption   = pkcs_1.branch("11");
     /** 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/asn1/pkcs/PrivateKeyInfo.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java
index 56743253..8fa82566 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/pkcs/PrivateKeyInfo.java
@@ -60,7 +60,6 @@ import com.android.org.bouncycastle.util.BigIntegers;
  *  </pre>
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class PrivateKeyInfo
     extends ASN1Object
 {
@@ -75,7 +74,6 @@ public class PrivateKeyInfo
         return getInstance(ASN1Sequence.getInstance(obj, explicit));
     }
 
-    @libcore.api.CorePlatformApi
     public static PrivateKeyInfo getInstance(Object obj)
     {
         if (obj instanceof PrivateKeyInfo)
@@ -185,13 +183,11 @@ public class PrivateKeyInfo
         return attributes;
     }
 
-    @libcore.api.CorePlatformApi
     public AlgorithmIdentifier getPrivateKeyAlgorithm()
     {
         return privateKeyAlgorithm;
     }
 
-    @libcore.api.CorePlatformApi
     public ASN1Encodable parsePrivateKey()
         throws IOException
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x500/style/BCStyle.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x500/style/BCStyle.java
index 25aaa033..a7671ff4 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x500/style/BCStyle.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x500/style/BCStyle.java
@@ -17,26 +17,22 @@ import com.android.org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
 /**
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class BCStyle
     extends AbstractX500NameStyle
 {
     /**
      * country code - StringType(SIZE(2))
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier C = new ASN1ObjectIdentifier("2.5.4.6").intern();
 
     /**
      * organization - StringType(SIZE(1..64))
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier O = new ASN1ObjectIdentifier("2.5.4.10").intern();
 
     /**
      * organizational unit name - StringType(SIZE(1..64))
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier OU = new ASN1ObjectIdentifier("2.5.4.11").intern();
 
     /**
@@ -47,7 +43,6 @@ public class BCStyle
     /**
      * common name - StringType(SIZE(1..64))
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier CN = new ASN1ObjectIdentifier("2.5.4.3").intern();
 
     /**
@@ -68,13 +63,11 @@ public class BCStyle
     /**
      * locality name - StringType(SIZE(1..64))
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier L = new ASN1ObjectIdentifier("2.5.4.7").intern();
 
     /**
      * state, or province name - StringType(SIZE(1..64))
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier ST = new ASN1ObjectIdentifier("2.5.4.8").intern();
 
     /**
@@ -182,7 +175,6 @@ public class BCStyle
     /**
      * email address in Verisign certificates
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier E = EmailAddress;
 
     /*
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
index 311b71ce..efcc01ca 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/AlgorithmIdentifier.java
@@ -13,7 +13,6 @@ import com.android.org.bouncycastle.asn1.DERSequence;
 /**
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class AlgorithmIdentifier
     extends ASN1Object
 {
@@ -43,7 +42,6 @@ public class AlgorithmIdentifier
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public AlgorithmIdentifier(
         ASN1ObjectIdentifier algorithm)
     {
@@ -51,7 +49,6 @@ public class AlgorithmIdentifier
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public AlgorithmIdentifier(
         ASN1ObjectIdentifier algorithm,
         ASN1Encodable           parameters)
@@ -81,7 +78,6 @@ public class AlgorithmIdentifier
         }
     }
 
-    @libcore.api.CorePlatformApi
     public ASN1ObjectIdentifier getAlgorithm()
     {
         return algorithm;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java
index e61cf0fd..cd52cc07 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/BasicConstraints.java
@@ -15,7 +15,6 @@ 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
 {
@@ -29,7 +28,6 @@ public class BasicConstraints
         return getInstance(ASN1Sequence.getInstance(obj, explicit));
     }
 
-    @libcore.api.CorePlatformApi
     public static BasicConstraints getInstance(
         Object  obj)
     {
@@ -113,7 +111,6 @@ public class BasicConstraints
         this.pathLenConstraint = new ASN1Integer(pathLenConstraint);
     }
 
-    @libcore.api.CorePlatformApi
     public boolean isCA()
     {
         return (cA != null) && cA.isTrue();
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Certificate.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Certificate.java
index 0f4e761c..c5ce691d 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Certificate.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Certificate.java
@@ -20,7 +20,6 @@ import com.android.org.bouncycastle.asn1.x500.X500Name;
  * </pre>
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class Certificate
     extends ASN1Object
 {
@@ -37,7 +36,6 @@ public class Certificate
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public static Certificate getInstance(
         Object  obj)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/GeneralName.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/GeneralName.java
index 0d344d98..414640e8 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/GeneralName.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/GeneralName.java
@@ -44,21 +44,17 @@ import com.android.org.bouncycastle.util.IPAddress;
  * </pre>
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class GeneralName
     extends ASN1Object
     implements ASN1Choice
 {
-    @libcore.api.CorePlatformApi
     public static final int otherName                     = 0;
     public static final int rfc822Name                    = 1;
-    @libcore.api.CorePlatformApi
     public static final int dNSName                       = 2;
     public static final int x400Address                   = 3;
     public static final int directoryName                 = 4;
     public static final int ediPartyName                  = 5;
     public static final int uniformResourceIdentifier     = 6;
-    @libcore.api.CorePlatformApi
     public static final int iPAddress                     = 7;
     public static final int registeredID                  = 8;
 
@@ -110,7 +106,6 @@ public class GeneralName
      * RFC 1883, the octet string MUST contain exactly sixteen octets [RFC
      * 1883].
      */
-    @libcore.api.CorePlatformApi
     public GeneralName(
         int           tag,
         ASN1Encodable name)
@@ -142,7 +137,6 @@ public class GeneralName
      * @param name string representation of name
      * @throws IllegalArgumentException if the string encoding is not correct or     *             not supported.
      */
-    @libcore.api.CorePlatformApi
     public GeneralName(
         int       tag,
         String    name)
@@ -237,7 +231,6 @@ public class GeneralName
         return GeneralName.getInstance(ASN1TaggedObject.getInstance(tagObj, true));
     }
 
-    @libcore.api.CorePlatformApi
     public int getTagNo()
     {
         return tag;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java
index d1a67093..2f1539d7 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/SubjectPublicKeyInfo.java
@@ -20,7 +20,6 @@ import com.android.org.bouncycastle.asn1.DERSequence;
  * encoded one of these.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class SubjectPublicKeyInfo
     extends ASN1Object
 {
@@ -35,7 +34,6 @@ public class SubjectPublicKeyInfo
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public static SubjectPublicKeyInfo getInstance(
         Object  obj)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/TBSCertificate.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/TBSCertificate.java
index 74ae7f06..4bea27eb 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/TBSCertificate.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/TBSCertificate.java
@@ -32,7 +32,6 @@ import com.android.org.bouncycastle.asn1.x500.X500Name;
  * will parse them, but you really shouldn't be creating new ones.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class TBSCertificate
     extends ASN1Object
 {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Time.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Time.java
index 21eb04a5..2b3a1228 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Time.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Time.java
@@ -21,7 +21,6 @@ import com.android.org.bouncycastle.asn1.DERUTCTime;
 /**
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class Time
     extends ASN1Object
     implements ASN1Choice
@@ -55,7 +54,6 @@ public class Time
      * @param time a date object representing the time of interest.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public Time(
         Date    time)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java
index a48763b3..5d43230e 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/V3TBSCertificateGenerator.java
@@ -28,7 +28,6 @@ import com.android.org.bouncycastle.asn1.x500.X500Name;
  * @hide This class is not part of the Android public SDK API
  *
  */
-@libcore.api.CorePlatformApi
 public class V3TBSCertificateGenerator
 {
     DERTaggedObject         version = new DERTaggedObject(true, 0, new ASN1Integer(2));
@@ -46,13 +45,11 @@ public class V3TBSCertificateGenerator
     private DERBitString subjectUniqueID;
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public V3TBSCertificateGenerator()
     {
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSerialNumber(
         ASN1Integer  serialNumber)
     {
@@ -60,7 +57,6 @@ public class V3TBSCertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSignature(
         AlgorithmIdentifier    signature)
     {
@@ -71,7 +67,6 @@ public class V3TBSCertificateGenerator
      * @deprecated use X500Name method
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setIssuer(
         X509Name    issuer)
     {
@@ -91,7 +86,6 @@ public class V3TBSCertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setStartDate(
         Time startDate)
     {
@@ -105,7 +99,6 @@ public class V3TBSCertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setEndDate(
         Time endDate)
     {
@@ -116,7 +109,6 @@ public class V3TBSCertificateGenerator
      * @deprecated use X500Name method
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSubject(
         X509Name    subject)
     {
@@ -142,7 +134,6 @@ public class V3TBSCertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSubjectPublicKeyInfo(
         SubjectPublicKeyInfo    pubKeyInfo)
     {
@@ -175,7 +166,6 @@ public class V3TBSCertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public TBSCertificate generateTBSCertificate()
     {
         if ((serialNumber == null) || (signature == null)
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/X509Name.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/X509Name.java
index 5a73e62d..5fbf5f14 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/X509Name.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/X509Name.java
@@ -37,7 +37,6 @@ import com.android.org.bouncycastle.util.encoders.Hex;
  * @deprecated use org.bouncycastle.asn1.x500.X500Name.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class X509Name
     extends ASN1Object
 {
@@ -51,14 +50,12 @@ public class X509Name
      * organization - StringType(SIZE(1..64))
      * @deprecated use a X500NameStyle
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier O = new ASN1ObjectIdentifier("2.5.4.10");
 
     /**
      * organizational unit name - StringType(SIZE(1..64))
      * @deprecated use a X500NameStyle
      */
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier OU = new ASN1ObjectIdentifier("2.5.4.11");
 
     /**
@@ -72,7 +69,6 @@ public class X509Name
      * @deprecated use a X500NameStyle
      */
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    @libcore.api.CorePlatformApi
     public static final ASN1ObjectIdentifier CN = new ASN1ObjectIdentifier("2.5.4.3");
 
     /**
@@ -231,7 +227,6 @@ public class X509Name
      * default look up table translating OID values into their common symbols following
      * the convention in RFC 2253 with a few extras
      */
-    @libcore.api.CorePlatformApi
     public static final Hashtable DefaultSymbols = new Hashtable();
 
     /**
@@ -381,7 +376,6 @@ public class X509Name
         return getInstance(ASN1Sequence.getInstance(obj, explicit));
     }
 
-    @libcore.api.CorePlatformApi
     public static X509Name getInstance(
         Object  obj)
     {
@@ -601,7 +595,6 @@ public class X509Name
      * @deprecated use X500Name, X500NameBuilder
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public X509Name(
         String  dirName)
     {
@@ -874,7 +867,6 @@ public class X509Name
      * return a vector of the oids in the name, in the order they were found.
      */
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    @libcore.api.CorePlatformApi
     public Vector getOIDs()
     {
         Vector  v = new Vector();
@@ -892,7 +884,6 @@ public class X509Name
      * were found.
      */
     @android.compat.annotation.UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
-    @libcore.api.CorePlatformApi
     public Vector getValues()
     {
         Vector  v = new Vector();
@@ -1312,7 +1303,6 @@ public class X509Name
      * @param reverse if true start at the end of the sequence and work back.
      * @param oidSymbols look up table strings for oids.
      */
-    @libcore.api.CorePlatformApi
     public String toString(
         boolean     reverse,
         Hashtable   oidSymbols)
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java
index 1b42f245..82dba4b3 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x9/X9ObjectIdentifiers.java
@@ -12,7 +12,6 @@ import com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier;
  * </pre>
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public interface X9ObjectIdentifiers
 {
     /** Base OID: 1.2.840.10045 */
@@ -56,7 +55,6 @@ public interface X9ObjectIdentifiers
 
     /** OID: 1.2.840.10045.4.3.2 */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     ASN1ObjectIdentifier ecdsa_with_SHA256 = ecdsa_with_SHA2.branch("2");
 
     /** OID: 1.2.840.10045.4.3.3 */
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/CipherParameters.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/CipherParameters.java
index 11c433c3..889837f7 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/CipherParameters.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/CipherParameters.java
@@ -5,7 +5,6 @@ package com.android.org.bouncycastle.crypto;
  * all parameter classes implement this.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public interface CipherParameters
 {
 }
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/PBEParametersGenerator.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/PBEParametersGenerator.java
index 956e9332..d6277271 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/PBEParametersGenerator.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/PBEParametersGenerator.java
@@ -7,7 +7,6 @@ import com.android.org.bouncycastle.util.Strings;
  * super class for all Password Based Encryption (PBE) parameter generator classes.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class PBEParametersGenerator
 {
     protected byte[]  password;
@@ -17,7 +16,6 @@ public abstract class PBEParametersGenerator
     /**
      * base constructor.
      */
-    @libcore.api.CorePlatformApi
     protected PBEParametersGenerator()
     {
     }
@@ -104,7 +102,6 @@ public abstract class PBEParametersGenerator
      * @param password a character array representing the password.
      * @return a byte array representing the password.
      */
-    @libcore.api.CorePlatformApi
     public static byte[] PKCS5PasswordToBytes(
         char[]  password)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java
index 690c63dd..c075dce5 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/GeneralDigest.java
@@ -10,7 +10,6 @@ import com.android.org.bouncycastle.util.Pack;
  * "Handbook of Applied Cryptography", pages 344 - 347.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public abstract class GeneralDigest
     implements ExtendedDigest, Memoable
 {
@@ -68,7 +67,6 @@ public abstract class GeneralDigest
         byteCount++;
     }
 
-    @libcore.api.CorePlatformApi
     public void update(
         byte[]  in,
         int     inOff,
@@ -114,7 +112,6 @@ public abstract class GeneralDigest
         byteCount += len;
     }
 
-    @libcore.api.CorePlatformApi
     public void finish()
     {
         long    bitLength = (byteCount << 3);
@@ -161,6 +158,5 @@ public abstract class GeneralDigest
 
     protected abstract void processLength(long bitLength);
 
-    @libcore.api.CorePlatformApi
     protected abstract void processBlock();
 }
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/MD4Digest.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/MD4Digest.java
index 3a30b95d..19d2fe7c 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/MD4Digest.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/MD4Digest.java
@@ -12,7 +12,6 @@ import com.android.org.bouncycastle.util.Memoable;
  * with legacy applications, it's not secure, don't use it for anything new!
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class MD4Digest
         extends GeneralDigest
 {
@@ -26,7 +25,6 @@ public class MD4Digest
     /**
      * Standard constructor
      */
-    @libcore.api.CorePlatformApi
     public MD4Digest()
     {
         reset();
@@ -102,7 +100,6 @@ public class MD4Digest
         out[outOff + 3] = (byte)(word >>> 24);
     }
 
-    @libcore.api.CorePlatformApi
     public int doFinal(
             byte[]  out,
             int     outOff)
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java
index 78750ea2..ebc5bfe4 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/digests/SHA1Digest.java
@@ -11,7 +11,6 @@ import com.android.org.bouncycastle.util.Pack;
  * is the "endianness" of the word processing!
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class SHA1Digest
     extends GeneralDigest
     implements EncodableDigest
@@ -26,7 +25,6 @@ public class SHA1Digest
     /**
      * Standard constructor
      */
-    @libcore.api.CorePlatformApi
     public SHA1Digest()
     {
         reset();
@@ -117,7 +115,6 @@ public class SHA1Digest
         X[15] = (int)bitLength;
     }
 
-    @libcore.api.CorePlatformApi
     public int doFinal(
         byte[]  out,
         int     outOff)
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
index 7419815a..116aa7d4 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
@@ -18,7 +18,6 @@ import com.android.org.bouncycastle.crypto.digests.AndroidDigestFactory;
  * <p>
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class OpenSSLPBEParametersGenerator
     extends PBEParametersGenerator
 {
@@ -29,7 +28,6 @@ public class OpenSSLPBEParametersGenerator
     /**
      * Construct a OpenSSL Parameters generator. 
      */
-    @libcore.api.CorePlatformApi
     public OpenSSLPBEParametersGenerator()
     {
     }
@@ -40,7 +38,6 @@ public class OpenSSLPBEParametersGenerator
      * @param password password to use.
      * @param salt salt to use.
      */
-    @libcore.api.CorePlatformApi
     public void init(
        byte[] password,
        byte[] salt)
@@ -92,7 +89,6 @@ public class OpenSSLPBEParametersGenerator
      * @return a KeyParameter object.
      * @exception IllegalArgumentException if the key length larger than the base hash size.
      */
-    @libcore.api.CorePlatformApi
     public CipherParameters generateDerivedParameters(
         int keySize)
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/params/KeyParameter.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/params/KeyParameter.java
index bed0f702..ad8fa0ce 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/params/KeyParameter.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/crypto/params/KeyParameter.java
@@ -6,7 +6,6 @@ import com.android.org.bouncycastle.crypto.CipherParameters;
 /**
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class KeyParameter
     implements CipherParameters
 {
@@ -28,7 +27,6 @@ public class KeyParameter
         System.arraycopy(key, keyOff, this.key, 0, keyLen);
     }
 
-    @libcore.api.CorePlatformApi
     public byte[] getKey()
     {
         return key;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java
index 3e289996..5e91663b 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jcajce/util/DefaultJcaJceHelper.java
@@ -24,11 +24,9 @@ import javax.crypto.SecretKeyFactory;
  * without specifying a provider).
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class DefaultJcaJceHelper
     implements JcaJceHelper
 {
-    @libcore.api.CorePlatformApi
     public Cipher createCipher(
         String algorithm)
         throws NoSuchAlgorithmException, NoSuchPaddingException
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 e6c7b04e..8e136294 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
@@ -23,7 +23,6 @@ import com.android.org.bouncycastle.asn1.x509.X509Name;
  * @deprecated use the X500Name class.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class X509Principal
     extends X509Name
     implements Principal
@@ -46,7 +45,6 @@ public class X509Principal
      * Constructor from an encoded byte array.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public X509Principal(
         byte[]  bytes)
         throws IOException
@@ -89,7 +87,6 @@ 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/jce/provider/BouncyCastleProvider.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
index 90398427..1c543ba3 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -58,7 +58,6 @@ 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
 {
@@ -156,7 +155,6 @@ public final class BouncyCastleProvider extends Provider
      * <code>Security.addProvider()</code> mechanism.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public BouncyCastleProvider()
     {
         super(PROVIDER_NAME, 1.61, info);
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/X509CertificateObject.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/X509CertificateObject.java
index 89cb96c1..911d9025 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/X509CertificateObject.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/jce/provider/X509CertificateObject.java
@@ -74,7 +74,6 @@ import com.android.org.bouncycastle.util.encoders.Hex;
  * @deprecated Do not use this class directly - either use org.bouncycastle.cert (bcpkix) or CertificateFactory.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class X509CertificateObject
     extends X509Certificate
     implements PKCS12BagAttributeCarrier
@@ -88,7 +87,6 @@ public class X509CertificateObject
     private PKCS12BagAttributeCarrier   attrCarrier = new PKCS12BagAttributeCarrierImpl();
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public X509CertificateObject(
         com.android.org.bouncycastle.asn1.x509.Certificate    c)
         throws CertificateParsingException
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/Iterable.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/Iterable.java
index 9231f118..f035d316 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/Iterable.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/Iterable.java
@@ -7,7 +7,6 @@ import java.util.Iterator;
  * Utility class to allow use of Iterable feature in JDK 1.5+
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public interface Iterable<T>
     extends java.lang.Iterable<T>
 {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemHeader.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemHeader.java
index 8465791f..2829673f 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemHeader.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemHeader.java
@@ -5,7 +5,6 @@ package com.android.org.bouncycastle.util.io.pem;
  * Class representing a PEM header (name, value) pair.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class PemHeader
 {
     private String name;
@@ -17,7 +16,6 @@ public class PemHeader
      * @param name name of the header property.
      * @param value value of the header property.
      */
-    @libcore.api.CorePlatformApi
     public PemHeader(String name, String value)
     {
         this.name = name;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObject.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObject.java
index 7dcd8324..26bbd203 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObject.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObject.java
@@ -9,7 +9,6 @@ import java.util.List;
  * A generic PEM object - type, header properties, and byte content.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class PemObject
     implements PemObjectGenerator
 {
@@ -25,7 +24,6 @@ public class PemObject
      * @param type pem object type.
      * @param content the binary content of the object.
      */
-    @libcore.api.CorePlatformApi
     public PemObject(String type, byte[] content)
     {
         this(type, EMPTY_LIST, content);
@@ -38,7 +36,6 @@ public class PemObject
      * @param headers a list of PemHeader objects.
      * @param content the binary content of the object.
      */
-    @libcore.api.CorePlatformApi
     public PemObject(String type, List headers, byte[] content)
     {
         this.type = type;
@@ -46,7 +43,6 @@ public class PemObject
         this.content = content;
     }
 
-    @libcore.api.CorePlatformApi
     public String getType()
     {
         return type;
@@ -57,7 +53,6 @@ public class PemObject
         return headers;
     }
 
-    @libcore.api.CorePlatformApi
     public byte[] getContent()
     {
         return content;
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObjectGenerator.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObjectGenerator.java
index 3cbc442f..c8bd172f 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObjectGenerator.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemObjectGenerator.java
@@ -5,7 +5,6 @@ package com.android.org.bouncycastle.util.io.pem;
  * Base interface for generators of PEM objects.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public interface PemObjectGenerator
 {
     /**
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemReader.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemReader.java
index 54ca2ef2..2ce8c069 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemReader.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemReader.java
@@ -13,14 +13,12 @@ import com.android.org.bouncycastle.util.encoders.Base64;
  * A generic PEM reader, based on the format outlined in RFC 1421
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class PemReader
     extends BufferedReader
 {
     private static final String BEGIN = "-----BEGIN ";
     private static final String END = "-----END ";
 
-    @libcore.api.CorePlatformApi
     public PemReader(Reader reader)
     {
         super(reader);
@@ -32,7 +30,6 @@ public class PemReader
      * @return the next object in the stream, null if no objects left.
      * @throws IOException in case of a parse error.
      */
-    @libcore.api.CorePlatformApi
     public PemObject readPemObject()
         throws IOException
     {
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemWriter.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemWriter.java
index 717434bd..d48ccb01 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemWriter.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/util/io/pem/PemWriter.java
@@ -13,7 +13,6 @@ import com.android.org.bouncycastle.util.encoders.Base64;
  * A generic PEM writer, based on RFC 1421
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class PemWriter
     extends BufferedWriter
 {
@@ -27,7 +26,6 @@ public class PemWriter
      *
      * @param out output stream to use.
      */
-    @libcore.api.CorePlatformApi
     public PemWriter(Writer out)
     {
         super(out);
@@ -75,7 +73,6 @@ public class PemWriter
         return size;
     }
     
-    @libcore.api.CorePlatformApi
     public void writeObject(PemObjectGenerator objGen)
         throws IOException
     {
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 0ce75691..2b5b831b 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
@@ -41,7 +41,6 @@ import com.android.org.bouncycastle.jce.X509Principal;
  * @deprecated use org.bouncycastle.cert.X509v1CertificateBuilder.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class X509V1CertificateGenerator
 {
     private final JcaJceHelper bcHelper = new BCJcaJceHelper(); // needed to force provider loading
@@ -52,7 +51,6 @@ public class X509V1CertificateGenerator
     private AlgorithmIdentifier         sigAlgId;
     private String                      signatureAlgorithm;
 
-    @libcore.api.CorePlatformApi
     public X509V1CertificateGenerator()
     {
         tbsGen = new V1TBSCertificateGenerator();
@@ -69,7 +67,6 @@ public class X509V1CertificateGenerator
     /**
      * set the serial number for the certificate.
      */
-    @libcore.api.CorePlatformApi
     public void setSerialNumber(
         BigInteger      serialNumber)
     {
@@ -85,7 +82,6 @@ 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)
     {
@@ -109,14 +105,12 @@ public class X509V1CertificateGenerator
         tbsGen.setIssuer(issuer);
     }
 
-    @libcore.api.CorePlatformApi
     public void setNotBefore(
         Date    date)
     {
         tbsGen.setStartDate(new Time(date));
     }
 
-    @libcore.api.CorePlatformApi
     public void setNotAfter(
         Date    date)
     {
@@ -126,7 +120,6 @@ public class X509V1CertificateGenerator
     /**
      * Set the subject distinguished name. The subject describes the entity associated with the public key.
      */
-    @libcore.api.CorePlatformApi
     public void setSubjectDN(
         X500Principal   subject)
     {
@@ -149,7 +142,6 @@ public class X509V1CertificateGenerator
         tbsGen.setSubject(subject);
     }
 
-    @libcore.api.CorePlatformApi
     public void setPublicKey(
         PublicKey       key)
     {
@@ -169,7 +161,6 @@ public class X509V1CertificateGenerator
      * 
      * @param signatureAlgorithm string representation of the algorithm name.
      */
-    @libcore.api.CorePlatformApi
     public void setSignatureAlgorithm(
         String  signatureAlgorithm)
     {
@@ -324,7 +315,6 @@ public class X509V1CertificateGenerator
      * using the passed in provider for the signing, and the passed in source
      * of randomness (if required).
      */
-    @libcore.api.CorePlatformApi
     public X509Certificate generate(
         PrivateKey      key,
         String          provider)
diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V3CertificateGenerator.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V3CertificateGenerator.java
index 50b5e8b9..516b5224 100644
--- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V3CertificateGenerator.java
+++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/x509/X509V3CertificateGenerator.java
@@ -46,7 +46,6 @@ import com.android.org.bouncycastle.x509.extension.X509ExtensionUtil;
  *  @deprecated use org.bouncycastle.cert.X509v3CertificateBuilder.
  * @hide This class is not part of the Android public SDK API
  */
-@libcore.api.CorePlatformApi
 public class X509V3CertificateGenerator
 {
     private final JcaJceHelper bcHelper = new BCJcaJceHelper(); // needed to force provider loading
@@ -59,7 +58,6 @@ public class X509V3CertificateGenerator
     private X509ExtensionsGenerator     extGenerator;
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public X509V3CertificateGenerator()
     {
         tbsGen = new V3TBSCertificateGenerator();
@@ -79,7 +77,6 @@ public class X509V3CertificateGenerator
      * set the serial number for the certificate.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSerialNumber(
         BigInteger      serialNumber)
     {
@@ -96,7 +93,6 @@ public class X509V3CertificateGenerator
      * certificate.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setIssuerDN(
         X500Principal   issuer)
     {
@@ -122,7 +118,6 @@ public class X509V3CertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setNotBefore(
         Date    date)
     {
@@ -130,7 +125,6 @@ public class X509V3CertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setNotAfter(
         Date    date)
     {
@@ -141,7 +135,6 @@ public class X509V3CertificateGenerator
      * Set the subject distinguished name. The subject describes the entity associated with the public key.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSubjectDN(
         X500Principal   subject)
     {
@@ -166,7 +159,6 @@ public class X509V3CertificateGenerator
     }
 
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setPublicKey(
         PublicKey       key)
         throws IllegalArgumentException
@@ -189,7 +181,6 @@ public class X509V3CertificateGenerator
      * @param signatureAlgorithm string representation of the algorithm name.
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public void setSignatureAlgorithm(
         String  signatureAlgorithm)
     {
@@ -432,7 +423,6 @@ public class X509V3CertificateGenerator
      * </p>
      */
     @android.compat.annotation.UnsupportedAppUsage
-    @libcore.api.CorePlatformApi
     public X509Certificate generate(
         PrivateKey      key)
         throws CertificateEncodingException, IllegalStateException, NoSuchAlgorithmException, SignatureException, InvalidKeyException
diff --git a/srcgen/core-platform-api.txt b/srcgen/core-platform-api.txt
deleted file mode 100644
index 51c0d16b..00000000
--- a/srcgen/core-platform-api.txt
+++ /dev/null
@@ -1,171 +0,0 @@
-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
-field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#L
-field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#O
-field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#OU
-field:com.android.org.bouncycastle.asn1.x500.style.BCStyle#ST
-field:com.android.org.bouncycastle.asn1.x509.GeneralName#dNSName
-field:com.android.org.bouncycastle.asn1.x509.GeneralName#iPAddress
-field:com.android.org.bouncycastle.asn1.x509.GeneralName#otherName
-field:com.android.org.bouncycastle.asn1.x509.X509Name#CN
-field:com.android.org.bouncycastle.asn1.x509.X509Name#DefaultSymbols
-field:com.android.org.bouncycastle.asn1.x509.X509Name#O
-field:com.android.org.bouncycastle.asn1.x509.X509Name#OU
-field:com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers#ecdsa_with_SHA256
-method:com.android.org.bouncycastle.asn1.ASN1BitString#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1EncodableVector#add(ASN1Encodable)
-method:com.android.org.bouncycastle.asn1.ASN1EncodableVector#ASN1EncodableVector()
-method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(byte[])
-method:com.android.org.bouncycastle.asn1.ASN1InputStream#ASN1InputStream(InputStream)
-method:com.android.org.bouncycastle.asn1.ASN1InputStream#readObject()
-method:com.android.org.bouncycastle.asn1.ASN1Integer#ASN1Integer(BigInteger)
-method:com.android.org.bouncycastle.asn1.ASN1Null#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1Object#ASN1Object()
-method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded()
-method:com.android.org.bouncycastle.asn1.ASN1Object#getEncoded(String)
-method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#ASN1ObjectIdentifier(String)
-method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#getId()
-method:com.android.org.bouncycastle.asn1.ASN1ObjectIdentifier#getInstance(Object)
-method:com.android.org.bouncycastle.asn1.ASN1OctetString#getOctets()
-method:com.android.org.bouncycastle.asn1.ASN1OctetString#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1Primitive#fromByteArray(byte[])
-method:com.android.org.bouncycastle.asn1.ASN1Primitive#toASN1Primitive()
-method:com.android.org.bouncycastle.asn1.ASN1Sequence#getObjectAt(int)
-method:com.android.org.bouncycastle.asn1.ASN1Sequence#hashCode()
-method:com.android.org.bouncycastle.asn1.ASN1Sequence#size()
-method:com.android.org.bouncycastle.asn1.ASN1TaggedObject#getObject()
-method:com.android.org.bouncycastle.asn1.ASN1TaggedObject#hashCode()
-method:com.android.org.bouncycastle.asn1.DERBitString#DERBitString(byte[])
-method:com.android.org.bouncycastle.asn1.DEROctetString#DEROctetString(byte[])
-method:com.android.org.bouncycastle.asn1.DERSequence#DERSequence()
-method:com.android.org.bouncycastle.asn1.DERSequence#DERSequence(ASN1EncodableVector)
-method:com.android.org.bouncycastle.asn1.DERTaggedObject#DERTaggedObject(int,ASN1Encodable)
-method:com.android.org.bouncycastle.asn1.DERUTF8String#DERUTF8String(String)
-method:com.android.org.bouncycastle.asn1.DERUTF8String#getString()
-method:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo#getInstance(Object)
-method:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo#getPrivateKeyAlgorithm()
-method:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo#parsePrivateKey()
-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.AlgorithmIdentifier#getAlgorithm()
-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.GeneralName#GeneralName(int,ASN1Encodable)
-method:com.android.org.bouncycastle.asn1.x509.GeneralName#GeneralName(int,String)
-method:com.android.org.bouncycastle.asn1.x509.GeneralName#getTagNo()
-method:com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo#getInstance(Object)
-method:com.android.org.bouncycastle.asn1.x509.Time#Time(Date)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#generateTBSCertificate()
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setEndDate(Time)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setIssuer(X509Name)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setSerialNumber(ASN1Integer)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setSignature(AlgorithmIdentifier)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setStartDate(Time)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setSubjectPublicKeyInfo(SubjectPublicKeyInfo)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#setSubject(X509Name)
-method:com.android.org.bouncycastle.asn1.x509.V3TBSCertificateGenerator#V3TBSCertificateGenerator()
-method:com.android.org.bouncycastle.asn1.x509.X509Name#getInstance(Object)
-method:com.android.org.bouncycastle.asn1.x509.X509Name#getOIDs()
-method:com.android.org.bouncycastle.asn1.x509.X509Name#getValues()
-method:com.android.org.bouncycastle.asn1.x509.X509Name#toString(boolean,Hashtable)
-method:com.android.org.bouncycastle.asn1.x509.X509Name#X509Name(String)
-method:com.android.org.bouncycastle.crypto.digests.GeneralDigest#finish()
-method:com.android.org.bouncycastle.crypto.digests.GeneralDigest#processBlock()
-method:com.android.org.bouncycastle.crypto.digests.GeneralDigest#update(byte[],int,int)
-method:com.android.org.bouncycastle.crypto.digests.MD4Digest#MD4Digest()
-method:com.android.org.bouncycastle.crypto.digests.MD4Digest#doFinal(byte[],int)
-method:com.android.org.bouncycastle.crypto.digests.SHA1Digest#SHA1Digest()
-method:com.android.org.bouncycastle.crypto.digests.SHA1Digest#doFinal(byte[],int)
-method:com.android.org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator#generateDerivedParameters(int)
-method:com.android.org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator#init(byte[],byte[])
-method:com.android.org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator#OpenSSLPBEParametersGenerator()
-method:com.android.org.bouncycastle.crypto.params.KeyParameter#getKey()
-method:com.android.org.bouncycastle.crypto.PBEParametersGenerator#PBEParametersGenerator()
-method:com.android.org.bouncycastle.crypto.PBEParametersGenerator#PKCS5PasswordToBytes(char[])
-method:com.android.org.bouncycastle.jcajce.util.DefaultJcaJceHelper#createCipher(String)
-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()
-method:com.android.org.bouncycastle.util.io.pem.PemObject#PemObject(String,byte[])
-method:com.android.org.bouncycastle.util.io.pem.PemObject#PemObject(String,List,byte[])
-method:com.android.org.bouncycastle.util.io.pem.PemReader#PemReader(Reader)
-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)
-method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setSerialNumber(BigInteger)
-method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setSignatureAlgorithm(String)
-method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#setSubjectDN(X500Principal)
-method:com.android.org.bouncycastle.x509.X509V1CertificateGenerator#X509V1CertificateGenerator()
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#generate(PrivateKey)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setIssuerDN(X500Principal)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setNotAfter(Date)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setNotBefore(Date)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setPublicKey(PublicKey)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setSerialNumber(BigInteger)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setSignatureAlgorithm(String)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#setSubjectDN(X500Principal)
-method:com.android.org.bouncycastle.x509.X509V3CertificateGenerator#X509V3CertificateGenerator()
-type:com.android.org.bouncycastle.asn1.ASN1BitString
-type:com.android.org.bouncycastle.asn1.ASN1Encodable
-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.ASN1Null
-type:com.android.org.bouncycastle.asn1.ASN1Object
-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.ASN1Sequence
-type:com.android.org.bouncycastle.asn1.ASN1TaggedObject
-type:com.android.org.bouncycastle.asn1.DERBitString
-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.DERTaggedObject
-type:com.android.org.bouncycastle.asn1.DERUTF8String
-type:com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers
-type:com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo
-type:com.android.org.bouncycastle.asn1.x500.style.BCStyle
-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.GeneralName
-type:com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
-type:com.android.org.bouncycastle.asn1.x509.TBSCertificate
-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.crypto.CipherParameters
-type:com.android.org.bouncycastle.crypto.digests.GeneralDigest
-type:com.android.org.bouncycastle.crypto.digests.MD4Digest
-type:com.android.org.bouncycastle.crypto.digests.SHA1Digest
-type:com.android.org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator
-type:com.android.org.bouncycastle.crypto.params.KeyParameter
-type:com.android.org.bouncycastle.crypto.PBEParametersGenerator
-type:com.android.org.bouncycastle.jcajce.util.DefaultJcaJceHelper
-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.PemHeader
-type:com.android.org.bouncycastle.util.io.pem.PemObject
-type:com.android.org.bouncycastle.util.io.pem.PemObjectGenerator
-type:com.android.org.bouncycastle.util.io.pem.PemReader
-type:com.android.org.bouncycastle.util.io.pem.PemWriter
-type:com.android.org.bouncycastle.util.Iterable
-type:com.android.org.bouncycastle.x509.X509V1CertificateGenerator
-type:com.android.org.bouncycastle.x509.X509V3CertificateGenerator