commit 52415c53e2c0cf1dbbcad11d5ff22e9817709b22
author Zhen Kong <zkong@codeaurora.org> Wed Sep 30 18:42:58 2015 -0700
committer Linux Build Service Account <lnxbuild@localhost> Tue Oct 06 03:22:48 2015 -0600
tree 4d06cbbc6c275cec503d1f986af60c6133d124b6
parent cbfdeefef7a12fcb383e8b0f840771f6983927aa

keystore: Read KeyBlob after type change

During type change, the keyblob gets encrypted,
read keyblob again to decrypt the keyblob.

Change-Id: I74e9c4b835e165d71a5e4a265496247bf72a6737

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index 65a8ea9..609a578 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -1201,6 +1201,15 @@
         if (keyBlob->getType() == TYPE_KEY_PAIR) {
             keyBlob->setType(TYPE_KEYMASTER_10);
             rc = this->put(filename, keyBlob, userId);
+            if (rc != NO_ERROR) {
+                return rc;
+            }
+
+            rc = keyBlob->readBlob(filename, userState->getDecryptionKey(),
+                userState->getState());
+            if (rc != NO_ERROR) {
+                return rc;
+            }
         }
 
         if (type != TYPE_ANY && keyBlob->getType() != type) {