Add support for KM_TAG_USER_SECURE_ID.
Bug: 19511945
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
diff --git a/authorization_set_test.cpp b/authorization_set_test.cpp
index c869d8d..f632dfe 100644
--- a/authorization_set_test.cpp
+++ b/authorization_set_test.cpp
@@ -35,8 +35,9 @@
keymaster_key_param_t params[] = {
Authorization(TAG_PURPOSE, KM_PURPOSE_SIGN), Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY),
Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA), Authorization(TAG_USER_ID, 7),
- Authorization(TAG_USER_AUTH_ID, 8), Authorization(TAG_APPLICATION_ID, "my_app", 6),
- Authorization(TAG_KEY_SIZE, 256), Authorization(TAG_AUTH_TIMEOUT, 300),
+ Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD),
+ Authorization(TAG_APPLICATION_ID, "my_app", 6), Authorization(TAG_KEY_SIZE, 256),
+ Authorization(TAG_AUTH_TIMEOUT, 300),
};
AuthorizationSet set(params, array_length(params));
EXPECT_EQ(8U, set.size());
@@ -46,8 +47,9 @@
keymaster_key_param_t params[] = {
Authorization(TAG_PURPOSE, KM_PURPOSE_SIGN), Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY),
Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA), Authorization(TAG_USER_ID, 7),
- Authorization(TAG_USER_AUTH_ID, 8), Authorization(TAG_APPLICATION_ID, "my_app", 6),
- Authorization(TAG_KEY_SIZE, 256), Authorization(TAG_AUTH_TIMEOUT, 300),
+ Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD),
+ Authorization(TAG_APPLICATION_ID, "my_app", 6), Authorization(TAG_KEY_SIZE, 256),
+ Authorization(TAG_AUTH_TIMEOUT, 300),
};
AuthorizationSet set(params, array_length(params));
AuthorizationSet set2(set);
@@ -74,7 +76,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -105,7 +107,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -129,7 +131,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -149,7 +151,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300)
@@ -180,7 +182,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -225,7 +227,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -408,7 +410,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_KEY_SIZE, 256)
.Authorization(TAG_AUTH_TIMEOUT, 300);
@@ -429,7 +431,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -441,25 +443,6 @@
EXPECT_FALSE(set.GetTagValue(TAG_KEY_SIZE, &val));
}
-TEST(GetValue, GetIntRep) {
- AuthorizationSet set(AuthorizationSetBuilder()
- .Authorization(TAG_PURPOSE, KM_PURPOSE_SIGN)
- .Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
- .Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
- .Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
- .Authorization(TAG_APPLICATION_ID, "my_app", 6)
- .Authorization(TAG_KEY_SIZE, 256)
- .Authorization(TAG_AUTH_TIMEOUT, 300));
-
- uint32_t val;
- EXPECT_TRUE(set.GetTagValue(TAG_USER_AUTH_ID, 0, &val));
- EXPECT_EQ(8U, val);
-
- // Find one that isn't there
- EXPECT_FALSE(set.GetTagValue(TAG_USER_AUTH_ID, 1, &val));
-}
-
TEST(GetValue, GetLong) {
AuthorizationSet set1(AuthorizationSetBuilder()
.Authorization(TAG_PURPOSE, KM_PURPOSE_SIGN)
@@ -486,7 +469,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -505,7 +488,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -526,7 +509,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -544,7 +527,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_ALGORITHM, KM_ALGORITHM_RSA)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8)
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD)
.Authorization(TAG_APPLICATION_ID, "my_app", 6)
.Authorization(TAG_AUTH_TIMEOUT, 300));
@@ -562,7 +545,7 @@
.Authorization(TAG_ACTIVE_DATETIME, 10)
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8));
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD));
AuthorizationSet copy(set);
EXPECT_EQ(copy, set);
@@ -580,7 +563,7 @@
.Authorization(TAG_INVALID)
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_USER_ID, 7)
- .Authorization(TAG_USER_AUTH_ID, 8));
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD));
AuthorizationSet copy(set);
EXPECT_EQ(copy, set);
@@ -598,7 +581,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_USER_ID, 7)
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
- .Authorization(TAG_USER_AUTH_ID, 8));
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD));
AuthorizationSet copy(set);
EXPECT_EQ(copy, set);
@@ -617,7 +600,7 @@
.Authorization(TAG_PURPOSE, KM_PURPOSE_VERIFY)
.Authorization(TAG_APPLICATION_DATA, "data", 4)
.Authorization(TAG_APPLICATION_DATA, "foo", 3)
- .Authorization(TAG_USER_AUTH_ID, 8));
+ .Authorization(TAG_USER_AUTH_TYPE, HW_AUTH_PASSWORD));
AuthorizationSet copy(set);
EXPECT_EQ(copy, set);