commit 0b2d3330f083ae64fdfdd2f171bdf47fba107d86
author Shawn Willden <swillden@google.com> Tue Apr 07 17:46:18 2015 -0600
committer Shawn Willden <swillden@google.com> Fri Apr 10 07:27:15 2015 -0600
tree ec299438ba747ffcedfcf1a030ee50ebab98afe7
parent f5d7f91fc77418763f8ae026ca3bf456316c7815

Remove refs to KM_ORIGIN_HARDWARE and KM_ORIGIN_SOFTWARE.

We now just distinguish between KM_ORIGIN_GENERATED and
KM_ORIGIN_IMPORTED, relying on the location of the tag in the hardware
or software list to define whether the key is hardware or
software-based.

Change-Id: I8c7eedbd2dd72eb04338dcbec88bac283da06fc1

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index dafcb35..a86e1cf 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -241,7 +241,7 @@
         EXPECT_FALSE(contains(auths, TAG_AUTH_TIMEOUT, 301));
 
         // Now check that unspecified, defaulted tags are correct.
-        EXPECT_TRUE(contains(auths, TAG_ORIGIN, KM_ORIGIN_SOFTWARE));
+        EXPECT_TRUE(contains(auths, TAG_ORIGIN, KM_ORIGIN_GENERATED));
         EXPECT_TRUE(contains(auths, KM_TAG_CREATION_DATETIME));
     }
 };