commit af3e993d459791f77feb66756bc2ac21d46a052a
author Chad Brubaker <cbrubaker@google.com> Mon Mar 16 21:54:28 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 16 21:55:07 2015 +0000
tree 73a635740a5db944bd6cecb020f386c328a1eb77
parent f24ee2bb983a1646a058d8c816411d1a83fa2672
parent f3f071fc5020fa5255f49e898a7c4a1cbf824a99

Merge "Implement keymaster 1.0 get_key_characteristics method"

keystore-engine/Android.mk

diff --git a/keystore-engine/Android.mk b/keystore-engine/Android.mk
index e409952..1f5d903 100644
--- a/keystore-engine/Android.mk
+++ b/keystore-engine/Android.mk
@@ -30,6 +30,8 @@
 else
   LOCAL_MODULE := libkeystore
 
+  LOCAL_MODULE_RELATIVE_PATH := ssl/engines
+
   LOCAL_SRC_FILES := \
 	eng_keystore.cpp \
 	keyhandle.cpp \

keystore/keystore.cpp

diff --git a/keystore/keystore.cpp b/keystore/keystore.cpp
index a2ef175..7300e16 100644
--- a/keystore/keystore.cpp
+++ b/keystore/keystore.cpp
@@ -2484,8 +2484,6 @@
             return ::PERMISSION_DENIED;
         }
 
-        uint8_t* data;
-        size_t dataLength;
         int rc = KM_ERROR_UNIMPLEMENTED;
         bool isFallback = false;
         keymaster_key_blob_t blob;