diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-19 03:16:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-19 03:16:55 +0000 |
| commit | 096148087980ea5a92e1b96579900ea36727fbbc (patch) | |
| tree | 48adbf557adbde2924063717ef74367ed59c740d /core/java | |
| parent | a353528c79e0e295a98a79f8672ace6df8647f78 (diff) | |
| parent | 42abb74834dc56393fad9f32a6717269c58c1eb3 (diff) | |
| download | frameworks_base-096148087980ea5a92e1b96579900ea36727fbbc.zip frameworks_base-096148087980ea5a92e1b96579900ea36727fbbc.tar.gz frameworks_base-096148087980ea5a92e1b96579900ea36727fbbc.tar.bz2 | |
Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index 3fb93c4..e4fab12 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -81,8 +81,8 @@ public final class KeymasterDefs { public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000; public static final int KM_TAG_NONCE = KM_BYTES | 1001; - public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1003; - public static final int KM_TAG_MAC_LENGTH = KM_INT | 1004; + public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1002; + public static final int KM_TAG_MAC_LENGTH = KM_INT | 1003; // Algorithm values. public static final int KM_ALGORITHM_RSA = 1; |