Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cf2999aa: Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev

Browse Source 
* commit 'cf2999aacf45506ff6f9c2876bfd4fd5a99fc394':
  Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
This commit is contained in:
Alex Klyubin
2015-04-30 21:09:46 +00:00
committed by Android Git Automerger
parent 1d8aae3b19 cf2999aacf
commit c8b068ce47
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/keymaster/KeymasterDefs.java
View File

@@ -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");
}

2
keystore/java/android/security/KeyStoreCryptoOperationUtils.java
View File

@@ -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