commit ec35536ef9f3a1929cbe0efd15bec49a0a659b64
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 23 19:47:31 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 23 19:47:31 2018 +0000
tree 522199c960adba312a631fb4c2419f3ae9100ce0
parent 0a198a0412d45b394d803d60b906b0c72aca8d2d
parent 30adb4986b4dec154552815d0e99c9fd5a946a36

Merge "Add support for BOOT and VENDOR patch levels to keymaster."

keystore/key_store_service.cpp

diff --git a/keystore/key_store_service.cpp b/keystore/key_store_service.cpp
index e5f1470..f748f4d 100644
--- a/keystore/key_store_service.cpp
+++ b/keystore/key_store_service.cpp
@@ -1690,13 +1690,10 @@
         error = mKeyStore->put(filename.string(), &ksBlob, get_user_id(callingUid));
     };
 
-    // TODO b/70904859 sanitize params and forward to keymaster
-    // forward rootSid and fingerprintSid
-    (void)params;
-    (void)rootSid;
-    (void)fingerprintSid;
-    rc = KS_HANDLE_HIDL_ERROR(
-        dev->importWrappedKey(wrappedKey, hidlWrappingKey, maskingKey, hidlCb));
+    rc = KS_HANDLE_HIDL_ERROR(dev->importWrappedKey(wrappedKey, hidlWrappingKey, maskingKey,
+                                                    params.getParameters(), rootSid, fingerprintSid,
+                                                    hidlCb));
+
     // possible hidl error
     if (!rc.isOk()) {
         return AIDL_RETURN(rc);