diff options
| author | 2018-06-23 15:38:02 -0600 | |
|---|---|---|
| committer | 2018-06-26 12:35:03 +0000 | |
| commit | fe6d4769a86b1ab4cf9b5b20ea08f4e3ccd00ec6 (patch) | |
| tree | 218fbe063b4984d9cdac0cb9c15ed1904f685d5f | |
| parent | 0eb2be3a679b146e068cf99e2dbf45b4181c0bfa (diff) | |
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
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreSpi.java | 2 |
1 files changed, 1 insertions, 1 deletions
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, |