diff options
| author | 2018-06-27 22:43:43 -0700 | |
|---|---|---|
| committer | 2018-06-27 22:43:43 -0700 | |
| commit | 23164924a9beabe95caaf3539b29148822e42c30 (patch) | |
| tree | a68588d60813609e2c03df3342c4ec24fd6d22c4 | |
| parent | ac05a1b791ad0761db7721f654604830c9c29cdf (diff) | |
| parent | bd3440cac92847119605f914678466b5de77f502 (diff) | |
Merge "Correct the keystore alias used for secure imports" into pi-dev am: 143c65d520
am: bd3440cac9
Change-Id: I84b68a7caa793c776140cdd2bd79b5b76c63ddd3
| -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, |