diff options
| author | Jocelyn Bohr <bohr@google.com> | 2017-02-09 17:46:49 -0800 |
|---|---|---|
| committer | Jocelyn Bohr <bohr@google.com> | 2017-04-10 17:33:49 -0700 |
| commit | 465615e538e889e4423fc4cbf49077403a8d9e41 (patch) | |
| tree | 7bfda8f4a1d47317040027e97e81bcb859f8f6f5 /trusty | |
| parent | e57f3ce2bf1536b80339b73bf664134d811a4bc9 (diff) | |
| download | system_core-465615e538e889e4423fc4cbf49077403a8d9e41.tar.gz system_core-465615e538e889e4423fc4cbf49077403a8d9e41.tar.bz2 system_core-465615e538e889e4423fc4cbf49077403a8d9e41.zip | |
trusty: keymaster: Implement abort
Test: builds
Change-Id: I8dfef740a75ff76aebd3ee63aa747e319193aaed
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/keymaster/trusty_keymaster_device.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/trusty/keymaster/trusty_keymaster_device.cpp b/trusty/keymaster/trusty_keymaster_device.cpp index 3f326400e..5f16fd0c0 100644 --- a/trusty/keymaster/trusty_keymaster_device.cpp +++ b/trusty/keymaster/trusty_keymaster_device.cpp @@ -626,7 +626,15 @@ keymaster_error_t TrustyKeymasterDevice::finish(keymaster_operation_handle_t ope keymaster_error_t TrustyKeymasterDevice::abort(keymaster_operation_handle_t operation_handle) { ALOGD("Device received abort"); - return KM_ERROR_OK; + + if (error_ != KM_ERROR_OK) { + return error_; + } + + AbortOperationRequest request; + request.op_handle = operation_handle; + AbortOperationResponse response; + return Send(KM_ABORT_OPERATION, request, &response); } hw_device_t* TrustyKeymasterDevice::hw_device() { |