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

am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."

Browse Source 
* commit '037dfb9423a0988398b67520546dae5673aa54bb':
  Track recent keymaster_defs.h changes.
This commit is contained in:
Alex Klyubin
2015-04-10 04:34:13 +00:00
committed by Android Git Automerger
parent 2c5eaa0157 037dfb9423
commit 8d33804b01
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/KeyStoreKeyConstraints.java
View File

@@ -164,7 +164,7 @@ public abstract class KeyStoreKeyConstraints {
case RSA:
return KeymasterDefs.KM_ALGORITHM_RSA;
case EC:
return KeymasterDefs.KM_ALGORITHM_ECDSA;
return KeymasterDefs.KM_ALGORITHM_EC;
default:
throw new IllegalArgumentException("Unknown algorithm: " + algorithm);
}
@@ -181,7 +181,7 @@ public abstract class KeyStoreKeyConstraints {
return HMAC;
case KeymasterDefs.KM_ALGORITHM_RSA:
return RSA;
case KeymasterDefs.KM_ALGORITHM_ECDSA:
case KeymasterDefs.KM_ALGORITHM_EC:
return EC;
default:
throw new IllegalArgumentException("Unknown algorithm: " + algorithm);