commit 0a198a0412d45b394d803d60b906b0c72aca8d2d
author Shawn Willden <swillden@google.com> Fri Jan 19 13:36:31 2018 -0700
committer Shawn Willden <swillden@google.com> Fri Jan 19 14:33:07 2018 -0700
tree a34cb50e01338b62139a9eb6f927fb6609c20c1f
parent eedcfe96d1b4517eb5201a8557aedc00d806c88a

Add additional parameters to importWrappedKey

Bug: 31675676
Bug: 70904859
Test: Keystore CTS tests
Change-Id: I290d380f9326fb508664dbe67266db66df428050

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);