diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-03-31 23:32:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 23:32:41 +0000 |
| commit | 19e79e12d82fa473f2f7beec337de11a0c3b3a03 (patch) | |
| tree | b343591046b85799cb422221c01752e9c10b855b /keystore/java/android/security/AndroidKeyStoreProvider.java | |
| parent | d720dedb03dfc937361e7e722171f8a1b9d74cf1 (diff) | |
| parent | acc835f3857c1a1bf2618fabb7307794aba5d76a (diff) | |
Merge "Add SecretKeyFactory backed by AndroidKeyStore."
Diffstat (limited to 'keystore/java/android/security/AndroidKeyStoreProvider.java')
| -rw-r--r-- | keystore/java/android/security/AndroidKeyStoreProvider.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/keystore/java/android/security/AndroidKeyStoreProvider.java b/keystore/java/android/security/AndroidKeyStoreProvider.java index 6cf9b7a71be6..39f9d9c6174c 100644 --- a/keystore/java/android/security/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/AndroidKeyStoreProvider.java @@ -40,6 +40,10 @@ public class AndroidKeyStoreProvider extends Provider { put("KeyGenerator.AES", KeyStoreKeyGeneratorSpi.AES.class.getName()); put("KeyGenerator.HmacSHA256", KeyStoreKeyGeneratorSpi.HmacSHA256.class.getName()); + // java.security.SecretKeyFactory + put("SecretKeyFactory.AES", KeyStoreSecretKeyFactorySpi.class.getName()); + put("SecretKeyFactory.HmacSHA256", KeyStoreSecretKeyFactorySpi.class.getName()); + // javax.crypto.Mac putMacImpl("HmacSHA256", KeyStoreHmacSpi.HmacSHA256.class.getName()); |