summaryrefslogtreecommitdiff
path: root/keystore/java/android/security/AndroidKeyPairGenerator.java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-03-26 14:46:55 -0700
committerAlex Klyubin <klyubin@google.com>2015-03-26 15:37:15 -0700
commitbaf2838fd2c7ddf517bd5bd9917551a4706af5b6 (patch)
treea421eba5106cc2cd019c303d0b0c40383fb92494 /keystore/java/android/security/AndroidKeyPairGenerator.java
parent6326f964769c603382ee6694b33954b4ff9b9a52 (diff)
Symmetric key import for AndroidKeyStore.
AES and HmacSHA256 symmetric keys can now be imported into AndroidKeyStore. These keys cannot yet be used. Bug: 18088752 Change-Id: Iad2fd49d15ac4c2d676abe1153f5b5f0b6ff496c
Diffstat (limited to 'keystore/java/android/security/AndroidKeyPairGenerator.java')
-rw-r--r--keystore/java/android/security/AndroidKeyPairGenerator.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/keystore/java/android/security/AndroidKeyPairGenerator.java b/keystore/java/android/security/AndroidKeyPairGenerator.java
index 9d9a173353c5..5fae831de8d7 100644
--- a/keystore/java/android/security/AndroidKeyPairGenerator.java
+++ b/keystore/java/android/security/AndroidKeyPairGenerator.java
@@ -136,6 +136,8 @@ public abstract class AndroidKeyPairGenerator extends KeyPairGeneratorSpi {
throw new IllegalStateException("could not generate key in keystore");
}
+ Credentials.deleteSecretKeyTypeForAlias(mKeyStore, alias);
+
final PrivateKey privKey;
final OpenSSLEngine engine = OpenSSLEngine.getInstance("keystore");
try {