diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-09 20:24:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 20:24:22 +0000 |
| commit | c6112eb7057f91df1f885da37564f89a423f64e4 (patch) | |
| tree | 44a5b1c22e4d09181050d5f34516ea2df0d2ba8c /keystore/java/android | |
| parent | e24d36b7b744540ccd3401609248ed9d48be4cc9 (diff) | |
| parent | 21c4e465f6a4783a9356bf1d88bda42192af022f (diff) | |
| download | frameworks_base-c6112eb7057f91df1f885da37564f89a423f64e4.zip frameworks_base-c6112eb7057f91df1f885da37564f89a423f64e4.tar.gz frameworks_base-c6112eb7057f91df1f885da37564f89a423f64e4.tar.bz2 | |
am 21c4e465: am 8c58ba87: Merge "Add missing mapping between JCA and keystore HMAC names."
* commit '21c4e465f6a4783a9356bf1d88bda42192af022f':
Add missing mapping between JCA and keystore HMAC names.
Diffstat (limited to 'keystore/java/android')
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStoreProvider.java | 1 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyStoreKeyConstraints.java | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/keystore/java/android/security/AndroidKeyStoreProvider.java b/keystore/java/android/security/AndroidKeyStoreProvider.java index 635b2fa..43f3b30 100644 --- a/keystore/java/android/security/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/AndroidKeyStoreProvider.java @@ -64,6 +64,7 @@ public class AndroidKeyStoreProvider extends Provider { putSecretKeyFactoryImpl("HmacSHA512"); // javax.crypto.Mac + putMacImpl("HmacSHA1", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA1"); putMacImpl("HmacSHA224", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA224"); putMacImpl("HmacSHA256", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA256"); putMacImpl("HmacSHA384", PACKAGE_NAME + ".KeyStoreHmacSpi$HmacSHA384"); diff --git a/keystore/java/android/security/KeyStoreKeyConstraints.java b/keystore/java/android/security/KeyStoreKeyConstraints.java index 7f691fb..02108fd 100644 --- a/keystore/java/android/security/KeyStoreKeyConstraints.java +++ b/keystore/java/android/security/KeyStoreKeyConstraints.java @@ -213,8 +213,18 @@ public abstract class KeyStoreKeyConstraints { throw new IllegalArgumentException("HMAC digest not specified"); } switch (digest) { + case Digest.MD5: + return "HmacMD5"; + case Digest.SHA1: + return "HmacSHA1"; + case Digest.SHA224: + return "HmacSHA224"; case Digest.SHA256: return "HmacSHA256"; + case Digest.SHA384: + return "HmacSHA384"; + case Digest.SHA512: + return "HmacSHA512"; default: throw new IllegalArgumentException( "Unsupported HMAC digest: " + digest); |