diff options
| author | 2015-04-30 21:00:59 +0000 | |
|---|---|---|
| committer | 2015-04-30 21:01:00 +0000 | |
| commit | cf2999aacf45506ff6f9c2876bfd4fd5a99fc394 (patch) | |
| tree | 150c8bd85c5ef36a3d55930e4e7fa7e475963266 | |
| parent | db672b03a2de26127b40dbe50c794b5697b01c37 (diff) | |
| parent | 6358b881f2e483a4d96ff440fb19136e2d25e893 (diff) | |
Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 2 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyStoreCryptoOperationUtils.java | 2 |
2 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 d8834fec5000..0e2b8ba85749 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"); } diff --git a/keystore/java/android/security/KeyStoreCryptoOperationUtils.java b/keystore/java/android/security/KeyStoreCryptoOperationUtils.java index 313b5270a32d..e5933add7331 100644 --- a/keystore/java/android/security/KeyStoreCryptoOperationUtils.java +++ b/keystore/java/android/security/KeyStoreCryptoOperationUtils.java @@ -74,6 +74,8 @@ abstract class KeyStoreCryptoOperationUtils { switch (beginOpResultCode) { case KeymasterDefs.KM_ERROR_INVALID_NONCE: return new InvalidAlgorithmParameterException("Invalid IV"); + case KeymasterDefs.KM_ERROR_CALLER_NONCE_PROHIBITED: + return new InvalidAlgorithmParameterException("Caller-provided IV not permitted"); } // General cases |