summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-09-04 22:17:56 -0700
committerKenny Root <kroot@google.com>2013-09-04 22:17:56 -0700
commitc124b23f94a0a88e872253720c0e27594a9a9938 (patch)
treea0daabf6a914f655a7fd7525ab377a7c266c88e6 /tests
parent2541a0a8f7a2c86658d435efb49843a88b4d97e0 (diff)
downloadhardware_libhardware-c124b23f94a0a88e872253720c0e27594a9a9938.zip
hardware_libhardware-c124b23f94a0a88e872253720c0e27594a9a9938.tar.gz
hardware_libhardware-c124b23f94a0a88e872253720c0e27594a9a9938.tar.bz2
keymaster: use new version fields in hw_module
The original version of this HAL used a field in keymaster_module to represent the module's version number, but a later revision of the HAL interface added a distinguisher between HAL module and device versions. This is needed to support upgrade code in keystore. Bug: 10600582 Change-Id: Ied34cf382e2b7725e648faada00df2dee993e6c5
Diffstat (limited to 'tests')
-rw-r--r--tests/keymaster/keymaster_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/keymaster/keymaster_test.cpp b/tests/keymaster/keymaster_test.cpp
index b3d3f35..ad89012 100644
--- a/tests/keymaster/keymaster_test.cpp
+++ b/tests/keymaster/keymaster_test.cpp
@@ -343,7 +343,7 @@ public:
ASSERT_EQ(0, keymaster_open(mod, &sDevice))
<< "Should be able to open the keymaster device";
- ASSERT_EQ(2U, sDevice->client_version)
+ ASSERT_EQ(KEYMASTER_MODULE_API_VERSION_0_2, mod->module_api_version)
<< "Keymaster should implement API version 2";
ASSERT_TRUE(sDevice->generate_keypair != NULL)