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

Commit 15d1ab2f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix key alias string comparison"

parents 39366563 11cce949

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