Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11cce949 authored by Seth Moore's avatar Seth Moore
Browse files

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
parent a6f81885

keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java

+1 −1
Original line number Diff line number Diff line
@@ -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