diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-01 13:06:45 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-06-02 14:38:35 -0700 |
| commit | 0fe70813e03891a2fe0efdc16cd289d646205682 (patch) | |
| tree | 77ef12fcbe96baed1d628785ffff9a10f8ddbdd2 /core/java/android/security/keymaster | |
| parent | 3aa33b3da04774d76e1a65b749667450dc81532b (diff) | |
| download | frameworks_base-0fe70813e03891a2fe0efdc16cd289d646205682.zip frameworks_base-0fe70813e03891a2fe0efdc16cd289d646205682.tar.gz frameworks_base-0fe70813e03891a2fe0efdc16cd289d646205682.tar.bz2 | |
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
Diffstat (limited to 'core/java/android/security/keymaster')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index 0e2b8ba..b450a6b 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -50,8 +50,7 @@ public final class KeymasterDefs { 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_CALLER_NONCE = KM_BOOL | 7; public static final int KM_TAG_RESCOPING_ADD = KM_ENUM_REP | 101; public static final int KM_TAG_RESCOPING_DEL = KM_ENUM_REP | 102; @@ -82,7 +81,7 @@ 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_CHUNK_LENGTH = KM_INT | 1002; + public static final int KM_TAG_AEAD_TAG = KM_BYTES | 1002; public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1003; public static final int KM_TAG_MAC_LENGTH = KM_INT | 1004; @@ -194,7 +193,7 @@ public final class KeymasterDefs { public static final int KM_ERROR_UNSUPPORTED_EC_FIELD = -50; public static final int KM_ERROR_MISSING_NONCE = -51; public static final int KM_ERROR_INVALID_NONCE = -52; - public static final int KM_ERROR_UNSUPPORTED_CHUNK_LENGTH = -53; + public static final int KM_ERROR_MISSING_MAC_LENGTH = -53; public static final int KM_ERROR_RESCOPABLE_KEY_NOT_USABLE = -54; public static final int KM_ERROR_CALLER_NONCE_PROHIBITED = -55; public static final int KM_ERROR_UNIMPLEMENTED = -100; |