commit 7c1eb75a6898452867ca28a4d7fad2d91edca615
author Chad Brubaker <cbrubaker@google.com> Fri Feb 20 14:08:59 2015 -0800
committer Chad Brubaker <cbrubaker@google.com> Fri Feb 20 14:08:59 2015 -0800
tree c86d021f27bae9f1d9111418c57e088792237a30
parent c3d14005892efde05a7abdb476d7ffcd79fe5ff4

Fix incorrect keymaster device usage.

importKey's fallback code used mDevice instead of mFallbackDevice when
falling back to software. Causing a crash.

Change-Id: Ic53bdbce9ae0d242ed958323c505cbf91372e421

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index eb1b836..f00fa6f 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -1271,7 +1271,7 @@
              * lazier than checking the PKCS#8 key type, but the software
              * implementation will do that anyway.
              */
-            rc = mFallbackDevice->import_keypair(mDevice, key, keyLen, &data, &dataLength);
+            rc = mFallbackDevice->import_keypair(mFallbackDevice, key, keyLen, &data, &dataLength);
             isFallback = true;
 
             if (rc) {