commit 77c4e48e80b989cb80599a40fbbad9a16745d89f
author Kenny Root <kroot@google.com> Thu Apr 04 17:02:29 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 04 17:02:29 2013 +0000
tree 3f37922a45e1b6755e1072a1022d95c36b349bcc
parent a2f747d48d8c2438b71c0ca980b221e1076d1fee
parent ff620c25d1af495c74cdeb4e5a652adf6858cf88

Merge "Fix CL split and build"

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index fdbea3d..34cab24 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -687,7 +687,7 @@
              */
             if (upgrade(filename, keyBlob, version, type)) {
                 if ((rc = this->put(filename, keyBlob)) != NO_ERROR
-                        || (rc = keyBlob->readBlob(filename, &mMasterKeyDecryption)) != NO_ERROR) {
+                        || (rc = keyBlob->decryptBlob(filename, &mMasterKeyDecryption)) != NO_ERROR) {
                     return rc;
                 }
             }