commit 0629810b145187575bc26c910dded0d24c64569d
author Shawn Willden <swillden@google.com> Mon May 25 23:12:48 2015 -0600
committer Shawn Willden <swillden@google.com> Sun May 31 09:28:56 2015 -0600
tree 5c1309696f2205777f6aad1c1b5b65aeaa64c9b7
parent 6270aca8571399aca8ea538acd7386ddecdcc112

Another refactor, deleting AbstractFactoryRegistry.

I should have known better than to make these singletons to begin
with.  Globals create problems.  This undoes that mistake.

Change-Id: Idf61d5f72e3c34b5c4ddb27cc94b05f506561743

ec_keymaster0_key.cpp

diff --git a/ec_keymaster0_key.cpp b/ec_keymaster0_key.cpp
index d171d58..9ed0a74 100644
--- a/ec_keymaster0_key.cpp
+++ b/ec_keymaster0_key.cpp
@@ -18,9 +18,8 @@
 
 #include <memory>
 
-#define LOG_TAG "EcKeymaster0Key"
-#include <cutils/log.h>
-
+#include <keymaster/android_keymaster_utils.h>
+#include <keymaster/logger.h>
 #include <keymaster/soft_keymaster_context.h>
 
 #include "keymaster0_engine.h"
@@ -38,7 +37,7 @@
 keymaster_error_t EcdsaKeymaster0KeyFactory::GenerateKey(const AuthorizationSet& key_description,
                                                          KeymasterKeyBlob* key_blob,
                                                          AuthorizationSet* hw_enforced,
-                                                         AuthorizationSet* sw_enforced) {
+                                                         AuthorizationSet* sw_enforced) const {
     if (!key_blob || !hw_enforced || !sw_enforced)
         return KM_ERROR_OUTPUT_PARAMETER_NULL;
 
@@ -67,7 +66,7 @@
 keymaster_error_t EcdsaKeymaster0KeyFactory::ImportKey(
     const AuthorizationSet& key_description, keymaster_key_format_t input_key_material_format,
     const KeymasterKeyBlob& input_key_material, KeymasterKeyBlob* output_key_blob,
-    AuthorizationSet* hw_enforced, AuthorizationSet* sw_enforced) {
+    AuthorizationSet* hw_enforced, AuthorizationSet* sw_enforced) const {
     if (!output_key_blob || !hw_enforced || !sw_enforced)
         return KM_ERROR_OUTPUT_PARAMETER_NULL;
 
@@ -98,7 +97,7 @@
 keymaster_error_t EcdsaKeymaster0KeyFactory::LoadKey(const KeymasterKeyBlob& key_material,
                                                      const AuthorizationSet& hw_enforced,
                                                      const AuthorizationSet& sw_enforced,
-                                                     UniquePtr<Key>* key) {
+                                                     UniquePtr<Key>* key) const {
     if (!key)
         return KM_ERROR_OUTPUT_PARAMETER_NULL;