| author | Xindong Xu <xindong.xu@amlogic.com> | 2017-12-18 01:15:06 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2017-12-18 01:17:58 (GMT) |
| commit | 71353b2525a0c677b704e4f096be5e8e7ba1db10 (patch) | |
| tree | c7c97f7f93afe5664bb88c87ef4e24a072c87722 | |
| parent | eed59c96e9da1c01fecab4a7d6b8b45ff9f0aa3e (diff) | |
| download | keymaster-71353b2525a0c677b704e4f096be5e8e7ba1db10.zip keymaster-71353b2525a0c677b704e4f096be5e8e7ba1db10.tar.gz keymaster-71353b2525a0c677b704e4f096be5e8e7ba1db10.tar.bz2 | |
bringup: delete link lib libkeymaster1 [9/12]
PD# 156770
from 8.1, libkeymaster1 had been deleted, so we can not link it
Change-Id: I208904981d3cfaaf868de8595f10fea65eb36050
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | aml_keymaster_device.h | 25 |
2 files changed, 0 insertions, 27 deletions
@@ -41,7 +41,6 @@ LOCAL_SHARED_LIBRARIES := libcrypto \ libkeystore_binder \ libteec \ libkeymaster_messages \ - libkeymaster1 \ libteec LOCAL_MODULE_TAGS := optional @@ -108,7 +107,6 @@ LOCAL_MODULE_TAGS := tests LOCAL_SHARED_LIBRARIES := \ libsoftkeymasterdevice \ libkeymaster_messages \ - libkeymaster1 \ libcrypto \ libsoftkeymaster \ libhardware diff --git a/aml_keymaster_device.h b/aml_keymaster_device.h index 9ccf22f..fb2a052 100644 --- a/aml_keymaster_device.h +++ b/aml_keymaster_device.h @@ -162,31 +162,6 @@ class AmlKeymasterDevice { TEEC_Session KM_session; }; -struct ConfigureRequest : public KeymasterMessage { - explicit ConfigureRequest(int32_t ver = MAX_MESSAGE_VERSION) : KeymasterMessage(ver) {} - - size_t SerializedSize() const override { return sizeof(os_version) + sizeof(os_patchlevel); } - uint8_t* Serialize(uint8_t* buf, const uint8_t* end) const override { - buf = append_uint32_to_buf(buf, end, os_version); - return append_uint32_to_buf(buf, end, os_patchlevel); - } - bool Deserialize(const uint8_t** buf_ptr, const uint8_t* end) override { - return copy_uint32_from_buf(buf_ptr, end, &os_version) && - copy_uint32_from_buf(buf_ptr, end, &os_patchlevel); - } - - uint32_t os_version; - uint32_t os_patchlevel; -}; - -struct ConfigureResponse : public KeymasterResponse { - explicit ConfigureResponse(int32_t ver = MAX_MESSAGE_VERSION) : KeymasterResponse(ver) {} - - size_t NonErrorSerializedSize() const override { return 0; } - uint8_t* NonErrorSerialize(uint8_t* buf, const uint8_t*) const override { return buf; } - bool NonErrorDeserialize(const uint8_t**, const uint8_t*) override { return true; } -}; - } // namespace keymaster #endif // AML_KEYMASTER_AML_KEYMASTER_DEVICE_H_ |