diff options
| author | Paul Lawrence <paullawrence@google.com> | 2014-05-06 13:59:38 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2014-05-06 22:08:18 +0000 |
| commit | f4191b59196237680f3ebc8fc2af62b36d9c25f9 (patch) | |
| tree | 02c109e81c836834cd939dd19993c9088da5e0ac | |
| parent | 5ca7ccb1f8d1469310ffa5b390d2094dd4797196 (diff) | |
| download | android_hardware_qcom_keymaster-f4191b59196237680f3ebc8fc2af62b36d9c25f9.tar.gz android_hardware_qcom_keymaster-f4191b59196237680f3ebc8fc2af62b36d9c25f9.tar.bz2 android_hardware_qcom_keymaster-f4191b59196237680f3ebc8fc2af62b36d9c25f9.zip | |
Set correct module version for qcom keystore
Requires
https://android-review.googlesource.com/#/c/93571/
Bug: 14384714
Change-Id: I1544b9b2d4d069dbcfb8be219a1d9755c54342e6
| -rw-r--r-- | keymaster_qcom.cpp | 4 | ||||
| -rw-r--r-- | keymaster_qcom.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/keymaster_qcom.cpp b/keymaster_qcom.cpp index d9dec09..c98531e 100644 --- a/keymaster_qcom.cpp +++ b/keymaster_qcom.cpp @@ -790,8 +790,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 = QCOM_KEYMASTER_API_VERSION, + .hal_api_version = HARDWARE_HAL_API_VERSION, .id = KEYSTORE_HARDWARE_MODULE_ID, .name = "Keymaster QCOM HAL", .author = "The Android Open Source Project", diff --git a/keymaster_qcom.h b/keymaster_qcom.h index 0d6cf67..2a0d8b7 100644 --- a/keymaster_qcom.h +++ b/keymaster_qcom.h @@ -38,7 +38,7 @@ __BEGIN_DECLS * module to recognize which API level of the client it is dealing with in * the case of pre-compiled binary clients. */ -#define QCOM_KEYMASTER_API_VERSION 2 +#define QCOM_KEYMASTER_API_VERSION KEYMASTER_MODULE_API_VERSION_0_3 #define KM_MAGIC_NUM (0x4B4D4B42) /* "KMKB" Key Master Key Blob in hex */ #define KM_KEY_SIZE_MAX (512) /* 4096 bits */ |