From 36ab8ed76fb751d8570d0323e6ece4c60f730703 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Wed, 4 Sep 2013 22:17:56 -0700 Subject: 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. (cherry picked from commit c124b23f94a0a88e872253720c0e27594a9a9938) Bug: 10600582 Change-Id: Ia2b0cbeca5c507600228c39ec7a8402f819f8804 --- tests/keymaster/keymaster_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/keymaster') 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) -- cgit v1.1