diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-10 04:34:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 04:34:13 +0000 |
| commit | 8d33804b01d4fc871b7eed750fa6aad00861f984 (patch) | |
| tree | 0e18f03f069dbbee15b2071b0bd128923dde4afd /keystore/java | |
| parent | 2c5eaa0157f20b591b4c5f998d81021719b2e261 (diff) | |
| parent | 037dfb9423a0988398b67520546dae5673aa54bb (diff) | |
| download | frameworks_base-8d33804b01d4fc871b7eed750fa6aad00861f984.zip frameworks_base-8d33804b01d4fc871b7eed750fa6aad00861f984.tar.gz frameworks_base-8d33804b01d4fc871b7eed750fa6aad00861f984.tar.bz2 | |
am 037dfb94: am 5f8c17b9: am ba2836e6: Merge "Track recent keymaster_defs.h changes."
* commit '037dfb9423a0988398b67520546dae5673aa54bb':
Track recent keymaster_defs.h changes.
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/KeyStoreKeyConstraints.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystore/java/android/security/KeyStoreKeyConstraints.java b/keystore/java/android/security/KeyStoreKeyConstraints.java index e61092f..98ac3e7 100644 --- a/keystore/java/android/security/KeyStoreKeyConstraints.java +++ b/keystore/java/android/security/KeyStoreKeyConstraints.java @@ -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); |