diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-10 17:51:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-10 17:51:49 +0000 |
| commit | a270264c61daa42a5b03bbb1e7f23e77780f8fc0 (patch) | |
| tree | 6a6d74772e702c5fa82b69055e1f4043aaac0ab4 /core/java/android/security | |
| parent | 08d76a946b898af28f3c8125cdf4966195b718fb (diff) | |
| parent | 55f7c2770faade3543bebd833124f2f15c0f7455 (diff) | |
| download | frameworks_base-a270264c61daa42a5b03bbb1e7f23e77780f8fc0.zip frameworks_base-a270264c61daa42a5b03bbb1e7f23e77780f8fc0.tar.gz frameworks_base-a270264c61daa42a5b03bbb1e7f23e77780f8fc0.tar.bz2 | |
Merge "Track more changes to keymaster_defs.h"
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index e4f872e..bb9c465 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -96,18 +96,9 @@ public final class KeymasterDefs { public static final int KM_MODE_FIRST_UNAUTHENTICATED = 1; public static final int KM_MODE_ECB = KM_MODE_FIRST_UNAUTHENTICATED; public static final int KM_MODE_CBC = 2; - public static final int KM_MODE_CBC_CTS = 3; public static final int KM_MODE_CTR = 4; - public static final int KM_MODE_OFB = 5; - public static final int KM_MODE_CFB = 6; - public static final int KM_MODE_XTS = 7; public static final int KM_MODE_FIRST_AUTHENTICATED = 32; public static final int KM_MODE_GCM = KM_MODE_FIRST_AUTHENTICATED; - public static final int KM_MODE_OCB = 33; - public static final int KM_MODE_CCM = 34; - public static final int KM_MODE_FIRST_MAC = 128; - public static final int KM_MODE_CMAC = KM_MODE_FIRST_MAC; - public static final int KM_MODE_POLY1305 = 129; // Padding modes. public static final int KM_PAD_NONE = 1; @@ -115,11 +106,7 @@ public final class KeymasterDefs { public static final int KM_PAD_RSA_PSS = 3; public static final int KM_PAD_RSA_PKCS1_1_5_ENCRYPT = 4; public static final int KM_PAD_RSA_PKCS1_1_5_SIGN = 5; - public static final int KM_PAD_ANSI_X923 = 32; - public static final int KM_PAD_ISO_10126 = 33; - public static final int KM_PAD_ZERO = 64; - public static final int KM_PAD_PKCS7 = 65; - public static final int KM_PAD_ISO_7816_4 = 66; + public static final int KM_PAD_PKCS7 = 64; // Digest modes. public static final int KM_DIGEST_NONE = 0; @@ -129,9 +116,6 @@ public final class KeymasterDefs { public static final int KM_DIGEST_SHA_2_256 = 4; public static final int KM_DIGEST_SHA_2_384 = 5; public static final int KM_DIGEST_SHA_2_512 = 6; - public static final int KM_DIGEST_SHA_3_256 = 7; - public static final int KM_DIGEST_SHA_3_384 = 8; - public static final int KM_DIGEST_SHA_3_512 = 9; // Key origins. public static final int KM_ORIGIN_HARDWARE = 0; @@ -151,7 +135,6 @@ public final class KeymasterDefs { // Key formats. public static final int KM_KEY_FORMAT_X509 = 0; public static final int KM_KEY_FORMAT_PKCS8 = 1; - public static final int KM_KEY_FORMAT_PKCS12 = 2; public static final int KM_KEY_FORMAT_RAW = 3; // User authenticators. |