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

Merge "Fix key alias string comparison" into sc-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-08-24 20:25:32 +00:00
committed by Android (Google) Code Review
parent 7ee7447166 7098945314
commit 1e1fa11538
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