diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-01 02:20:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 02:20:55 +0000 |
| commit | 55d53ac837dcdfc5d3e918636cfccf214231af7f (patch) | |
| tree | a6252e7d8036dea948f719cbe5408cd48f884870 /core/java/android/security | |
| parent | 1dd2e88ed442dcf99e6c91ee52e626f2bf31c400 (diff) | |
| parent | 36865896072ee78cae1e987f29340d35a1526f44 (diff) | |
| download | frameworks_base-55d53ac837dcdfc5d3e918636cfccf214231af7f.zip frameworks_base-55d53ac837dcdfc5d3e918636cfccf214231af7f.tar.gz frameworks_base-55d53ac837dcdfc5d3e918636cfccf214231af7f.tar.bz2 | |
am 36865896: am b48ebf48: am 562c6a71: Merge "UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH"
* commit '36865896072ee78cae1e987f29340d35a1526f44':
UNSUPPORTED_TAG_LENGTH -> UNSUPPORTED_MAC_LENGTH
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index c2ebbc6..e94a312 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -181,7 +181,7 @@ public final class KeymasterDefs { public static final int KM_ERROR_UNSUPPORTED_KEY_SIZE = -6; public static final int KM_ERROR_UNSUPPORTED_BLOCK_MODE = -7; public static final int KM_ERROR_INCOMPATIBLE_BLOCK_MODE = -8; - public static final int KM_ERROR_UNSUPPORTED_TAG_LENGTH = -9; + public static final int KM_ERROR_UNSUPPORTED_MAC_LENGTH = -9; public static final int KM_ERROR_UNSUPPORTED_PADDING_MODE = -10; public static final int KM_ERROR_INCOMPATIBLE_PADDING_MODE = -11; public static final int KM_ERROR_UNSUPPORTED_DIGEST = -12; @@ -237,8 +237,8 @@ public final class KeymasterDefs { sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_KEY_SIZE, "Unsupported key size"); sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_BLOCK_MODE, "Unsupported block mode"); sErrorCodeToString.put(KM_ERROR_INCOMPATIBLE_BLOCK_MODE, "Incompatible block mode"); - sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_TAG_LENGTH, - "Unsupported authentication tag length"); + sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_MAC_LENGTH, + "Unsupported MAC or authentication tag length"); sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_PADDING_MODE, "Unsupported padding mode"); sErrorCodeToString.put(KM_ERROR_INCOMPATIBLE_PADDING_MODE, "Incompatible padding mode"); sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_DIGEST, "Unsupported digest"); @@ -261,6 +261,7 @@ public final class KeymasterDefs { sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_TAG, "Unsupported tag"); sErrorCodeToString.put(KM_ERROR_INVALID_TAG, "Invalid tag"); sErrorCodeToString.put(KM_ERROR_MEMORY_ALLOCATION_FAILED, "Memory allocation failed"); + sErrorCodeToString.put(KM_ERROR_UNSUPPORTED_EC_FIELD, "Unsupported EC field"); sErrorCodeToString.put(KM_ERROR_UNIMPLEMENTED, "Not implemented"); sErrorCodeToString.put(KM_ERROR_UNKNOWN_ERROR, "Unknown error"); } |