commit 39b970bea81461af88f83e1c2329eb1b0f4d2e73
author Shawn Willden <swillden@google.com> Mon Aug 11 09:11:21 2014 -0600
committer Shawn Willden <swillden@google.com> Mon Aug 11 09:16:41 2014 -0600
tree debd009a35daaebda599e6b8f7411fc76dd801b8
parent 834e80747cbb960f8a4028c5c8604bf5218ecdb9

Handle "hidden" authorization tags correctly.

Change-Id: I9fa18f8ab465a2faa0f358e12f72daf18ca02fe7

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index 1a53172..454e6b8 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -184,6 +184,7 @@
         Authorization(TAG_USER_ID, 7),
         Authorization(TAG_USER_AUTH_ID, 8),
         Authorization(TAG_APPLICATION_ID, reinterpret_cast<const uint8_t*>("app_id"), 6),
+        Authorization(TAG_APPLICATION_DATA, reinterpret_cast<const uint8_t*>("app_data"), 8),
         Authorization(TAG_AUTH_TIMEOUT, 300),
     };
     GenerateKeyRequest req;
@@ -205,10 +206,14 @@
 
     EXPECT_TRUE(contains(rsp.unenforced, TAG_USER_ID, 7));
     EXPECT_TRUE(contains(rsp.unenforced, TAG_USER_AUTH_ID, 8));
-    EXPECT_TRUE(contains(rsp.unenforced, TAG_APPLICATION_ID, "app_id"));
     EXPECT_TRUE(contains(rsp.unenforced, TAG_KEY_SIZE, 2048));
     EXPECT_TRUE(contains(rsp.unenforced, TAG_AUTH_TIMEOUT, 300));
 
+    // Verify that App ID, App data and ROT are NOT included.
+    EXPECT_FALSE(contains(rsp.unenforced, TAG_ROOT_OF_TRUST));
+    EXPECT_FALSE(contains(rsp.unenforced, TAG_APPLICATION_ID));
+    EXPECT_FALSE(contains(rsp.unenforced, TAG_APPLICATION_DATA));
+
     // Just for giggles, check that some unexpected tags/values are NOT present.
     EXPECT_FALSE(contains(rsp.unenforced, TAG_PURPOSE, KM_PURPOSE_ENCRYPT));
     EXPECT_FALSE(contains(rsp.unenforced, TAG_PURPOSE, KM_PURPOSE_DECRYPT));
@@ -219,7 +224,6 @@
     EXPECT_TRUE(contains(rsp.unenforced, TAG_RSA_PUBLIC_EXPONENT, 65537));
     EXPECT_TRUE(contains(rsp.unenforced, TAG_ORIGIN, KM_ORIGIN_SOFTWARE));
     EXPECT_TRUE(contains(rsp.unenforced, KM_TAG_CREATION_DATETIME));
-    EXPECT_TRUE(contains(rsp.unenforced, TAG_ROOT_OF_TRUST, "SW"));
 }
 
 }  // namespace test