commit f5dd5d06740516229b565177cc337582fa5d39c7
author Roshan Pius <rpius@google.com> Wed Sep 20 15:54:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 20 15:54:11 2017 +0000
tree 63846d355b9572e304099dc0f9e797775beb1e4c
parent 098c340c821e9fdb3c24664cecf6618d0e5e99eb
parent 706823962c6a37c8042aa2026f5e88cb696ee78d

Merge "key_store:Using euid instead of uid when upgrade wifi blobs" am: 63d98e08b8 am: ff0f7e048a
am: 706823962c

Change-Id: I67e8004d22d6462f8e246582693e63ae50cfe3f5

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index 310d8e2..86d7e44 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1895,6 +1895,13 @@
 
         String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, uid, ::TYPE_KEYMASTER_10));
         error = mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(uid));
+        if(error == ResponseCode::KEY_NOT_FOUND){
+            uid_t euid = get_keystore_euid(uid);
+            if ((euid != uid) && (euid == AID_WIFI)) {
+                filename=mKeyStore->getKeyNameForUidWithDir(name8, euid, ::TYPE_KEYMASTER_10);
+                error=mKeyStore->del(filename.string(), ::TYPE_ANY, get_user_id(euid));
+            }
+        }
         if (!error.isOk()) {
             ALOGI("upgradeKeyBlob keystore->del failed %d", (int)error);
             return;