From 7dae0d79d01f0387a72bf67987661c514c417356 Mon Sep 17 00:00:00 2001 From: Artur Satayev Date: Tue, 10 Dec 2019 12:04:59 +0000 Subject: Use new UnsupportedAppUsage annotation. Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: Icb2e9e0aa267125a80de93678fec7b639e91d29a --- .../org/bouncycastle/asn1/ASN1EncodableVector.java | 4 ++-- .../org/bouncycastle/asn1/ASN1InputStream.java | 6 +++--- .../android/org/bouncycastle/asn1/ASN1Integer.java | 2 +- .../org/bouncycastle/asn1/DERBitString.java | 2 +- .../org/bouncycastle/asn1/DEREncodableVector.java | 2 +- .../android/org/bouncycastle/asn1/DERInteger.java | 4 ++-- .../com/android/org/bouncycastle/asn1/DERNull.java | 2 +- .../org/bouncycastle/asn1/DERObjectIdentifier.java | 2 +- .../org/bouncycastle/asn1/DEROctetString.java | 2 +- .../org/bouncycastle/asn1/DEROutputStream.java | 2 +- .../android/org/bouncycastle/asn1/DERSequence.java | 4 ++-- .../com/android/org/bouncycastle/asn1/DERSet.java | 2 +- .../asn1/pkcs/PKCSObjectIdentifiers.java | 2 +- .../asn1/x509/AlgorithmIdentifier.java | 4 ++-- .../org/bouncycastle/asn1/x509/Certificate.java | 2 +- .../org/bouncycastle/asn1/x509/DigestInfo.java | 2 +- .../asn1/x509/SubjectPublicKeyInfo.java | 2 +- .../android/org/bouncycastle/asn1/x509/Time.java | 2 +- .../asn1/x509/V3TBSCertificateGenerator.java | 18 +++++++++--------- .../org/bouncycastle/asn1/x509/X509Name.java | 10 +++++----- .../bouncycastle/asn1/x9/X9ObjectIdentifiers.java | 2 +- .../org/bouncycastle/jce/X509Principal.java | 2 +- .../jce/provider/BouncyCastleProvider.java | 2 +- .../jce/provider/X509CertificateObject.java | 2 +- .../x509/X509V3CertificateGenerator.java | 22 +++++++++++----------- 25 files changed, 53 insertions(+), 53 deletions(-) (limited to 'repackaged/bcprov/src/main/java/com/android/org/bouncycastle') 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 53718b27..3715a948 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 @@ -16,7 +16,7 @@ public class ASN1EncodableVector /** * Base constructor. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public ASN1EncodableVector() { @@ -27,7 +27,7 @@ public class ASN1EncodableVector * * @param obj the encodable to add. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void add(ASN1Encodable 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 d3f5189c..229881cc 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 @@ -26,7 +26,7 @@ public class ASN1InputStream private final byte[][] tmpBuffers; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public ASN1InputStream( InputStream is) @@ -40,7 +40,7 @@ public class ASN1InputStream * * @param input array containing ASN.1 encoded data. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public ASN1InputStream( byte[] input) @@ -217,7 +217,7 @@ public class ASN1InputStream return new ASN1InputStream(dIn).buildEncodableVector(); } - @dalvik.annotation.compat.UnsupportedAppUsage + @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 6ccfae0a..07919e07 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 @@ -89,7 +89,7 @@ public class ASN1Integer * * @param value the BigInteger representing the value desired. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public ASN1Integer( BigInteger value) 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 cad5042c..ab740061 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 @@ -97,7 +97,7 @@ public class DERBitString super(data, padBits); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public DERBitString( byte[] data) diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEREncodableVector.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEREncodableVector.java index 4cd553b1..5025adcb 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEREncodableVector.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEREncodableVector.java @@ -13,7 +13,7 @@ public class DEREncodableVector /** * @deprecated use ASN1EncodableVector instead. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DEREncodableVector() { diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERInteger.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERInteger.java index 381f5627..e81beeba 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERInteger.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERInteger.java @@ -21,13 +21,13 @@ public class DERInteger super(bytes, true); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DERInteger(BigInteger value) { super(value); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public DERInteger(long value) { 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 13a21db9..a86a335b 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 @@ -13,7 +13,7 @@ import java.io.IOException; public class DERNull extends ASN1Null { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public static final DERNull INSTANCE = new DERNull(); diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERObjectIdentifier.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERObjectIdentifier.java index 35efdf3b..fef16ea8 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERObjectIdentifier.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERObjectIdentifier.java @@ -9,7 +9,7 @@ package com.android.org.bouncycastle.asn1; public class DERObjectIdentifier extends ASN1ObjectIdentifier { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DERObjectIdentifier(String identifier) { super(identifier); 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 42b30eb9..28fffe05 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 @@ -16,7 +16,7 @@ public class DEROctetString * * @param string the octets making up the octet string. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public DEROctetString( byte[] string) diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROutputStream.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROutputStream.java index 5b9d6383..5ec0c931 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROutputStream.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DEROutputStream.java @@ -11,7 +11,7 @@ import java.io.OutputStream; public class DEROutputStream extends ASN1OutputStream { - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DEROutputStream( OutputStream os) { 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 7cab8d6f..92697c91 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 @@ -20,7 +20,7 @@ public class DERSequence /** * Create an empty sequence */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public DERSequence() { @@ -40,7 +40,7 @@ public class DERSequence * Create a sequence containing a vector of objects. * @param v the vector of objects to make up the sequence. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public DERSequence( ASN1EncodableVector v) diff --git a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSet.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSet.java index 60be3a5f..069c8336 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSet.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/DERSet.java @@ -41,7 +41,7 @@ public class DERSet * create a set containing a vector of objects. * @param v the vector of objects to make up the set. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DERSet( ASN1EncodableVector v) { 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 ba5231fd..717c6f77 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 @@ -39,7 +39,7 @@ public interface PKCSObjectIdentifiers /** PKCS#1: 1.2.840.113549.1.1.10 */ ASN1ObjectIdentifier id_RSASSA_PSS = pkcs_1.branch("10"); /** PKCS#1: 1.2.840.113549.1.1.11 */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi ASN1ObjectIdentifier sha256WithRSAEncryption = pkcs_1.branch("11"); /** PKCS#1: 1.2.840.113549.1.1.12 */ 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 1e0c1322..311b71ce 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 @@ -42,7 +42,7 @@ public class AlgorithmIdentifier return null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public AlgorithmIdentifier( ASN1ObjectIdentifier algorithm) @@ -50,7 +50,7 @@ public class AlgorithmIdentifier this.algorithm = algorithm; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public AlgorithmIdentifier( ASN1ObjectIdentifier algorithm, 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 1ee33694..0f4e761c 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 @@ -36,7 +36,7 @@ public class Certificate return getInstance(ASN1Sequence.getInstance(obj, explicit)); } - @dalvik.annotation.compat.UnsupportedAppUsage + @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/DigestInfo.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/DigestInfo.java index 0bbe5965..01a51156 100644 --- a/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/DigestInfo.java +++ b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/DigestInfo.java @@ -50,7 +50,7 @@ public class DigestInfo return null; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public DigestInfo( AlgorithmIdentifier algId, byte[] digest) 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 72cfbe7b..d1a67093 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 @@ -34,7 +34,7 @@ public class SubjectPublicKeyInfo return getInstance(ASN1Sequence.getInstance(obj, explicit)); } - @dalvik.annotation.compat.UnsupportedAppUsage + @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/Time.java b/repackaged/bcprov/src/main/java/com/android/org/bouncycastle/asn1/x509/Time.java index db488ba7..21eb04a5 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 @@ -54,7 +54,7 @@ public class Time * * @param time a date object representing the time of interest. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @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 ec0888a4..a48763b3 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 @@ -45,13 +45,13 @@ public class V3TBSCertificateGenerator private DERBitString issuerUniqueID; private DERBitString subjectUniqueID; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public V3TBSCertificateGenerator() { } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSerialNumber( ASN1Integer serialNumber) @@ -59,7 +59,7 @@ public class V3TBSCertificateGenerator this.serialNumber = serialNumber; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSignature( AlgorithmIdentifier signature) @@ -70,7 +70,7 @@ public class V3TBSCertificateGenerator /** * @deprecated use X500Name method */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setIssuer( X509Name issuer) @@ -90,7 +90,7 @@ public class V3TBSCertificateGenerator this.startDate = new Time(startDate); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setStartDate( Time startDate) @@ -104,7 +104,7 @@ public class V3TBSCertificateGenerator this.endDate = new Time(endDate); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setEndDate( Time endDate) @@ -115,7 +115,7 @@ public class V3TBSCertificateGenerator /** * @deprecated use X500Name method */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSubject( X509Name subject) @@ -141,7 +141,7 @@ public class V3TBSCertificateGenerator this.subjectUniqueID = uniqueID; } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSubjectPublicKeyInfo( SubjectPublicKeyInfo pubKeyInfo) @@ -174,7 +174,7 @@ public class V3TBSCertificateGenerator } } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public TBSCertificate generateTBSCertificate() { 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 c66d831f..1ba4481c 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 @@ -71,7 +71,7 @@ public class X509Name * common name - StringType(SIZE(1..64)) * @deprecated use a X500NameStyle */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public static final ASN1ObjectIdentifier CN = new ASN1ObjectIdentifier("2.5.4.3"); @@ -411,7 +411,7 @@ public class X509Name * the principal will be a list of constructed sets, each containing an (OID, String) pair. * @deprecated use X500Name.getInstance() */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public X509Name( ASN1Sequence seq) { @@ -600,7 +600,7 @@ public class X509Name * some such, converting it into an ordered set of name attributes. * @deprecated use X500Name, X500NameBuilder */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public X509Name( String dirName) @@ -873,7 +873,7 @@ public class X509Name /** * return a vector of the oids in the name, in the order they were found. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public Vector getOIDs() { @@ -891,7 +891,7 @@ public class X509Name * return a vector of the values found in the name, in the order they * were found. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public Vector getValues() { 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 d3ee31c3..1b42f245 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 @@ -55,7 +55,7 @@ public interface X9ObjectIdentifiers ASN1ObjectIdentifier ecdsa_with_SHA224 = ecdsa_with_SHA2.branch("1"); /** OID: 1.2.840.10045.4.3.2 */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi ASN1ObjectIdentifier ecdsa_with_SHA256 = ecdsa_with_SHA2.branch("2"); 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 6aa4cf3e..e6c7b04e 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 @@ -45,7 +45,7 @@ public class X509Principal /** * Constructor from an encoded byte array. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public X509Principal( byte[] bytes) 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 585cab6f..c5b996aa 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 @@ -152,7 +152,7 @@ public final class BouncyCastleProvider extends Provider * using runtime registration of the provider using the * Security.addProvider() mechanism. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public BouncyCastleProvider() { 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 f2ff6c39..89cb96c1 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 @@ -87,7 +87,7 @@ public class X509CertificateObject private PKCS12BagAttributeCarrier attrCarrier = new PKCS12BagAttributeCarrierImpl(); - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public X509CertificateObject( com.android.org.bouncycastle.asn1.x509.Certificate c) 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 4ac8b9d2..50b5e8b9 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 @@ -58,7 +58,7 @@ public class X509V3CertificateGenerator private String signatureAlgorithm; private X509ExtensionsGenerator extGenerator; - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public X509V3CertificateGenerator() { @@ -78,7 +78,7 @@ public class X509V3CertificateGenerator /** * set the serial number for the certificate. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSerialNumber( BigInteger serialNumber) @@ -95,7 +95,7 @@ public class X509V3CertificateGenerator * Set the issuer distinguished name - the issuer is the entity whose private key is used to sign the * certificate. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setIssuerDN( X500Principal issuer) @@ -114,14 +114,14 @@ public class X509V3CertificateGenerator * Set the issuer distinguished name - the issuer is the entity whose private key is used to sign the * certificate. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void setIssuerDN( X509Name issuer) { tbsGen.setIssuer(issuer); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setNotBefore( Date date) @@ -129,7 +129,7 @@ public class X509V3CertificateGenerator tbsGen.setStartDate(new Time(date)); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setNotAfter( Date date) @@ -140,7 +140,7 @@ public class X509V3CertificateGenerator /** * Set the subject distinguished name. The subject describes the entity associated with the public key. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSubjectDN( X500Principal subject) @@ -158,14 +158,14 @@ public class X509V3CertificateGenerator /** * Set the subject distinguished name. The subject describes the entity associated with the public key. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage public void setSubjectDN( X509Name subject) { tbsGen.setSubject(subject); } - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setPublicKey( PublicKey key) @@ -188,7 +188,7 @@ public class X509V3CertificateGenerator * * @param signatureAlgorithm string representation of the algorithm name. */ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public void setSignatureAlgorithm( String signatureAlgorithm) @@ -431,7 +431,7 @@ public class X509V3CertificateGenerator * used - not "BC". *

*/ - @dalvik.annotation.compat.UnsupportedAppUsage + @android.compat.annotation.UnsupportedAppUsage @libcore.api.CorePlatformApi public X509Certificate generate( PrivateKey key) -- cgit v1.2.3