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

Merge "Fix key alias string comparison" am: 15d1ab2fdd am: 6939d8d665

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1802873

Change-Id: Ie152bac2dcf7404c66bf69cc8c04fd52da6b6d42
This commit is contained in:
Treehugger Robot
2021-08-24 18:05:06 +00:00
committed by Automerger Merge Worker
parent a9185e3a4f 6939d8d665
commit 6e3e7a66b3
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/keystore2/AndroidKeyStoreSpi.java
View File

@@ -579,7 +579,7 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
//
// Note: mNamespace == KeyProperties.NAMESPACE_APPLICATION implies that the target domain
// is Domain.APP and Domain.SELINUX is the target domain otherwise.
if (alias != descriptor.alias
if (!alias.equals(descriptor.alias)
|| descriptor.domain != targetDomain
|| (descriptor.domain == Domain.SELINUX && descriptor.nspace != targetNamespace)) {
throw new KeyStoreException("Can only replace keys with same alias: " + alias