diff options
| author | Ziyan <jaraidaniel@gmail.com> | 2014-12-02 01:28:46 +0100 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2014-12-13 00:39:25 +0100 |
| commit | 82e1283c317fbffd313c52400fb5a19e1f0cbd3a (patch) | |
| tree | da61a12688e43dc9b1da555f499e9b5933d1e916 /keymaster | |
| parent | 8ebe113a54443eb8553736d361329626a9e21c17 (diff) | |
| download | device_samsung_tuna-82e1283c317fbffd313c52400fb5a19e1f0cbd3a.zip device_samsung_tuna-82e1283c317fbffd313c52400fb5a19e1f0cbd3a.tar.gz device_samsung_tuna-82e1283c317fbffd313c52400fb5a19e1f0cbd3a.tar.bz2 | |
tuna: update keymaster to KEYMASTER_MODULE_API_VERSION_0_3
Diffstat (limited to 'keymaster')
| -rw-r--r-- | keymaster/keymaster_tuna.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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 <cryptoki.h> #include <pkcs11.h> -#include <utils/UniquePtr.h> +#include <UniquePtr.h> /** 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", |