commit dfa1c030e941cba4e66b362854d84b19298353c9
author Shawn Willden <swillden@google.com> Sat Feb 07 00:39:01 2015 -0700
committer Shawn Willden <swillden@google.com> Wed Mar 04 15:43:12 2015 -0700
tree 66e0aa89b59a14b9e51172027e941b28ce766134
parent 3b702e21e44df2dac32809a36e6a9c41227d798f

Add AAD support to AES OCB.

Also add OCB test vectors.

Change-Id: I33074bfea142aab334916c4567f92a6645fcab9f

soft_keymaster_device.cpp

diff --git a/soft_keymaster_device.cpp b/soft_keymaster_device.cpp
index 0724765..9bc4861 100644
--- a/soft_keymaster_device.cpp
+++ b/soft_keymaster_device.cpp
@@ -680,6 +680,13 @@
     if (response.error != KM_ERROR_OK)
         return response.error;
 
+    if (response.output_params.size() > 0) {
+        keymaster_key_param_set_t out_params_set;
+        response.output_params.CopyToParamSet(&out_params_set);
+        *out_params = out_params_set.params;
+        *out_params_count = out_params_set.length;
+    }
+
     *operation_handle = response.op_handle;
     return KM_ERROR_OK;
 }