Add SecretKeyFactory backed by AndroidKeyStore.

This factory provides a way to obtain information about a SecretKey
backed by AndroidKeyStore. The information is provided in a form of an
instance of KeyStoreKeySpec class.

EXAMPLE

SecretKeyFactory factory = SecretKeyFactory.getInstance(
        key.getAlgorithm(), "AndroidKeyStore");
KeyStoreKeySpec keySpec =
    factory.getKeySpec(key, KeyStoreKeySpec.class);

Bug: 18088752
Change-Id: I26c9dd544f80230fe7039501eeb471eaf875452b

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());