From fe6d4769a86b1ab4cf9b5b20ea08f4e3ccd00ec6 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Sat, 23 Jun 2018 15:38:02 -0600 Subject: Correct the keystore alias used for secure imports An Android-O timeframe refactor removed all use of keystore "skey" aliases. Creating one not only partially reverses that refactor, but it also results in a key alias which cannot be deleted in some cases, causing AndroidKeyStoreTest failures during the second run of CTS. Bug: 80228327 Test: CTS tests ImportWrappedKeyTest and AndroidKeyStoreTest, in that order Change-Id: I348ba421f29cdf6c65fc98be3a25d19938d559c1 --- keystore/java/android/security/keystore/AndroidKeyStoreSpi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java index 2b5a37bd84e2..4c007cb70ba2 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreSpi.java @@ -811,7 +811,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi { } int errorCode = mKeyStore.importWrappedKey( - Credentials.USER_SECRET_KEY + alias, + Credentials.USER_PRIVATE_KEY + alias, entry.getWrappedKeyBytes(), Credentials.USER_PRIVATE_KEY + entry.getWrappingKeyAlias(), maskingKey, -- cgit v1.2.3-59-g8ed1b