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

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

Change-Id: I20bb1006d93233dfe7dd73c12a0eaadee229e3d5
This commit is contained in:
Treehugger Robot
2021-08-24 17:52:12 +00:00
committed by Automerger Merge Worker
parent bce9262c0d 15d1ab2fdd
commit 6939d8d665
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 // Note: mNamespace == KeyProperties.NAMESPACE_APPLICATION implies that the target domain
// is Domain.APP and Domain.SELINUX is the target domain otherwise. // 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 != targetDomain
|| (descriptor.domain == Domain.SELINUX && descriptor.nspace != targetNamespace)) { || (descriptor.domain == Domain.SELINUX && descriptor.nspace != targetNamespace)) {
throw new KeyStoreException("Can only replace keys with same alias: " + alias throw new KeyStoreException("Can only replace keys with same alias: " + alias