commit 360f51f7af191316cd739f229db1c5f7233be063
author Kenny Root <kroot@google.com> Tue Apr 16 18:08:03 2013 -0700
committer Kenny Root <kroot@google.com> Tue Apr 16 18:11:29 2013 -0700
tree 2eb2de04d994290837e8909a9cf24ee77c610ba6
parent 5d884972cac7c20b6b1c9ad9148872b07c974e69

keystore: fix import as other UIDs

The targetUid was not being used as the user to store the key as, so it
was ending up under the calling UID. This change matches the code for
insert and generate now.

Bug: 8634328
Change-Id: Iedbbdaa0ac77f3aedb32a719458b5b503a66efd5

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 5729dbd..9b08398 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -1727,7 +1727,7 @@
         }
 
         String8 name8(name);
-        String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, callingUid));
+        String8 filename(mKeyStore->getKeyNameForUidWithDir(name8, targetUid));
 
         return mKeyStore->importKey(data, length, filename.string(), callingUid, flags);
     }