commit 34f09c52b08e654b8b76d9796240a5104c13a4a8
author Shawn Willden <swillden@google.com> Thu Jul 23 23:17:39 2015 +0000
committer Shawn Willden <swillden@google.com> Wed Jul 29 23:35:06 2015 +0000
tree 0d641f62085af14b902fc3d4d57919e232dfa7dd
parent 0e0cea3bc8aea903a50c1ee18e9f3309e9f67515

Revert "Revert "Report keymaster0 keys as hardware-backed, origin unknown.""

This reverts commit 0e0cea3bc8aea903a50c1ee18e9f3309e9f67515.

Bug: 22511313
Change-Id: I9c31b8ef604d961e20652c69498324b9dfce5911

ec_keymaster0_key.cpp

diff --git a/ec_keymaster0_key.cpp b/ec_keymaster0_key.cpp
index 08e4434..8cea462 100644
--- a/ec_keymaster0_key.cpp
+++ b/ec_keymaster0_key.cpp
@@ -58,8 +58,9 @@
     // context_->CreateKeyBlob doesn't put them in sw_enforced.
     hw_enforced->push_back(TAG_ALGORITHM, KM_ALGORITHM_EC);
     hw_enforced->push_back(TAG_KEY_SIZE, key_size);
+    hw_enforced->push_back(TAG_ORIGIN, KM_ORIGIN_UNKNOWN);
 
-    return context_->CreateKeyBlob(key_description, KM_ORIGIN_GENERATED, key_material, key_blob,
+    return context_->CreateKeyBlob(key_description, KM_ORIGIN_UNKNOWN, key_material, key_blob,
                                    hw_enforced, sw_enforced);
 }
 
@@ -89,8 +90,9 @@
     // context_->CreateKeyBlob doesn't put them in sw_enforced.
     hw_enforced->push_back(TAG_ALGORITHM, KM_ALGORITHM_EC);
     hw_enforced->push_back(TAG_KEY_SIZE, key_size);
+    hw_enforced->push_back(TAG_ORIGIN, KM_ORIGIN_UNKNOWN);
 
-    return context_->CreateKeyBlob(authorizations, KM_ORIGIN_IMPORTED, imported_hw_key,
+    return context_->CreateKeyBlob(authorizations, KM_ORIGIN_UNKNOWN, imported_hw_key,
                                    output_key_blob, hw_enforced, sw_enforced);
 }