From 11cce949b6e378c69223802b9fc26912734cceae Mon Sep 17 00:00:00 2001 From: Seth Moore Date: Thu, 19 Aug 2021 09:11:01 -0700 Subject: [PATCH] Fix key alias string comparison The code was doing a reference compare, not object value comparison, resulting in failures in the KeyStore setEntry API. Test: CtsKeystoreTestCases:android.keystore.cts.AndroidKeyStoreTest Fixes: 197138784 Change-Id: I2c5e47283eed5694951869e9ea3853364ddef9d1 --- .../java/android/security/keystore2/AndroidKeyStoreSpi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java index f3cfcf18dec1..67358c4f3255 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java @@ -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