commit 60898896c3f3b2245d10076cac64346c956dbaa5
author Kenny Root <kroot@google.com> Tue Apr 16 18:08:03 2013 -0700
committer Kenny Root <kroot@google.com> Thu Apr 18 16:00:54 2013 -0700
tree c2e97c6c446bcc7eccf9b833547df609310e0a6a
parent 1223495e44acbc2b94809de2455006ec24897734

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.

(cherry picked from commit 360f51f7af191316cd739f229db1c5f7233be063)

Bug: 8634328
Change-Id: I6bb9f66687552af990fdf90501f183930910ba8d

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);
     }