commit ce4b51d3bdaff4f52c4c93c13d8d9dfb6c7bc781
author Brian Carlstrom <bdc@google.com> Thu Jun 23 00:58:19 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Jun 23 02:10:23 2011 -0700
tree 4b7ff964b91b9326f9432e198f45ab5f6d0c4cc7
parent 50f31b8381a9180c59f2410911542e41f87d7dbe

Reinitialize KeyStore::mMasterKey after unlock (and add test-keystore)

Bug: 4599735

Change-Id: Iee38a2e2929c45b6405214c9012819da09b273af

cmds/keystore/keystore.cpp

diff --git a/cmds/keystore/keystore.cpp b/cmds/keystore/keystore.cpp
index b48be6e..bbd1a1b 100644
--- a/cmds/keystore/keystore.cpp
+++ b/cmds/keystore/keystore.cpp
@@ -363,6 +363,7 @@
                 response = writeMasterKey(pw);
             }
             if (response == NO_ERROR) {
+                memcpy(mMasterKey, masterKeyBlob.getValue(), MASTER_KEY_SIZE_BYTES);
                 setupMasterKeys();
             }
             return response;