diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-09 16:58:58 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-09 16:58:58 -0700 |
| commit | 862e6c78148e2254dfeccd5cde2a53bab2a74397 (patch) | |
| tree | fcfc52b0216f7e1c70c0adbfe5e52bbece3e6518 /core/java/android/security/keymaster | |
| parent | c6eb62882b09cf06e1e70c14e7878593d1a76477 (diff) | |
| download | frameworks_base-862e6c78148e2254dfeccd5cde2a53bab2a74397.zip frameworks_base-862e6c78148e2254dfeccd5cde2a53bab2a74397.tar.gz frameworks_base-862e6c78148e2254dfeccd5cde2a53bab2a74397.tar.bz2 | |
Track recent keymaster_defs.h changes.
Bug: 18088752
Change-Id: If47bb7cc7a385941db9f12d478676594e9bc9d86
Diffstat (limited to 'core/java/android/security/keymaster')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index 6176399..e4f872e 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -59,9 +59,6 @@ public final class KeymasterDefs { public static final int KM_TAG_BLOB_USAGE_REQUIREMENTS = KM_ENUM | 705; public static final int KM_TAG_RSA_PUBLIC_EXPONENT = KM_LONG | 200; - public static final int KM_TAG_DSA_GENERATOR = KM_BIGNUM | 201; - public static final int KM_TAG_DSA_P = KM_BIGNUM | 202; - public static final int KM_TAG_DSA_Q = KM_BIGNUM | 203; public static final int KM_TAG_ACTIVE_DATETIME = KM_DATE | 400; public static final int KM_TAG_ORIGINATION_EXPIRE_DATETIME = KM_DATE | 401; public static final int KM_TAG_USAGE_EXPIRE_DATETIME = KM_DATE | 402; @@ -91,22 +88,8 @@ public final class KeymasterDefs { // Algorithm values. public static final int KM_ALGORITHM_RSA = 1; - public static final int KM_ALGORITHM_DSA = 2; - public static final int KM_ALGORITHM_ECDSA = 3; - public static final int KM_ALGORITHM_ECIES = 4; + public static final int KM_ALGORITHM_EC = 3; public static final int KM_ALGORITHM_AES = 32; - public static final int KM_ALGORITHM_3DES = 33; - public static final int KM_ALGORITHM_SKIPJACK = 34; - public static final int KM_ALGORITHM_MARS = 48; - public static final int KM_ALGORITHM_RC6 = 49; - public static final int KM_ALGORITHM_SERPENT = 50; - public static final int KM_ALGORITHM_TWOFISH = 51; - public static final int KM_ALGORITHM_IDEA = 52; - public static final int KM_ALGORITHM_RC5 = 53; - public static final int KM_ALGORITHM_CAST5 = 54; - public static final int KM_ALGORITHM_BLOWFISH = 55; - public static final int KM_ALGORITHM_RC4 = 64; - public static final int KM_ALGORITHM_CHACHA20 = 65; public static final int KM_ALGORITHM_HMAC = 128; // Block modes. @@ -218,7 +201,6 @@ public final class KeymasterDefs { public static final int KM_ERROR_INVALID_TAG = -40; public static final int KM_ERROR_MEMORY_ALLOCATION_FAILED = -41; public static final int KM_ERROR_INVALID_RESCOPING = -42; - public static final int KM_ERROR_INVALID_DSA_PARAMS = -43; public static final int KM_ERROR_IMPORT_PARAMETER_MISMATCH = -44; public static final int KM_ERROR_SECURE_HW_ACCESS_DENIED = -45; public static final int KM_ERROR_OPERATION_CANCELLED = -46; |