diff options
| author | 2015-04-16 17:20:37 +0000 | |
|---|---|---|
| committer | 2015-04-16 17:20:37 +0000 | |
| commit | 8ce568e756c4096002d2bfb786114aac5a06e54e (patch) | |
| tree | 2fd16b2ed99776744c4843a67a6d0d94c84dcc17 | |
| parent | 3abd2b757a2515de67993e2a94290b77ee6b352e (diff) | |
| parent | f39aa3d0898b845ced3128f1778fd04171e4b9a6 (diff) | |
am f39aa3d0: am a2607ee4: am b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit 'f39aa3d0898b845ced3128f1778fd04171e4b9a6':
Add IV-related Keymaster error codes.
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index ea53c0d66939..ab8a8b67095c 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -192,6 +192,8 @@ public final class KeymasterDefs { public static final int KM_ERROR_SECURE_HW_BUSY = -48; public static final int KM_ERROR_SECURE_HW_COMMUNICATION_FAILED = -49; 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_UNIMPLEMENTED = -100; public static final int KM_ERROR_VERSION_MISMATCH = -101; public static final int KM_ERROR_UNKNOWN_ERROR = -1000; @@ -231,6 +233,8 @@ public final class KeymasterDefs { 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_MISSING_NONCE, "Required IV missing"); + sErrorCodeToString.put(KM_ERROR_INVALID_NONCE, "Invalid IV"); sErrorCodeToString.put(KM_ERROR_UNIMPLEMENTED, "Not implemented"); sErrorCodeToString.put(KM_ERROR_UNKNOWN_ERROR, "Unknown error"); } |