Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Correct the keystore alias used for secure imports" into pi-dev

Browse Source 
am: 143c65d520

Change-Id: I100df017d1a6ad28cea2c6d78b1b0c55230897b3
This commit is contained in:
Shawn Willden
2018-06-27 22:16:49 -07:00
committed by android-build-merger
parent 69baf0d2a4 143c65d520
commit bd3440cac9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystore/java/android/security/keystore/AndroidKeyStoreSpi.java
View File

@@ -811,7 +811,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
} }
int errorCode = mKeyStore.importWrappedKey( int errorCode = mKeyStore.importWrappedKey(
Credentials.USER_SECRET_KEY + alias, Credentials.USER_PRIVATE_KEY + alias,
entry.getWrappedKeyBytes(), entry.getWrappedKeyBytes(),
Credentials.USER_PRIVATE_KEY + entry.getWrappingKeyAlias(), Credentials.USER_PRIVATE_KEY + entry.getWrappingKeyAlias(),
maskingKey, maskingKey,