diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-01 01:32:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-01 01:32:53 +0000 |
| commit | 02192692802b61661385955b0370fdb3e5a26282 (patch) | |
| tree | 428e7ecf366011c295bc0b33b526a17821402bb1 /core | |
| parent | 6dc2c89b49c5549c27a22111db7d4ec1b4827e86 (diff) | |
| parent | c89e1a96c5e4cc16928341f30a45e315d1a4abb6 (diff) | |
| download | frameworks_base-02192692802b61661385955b0370fdb3e5a26282.zip frameworks_base-02192692802b61661385955b0370fdb3e5a26282.tar.gz frameworks_base-02192692802b61661385955b0370fdb3e5a26282.tar.bz2 | |
am c89e1a96: am c8b068ce: am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
* commit 'c89e1a96c5e4cc16928341f30a45e315d1a4abb6':
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index d8834fe..0e2b8ba 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -238,6 +238,8 @@ public final class KeymasterDefs { 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_CALLER_NONCE_PROHIBITED, + "Caller-provided IV not permitted"); sErrorCodeToString.put(KM_ERROR_UNIMPLEMENTED, "Not implemented"); sErrorCodeToString.put(KM_ERROR_UNKNOWN_ERROR, "Unknown error"); } |