diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-10 21:21:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-10 21:21:37 +0000 |
| commit | 97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f (patch) | |
| tree | 3807d214ccaf26e916c0e58f5ff2b82b6b223f63 | |
| parent | 4406568ebac6f6bbf627aeb6909b409d948cecf4 (diff) | |
| parent | 59f977c6988e21b3b8aa6c83428bd6ee1a98816d (diff) | |
| download | frameworks_base-97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f.zip frameworks_base-97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f.tar.gz frameworks_base-97fce66f7d6c5803dfa49f7ab9a0d9e9b009082f.tar.bz2 | |
Merge "Make several key crypto parameters repeatable"
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index bb9c465..d3953b3 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -47,12 +47,11 @@ public final class KeymasterDefs { public static final int KM_TAG_PURPOSE = KM_ENUM_REP | 1; public static final int KM_TAG_ALGORITHM = KM_ENUM | 2; public static final int KM_TAG_KEY_SIZE = KM_INT | 3; - public static final int KM_TAG_BLOCK_MODE = KM_ENUM | 4; - public static final int KM_TAG_DIGEST = KM_ENUM | 5; - public static final int KM_TAG_MAC_LENGTH = KM_INT | 6; - public static final int KM_TAG_PADDING = KM_ENUM | 7; - public static final int KM_TAG_RETURN_UNAUTHED = KM_BOOL | 8; - public static final int KM_TAG_CALLER_NONCE = KM_BOOL | 9; + public static final int KM_TAG_BLOCK_MODE = KM_ENUM_REP | 4; + public static final int KM_TAG_DIGEST = KM_ENUM_REP | 5; + public static final int KM_TAG_PADDING = KM_ENUM_REP | 6; + public static final int KM_TAG_RETURN_UNAUTHED = KM_BOOL | 7; + public static final int KM_TAG_CALLER_NONCE = KM_BOOL | 8; public static final int KM_TAG_RESCOPING_ADD = KM_ENUM_REP | 101; public static final int KM_TAG_RESCOPING_DEL = KM_ENUM_REP | 102; @@ -85,6 +84,7 @@ public final class KeymasterDefs { public static final int KM_TAG_NONCE = KM_BYTES | 1001; public static final int KM_TAG_CHUNK_LENGTH = KM_INT | 1002; public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1003; + public static final int KM_TAG_MAC_LENGTH = KM_INT | 1004; // Algorithm values. public static final int KM_ALGORITHM_RSA = 1; |