diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-16 16:39:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-04-16 16:39:31 +0000 |
| commit | b9a78c7939e9b31c807106166cafe65dc5af777d (patch) | |
| tree | 71d9c7651232be285894ead9a2571d77d0595795 | |
| parent | 216d18b997eb929c2c3af9b2102595f4ec694c20 (diff) | |
| parent | 37d81d035c8a51112f40b67db3fa479df58fd120 (diff) | |
| download | frameworks_base-b9a78c7939e9b31c807106166cafe65dc5af777d.zip frameworks_base-b9a78c7939e9b31c807106166cafe65dc5af777d.tar.gz frameworks_base-b9a78c7939e9b31c807106166cafe65dc5af777d.tar.bz2 | |
Merge "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 d3953b3..46a04b1 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -191,6 +191,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; @@ -230,6 +232,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"); } |