summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/current.txt24
-rw-r--r--api/system-current.txt24
-rw-r--r--keystore/java/android/security/EcIesParameterSpec.java3
-rw-r--r--keystore/java/android/security/KeyStoreKeyProperties.java21
4 files changed, 24 insertions, 48 deletions
diff --git a/api/current.txt b/api/current.txt
index f57e1f6..0968d7d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28329,9 +28329,6 @@ package android.security {
field public static final int UNSPECIFIED = -1; // 0xffffffff
}
- public static abstract class EcIesParameterSpec.PointFormatEnum implements java.lang.annotation.Annotation {
- }
-
public final class KeyChain {
ctor public KeyChain();
method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String);
@@ -28474,9 +28471,6 @@ package android.security {
field public static final java.lang.String RSA = "RSA";
}
- public static abstract class KeyStoreKeyProperties.AlgorithmEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.BlockMode {
field public static final java.lang.String CBC = "CBC";
field public static final java.lang.String CTR = "CTR";
@@ -28484,9 +28478,6 @@ package android.security {
field public static final java.lang.String GCM = "GCM";
}
- public static abstract class KeyStoreKeyProperties.BlockModeEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.Digest {
field public static final java.lang.String MD5 = "MD5";
field public static final java.lang.String NONE = "NONE";
@@ -28497,9 +28488,6 @@ package android.security {
field public static final java.lang.String SHA512 = "SHA-512";
}
- public static abstract class KeyStoreKeyProperties.DigestEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.EncryptionPadding {
field public static final java.lang.String NONE = "NoPadding";
field public static final java.lang.String PKCS7 = "PKCS7Padding";
@@ -28507,18 +28495,12 @@ package android.security {
field public static final java.lang.String RSA_PKCS1 = "PKCS1Padding";
}
- public static abstract class KeyStoreKeyProperties.EncryptionPaddingEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.Origin {
field public static final int GENERATED = 1; // 0x1
field public static final int IMPORTED = 2; // 0x2
field public static final int UNKNOWN = 4; // 0x4
}
- public static abstract class KeyStoreKeyProperties.OriginEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.Purpose {
field public static final int DECRYPT = 2; // 0x2
field public static final int ENCRYPT = 1; // 0x1
@@ -28526,17 +28508,11 @@ package android.security {
field public static final int VERIFY = 8; // 0x8
}
- public static abstract class KeyStoreKeyProperties.PurposeEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.SignaturePadding {
field public static final java.lang.String RSA_PKCS1 = "PKCS1";
field public static final java.lang.String RSA_PSS = "PSS";
}
- public static abstract class KeyStoreKeyProperties.SignaturePaddingEnum implements java.lang.annotation.Annotation {
- }
-
public class KeyStoreKeySpec implements java.security.spec.KeySpec {
method public java.lang.String[] getBlockModes();
method public java.lang.String[] getDigests();
diff --git a/api/system-current.txt b/api/system-current.txt
index 79908fa..c293bae 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -30343,9 +30343,6 @@ package android.security {
field public static final int UNSPECIFIED = -1; // 0xffffffff
}
- public static abstract class EcIesParameterSpec.PointFormatEnum implements java.lang.annotation.Annotation {
- }
-
public final class KeyChain {
ctor public KeyChain();
method public static void choosePrivateKeyAlias(android.app.Activity, android.security.KeyChainAliasCallback, java.lang.String[], java.security.Principal[], java.lang.String, int, java.lang.String);
@@ -30488,9 +30485,6 @@ package android.security {
field public static final java.lang.String RSA = "RSA";
}
- public static abstract class KeyStoreKeyProperties.AlgorithmEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.BlockMode {
field public static final java.lang.String CBC = "CBC";
field public static final java.lang.String CTR = "CTR";
@@ -30498,9 +30492,6 @@ package android.security {
field public static final java.lang.String GCM = "GCM";
}
- public static abstract class KeyStoreKeyProperties.BlockModeEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.Digest {
field public static final java.lang.String MD5 = "MD5";
field public static final java.lang.String NONE = "NONE";
@@ -30511,9 +30502,6 @@ package android.security {
field public static final java.lang.String SHA512 = "SHA-512";
}
- public static abstract class KeyStoreKeyProperties.DigestEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.EncryptionPadding {
field public static final java.lang.String NONE = "NoPadding";
field public static final java.lang.String PKCS7 = "PKCS7Padding";
@@ -30521,18 +30509,12 @@ package android.security {
field public static final java.lang.String RSA_PKCS1 = "PKCS1Padding";
}
- public static abstract class KeyStoreKeyProperties.EncryptionPaddingEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.Origin {
field public static final int GENERATED = 1; // 0x1
field public static final int IMPORTED = 2; // 0x2
field public static final int UNKNOWN = 4; // 0x4
}
- public static abstract class KeyStoreKeyProperties.OriginEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.Purpose {
field public static final int DECRYPT = 2; // 0x2
field public static final int ENCRYPT = 1; // 0x1
@@ -30540,17 +30522,11 @@ package android.security {
field public static final int VERIFY = 8; // 0x8
}
- public static abstract class KeyStoreKeyProperties.PurposeEnum implements java.lang.annotation.Annotation {
- }
-
public static abstract class KeyStoreKeyProperties.SignaturePadding {
field public static final java.lang.String RSA_PKCS1 = "PKCS1";
field public static final java.lang.String RSA_PSS = "PSS";
}
- public static abstract class KeyStoreKeyProperties.SignaturePaddingEnum implements java.lang.annotation.Annotation {
- }
-
public class KeyStoreKeySpec implements java.security.spec.KeySpec {
method public java.lang.String[] getBlockModes();
method public java.lang.String[] getDigests();
diff --git a/keystore/java/android/security/EcIesParameterSpec.java b/keystore/java/android/security/EcIesParameterSpec.java
index a3e5aec..7af17ed 100644
--- a/keystore/java/android/security/EcIesParameterSpec.java
+++ b/keystore/java/android/security/EcIesParameterSpec.java
@@ -49,6 +49,9 @@ import javax.crypto.Mac;
*/
public class EcIesParameterSpec implements AlgorithmParameterSpec {
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@IntDef(value = {PointFormat.UNCOMPRESSED, PointFormat.COMPRESSED})
public @interface PointFormatEnum {}
diff --git a/keystore/java/android/security/KeyStoreKeyProperties.java b/keystore/java/android/security/KeyStoreKeyProperties.java
index 1cf6a7a..9ae4c9c 100644
--- a/keystore/java/android/security/KeyStoreKeyProperties.java
+++ b/keystore/java/android/security/KeyStoreKeyProperties.java
@@ -41,6 +41,9 @@ import javax.crypto.SecretKeyFactory;
public abstract class KeyStoreKeyProperties {
private KeyStoreKeyProperties() {}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@IntDef(flag = true,
value = {Purpose.ENCRYPT, Purpose.DECRYPT, Purpose.SIGN, Purpose.VERIFY})
@@ -131,6 +134,9 @@ public abstract class KeyStoreKeyProperties {
}
}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@StringDef({
Algorithm.RSA,
@@ -257,6 +263,9 @@ public abstract class KeyStoreKeyProperties {
}
}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@StringDef({
BlockMode.ECB,
@@ -350,6 +359,9 @@ public abstract class KeyStoreKeyProperties {
}
}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@StringDef({
EncryptionPadding.NONE,
@@ -437,6 +449,9 @@ public abstract class KeyStoreKeyProperties {
}
}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@StringDef({
SignaturePadding.RSA_PKCS1,
@@ -504,6 +519,9 @@ public abstract class KeyStoreKeyProperties {
}
}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@StringDef({
Digest.NONE,
@@ -639,6 +657,9 @@ public abstract class KeyStoreKeyProperties {
}
}
+ /**
+ * @hide
+ */
@Retention(RetentionPolicy.SOURCE)
@IntDef({Origin.GENERATED, Origin.IMPORTED, Origin.UNKNOWN})
public @interface OriginEnum {}
generated by cgit v1.1 at 2025-11-27 08:16:28 +0000