diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-01 15:29:12 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-06-02 23:35:59 -0600 |
| commit | ded8e7d0ad241fc0a930dbebbd9f2e2bf4e929a2 (patch) | |
| tree | a200409282ee2fde9bee1ca61937f678f2d74926 /android_keymaster.cpp | |
| parent | 951aa910f004d774883bab0255d64bfde510fb44 (diff) | |
| download | android_system_keymaster-ded8e7d0ad241fc0a930dbebbd9f2e2bf4e929a2.tar.gz android_system_keymaster-ded8e7d0ad241fc0a930dbebbd9f2e2bf4e929a2.tar.bz2 android_system_keymaster-ded8e7d0ad241fc0a930dbebbd9f2e2bf4e929a2.zip | |
Pass output params down to operations.
Change-Id: Ibd6956f6b8ef42f272d922050a7e5da3d78cffb7
Diffstat (limited to 'android_keymaster.cpp')
| -rw-r--r-- | android_keymaster.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android_keymaster.cpp b/android_keymaster.cpp index 253bbdb..57b02ac 100644 --- a/android_keymaster.cpp +++ b/android_keymaster.cpp @@ -260,8 +260,9 @@ void AndroidKeymaster::UpdateOperation(const UpdateOperationRequest& request, if (operation == NULL) return; - response->error = operation->Update(request.additional_params, request.input, &response->output, - &response->input_consumed); + response->error = + operation->Update(request.additional_params, request.input, &response->output_params, + &response->output, &response->input_consumed); if (response->error != KM_ERROR_OK) { // Any error invalidates the operation. operation_table_->Delete(request.op_handle); @@ -278,8 +279,8 @@ void AndroidKeymaster::FinishOperation(const FinishOperationRequest& request, if (operation == NULL) return; - response->error = - operation->Finish(request.additional_params, request.signature, &response->output); + response->error = operation->Finish(request.additional_params, request.signature, + &response->output_params, &response->output); operation_table_->Delete(request.op_handle); } |