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

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

Merge "Fix deleting legacy key blobs"

parents b896d4fa 906147cd

keystore/java/android/security/Credentials.java

+5 −2
Original line number Diff line number Diff line
@@ -282,8 +282,11 @@ public class Credentials { 
     * Returns {@code true} if the entry no longer exists.

     */

    public static boolean deleteUserKeyTypeForAlias(KeyStore keystore, String alias, int uid) {

        return keystore.delete(Credentials.USER_PRIVATE_KEY + alias, uid) ||

                keystore.delete(Credentials.USER_SECRET_KEY + alias, uid);

        int ret = keystore.delete2(Credentials.USER_PRIVATE_KEY + alias, uid);

        if (ret == KeyStore.KEY_NOT_FOUND) {

            return keystore.delete(Credentials.USER_SECRET_KEY + alias, uid);

        }

        return ret == KeyStore.NO_ERROR;

    }



    /**

keystore/java/android/security/KeyStore.java

+8 −4
Original line number Diff line number Diff line
@@ -255,16 +255,20 @@ public class KeyStore { 
        }

    }



    public boolean delete(String key, int uid) {

    int delete2(String key, int uid) {

        try {

            int ret = mBinder.del(key, uid);

            return (ret == NO_ERROR || ret == KEY_NOT_FOUND);

            return mBinder.del(key, uid);

        } catch (RemoteException e) {

            Log.w(TAG, "Cannot connect to keystore", e);

            return false;

            return SYSTEM_ERROR;

        }

    }



    public boolean delete(String key, int uid) {

        int ret = delete2(key, uid);

        return ret == NO_ERROR || ret == KEY_NOT_FOUND;

    }



    @UnsupportedAppUsage

    public boolean delete(String key) {

        return delete(key, UID_SELF);