commit 2f3be368e5ad911cc0b014421dd3682130260ffc
author Shawn Willden <swillden@google.com> Mon Aug 25 11:31:39 2014 -0600
committer Shawn Willden <swillden@google.com> Mon Aug 25 20:33:24 2014 -0600
tree de51397ec0c8af95a9a7ecfb540f3a880cb425c1
parent f2282b3c6690ccfaa7878886f01693ef4f0b3bed

Add the beginnings of logging infrastructure.

Change-Id: Ic36134402bfbb098d2242c463a3b4265d1d65209

google_keymaster.cpp

diff --git a/google_keymaster.cpp b/google_keymaster.cpp
index c0d0cd6..18b1318 100644
--- a/google_keymaster.cpp
+++ b/google_keymaster.cpp
@@ -33,9 +33,9 @@
 
 namespace keymaster {
 
-GoogleKeymaster::GoogleKeymaster(size_t operation_table_size)
+GoogleKeymaster::GoogleKeymaster(size_t operation_table_size, Logger* logger)
     : operation_table_(new OpTableEntry[operation_table_size]),
-      operation_table_size_(operation_table_size) {
+      operation_table_size_(operation_table_size), logger_(logger) {
     if (operation_table_.get() == NULL)
         operation_table_size_ = 0;
 }
@@ -162,7 +162,7 @@
     if (response == NULL)
         return;
 
-    UniquePtr<Key> key(Key::GenerateKey(request.key_description, &response->error));
+    UniquePtr<Key> key(Key::GenerateKey(request.key_description, logger(), &response->error));
     if (response->error != KM_ERROR_OK)
         return;
 
@@ -287,7 +287,7 @@
         return;
 
     UniquePtr<Key> key(Key::ImportKey(request.key_description, request.key_format, request.key_data,
-                                      request.key_data_length, &response->error));
+                                      request.key_data_length, logger(), &response->error));
     if (response->error != KM_ERROR_OK)
         return;
 
@@ -344,7 +344,7 @@
     UniquePtr<KeyBlob> blob(LoadKeyBlob(key, client_params, error));
     if (*error != KM_ERROR_OK)
         return NULL;
-    return Key::CreateKey(*blob, error);
+    return Key::CreateKey(*blob, logger(), error);
 }
 
 KeyBlob* GoogleKeymaster::LoadKeyBlob(const keymaster_key_blob_t& key,