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

symmetric_key.cpp

diff --git a/symmetric_key.cpp b/symmetric_key.cpp
index 68fa6f1..016b40e 100644
--- a/symmetric_key.cpp
+++ b/symmetric_key.cpp
@@ -21,6 +21,7 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
+#include <keymaster/android_keymaster_utils.h>
 #include <keymaster/logger.h>
 #include <keymaster/keymaster_context.h>
 
@@ -33,7 +34,7 @@
 keymaster_error_t SymmetricKeyFactory::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;
 
@@ -62,7 +63,7 @@
                                                  const KeymasterKeyBlob& input_key_material,
                                                  KeymasterKeyBlob* output_key_blob,
                                                  AuthorizationSet* hw_enforced,
-                                                 AuthorizationSet* sw_enforced) {
+                                                 AuthorizationSet* sw_enforced) const {
     if (!output_key_blob || !hw_enforced || !sw_enforced)
         return KM_ERROR_OUTPUT_PARAMETER_NULL;
 
@@ -92,7 +93,8 @@
 }
 
 static const keymaster_key_format_t supported_import_formats[] = {KM_KEY_FORMAT_RAW};
-const keymaster_key_format_t* SymmetricKeyFactory::SupportedImportFormats(size_t* format_count) {
+const keymaster_key_format_t*
+SymmetricKeyFactory::SupportedImportFormats(size_t* format_count) const {
     *format_count = array_length(supported_import_formats);
     return supported_import_formats;
 }