From 82e1283c317fbffd313c52400fb5a19e1f0cbd3a Mon Sep 17 00:00:00 2001 From: Ziyan Date: Tue, 2 Dec 2014 01:28:46 +0100 Subject: tuna: update keymaster to KEYMASTER_MODULE_API_VERSION_0_3 --- keymaster/keymaster_tuna.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'keymaster') diff --git a/keymaster/keymaster_tuna.cpp b/keymaster/keymaster_tuna.cpp index 0868072..ce97478 100644 --- a/keymaster/keymaster_tuna.cpp +++ b/keymaster/keymaster_tuna.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include /** The size of a key ID in bytes */ @@ -896,6 +896,7 @@ static int tee_open(const hw_module_t* module, const char* name, dev->common.version = 1; dev->common.module = (struct hw_module_t*) module; dev->common.close = tee_close; + dev->flags = 0; dev->generate_keypair = tee_generate_keypair; dev->import_keypair = tee_import_keypair; @@ -955,8 +956,8 @@ struct keystore_module HAL_MODULE_INFO_SYM __attribute__ ((visibility ("default"))) = { common: { tag: HARDWARE_MODULE_TAG, - version_major: 1, - version_minor: 0, + module_api_version: KEYMASTER_MODULE_API_VERSION_0_3, + hal_api_version: HARDWARE_HAL_API_VERSION, id: KEYSTORE_HARDWARE_MODULE_ID, name: "Keymaster TEE HAL", author: "The Android Open Source Project", -- cgit v1.1