commit 567a4a04f43d35b785d50508e6459b01f2ab4d14
author Shawn Willden <swillden@google.com> Wed Dec 31 12:14:46 2014 -0700
committer Shawn Willden <swillden@google.com> Wed Mar 04 13:22:15 2015 -0700
tree 215bc12078d545398b7d58f07b6c6409a98cde4e
parent 04b3b1ea3af7a9f19d51b8685aa683c08753e23c

Switch to using global logger

Change-Id: I7af02342320a9a431cd9845baaf5dbcf61d460c2

aes_operation.cpp

diff --git a/aes_operation.cpp b/aes_operation.cpp
index 0b17249..e605d2a 100644
--- a/aes_operation.cpp
+++ b/aes_operation.cpp
@@ -19,6 +19,8 @@
 #include <openssl/aes.h>
 #include <openssl/rand.h>
 
+#include <keymaster/logger.h>
+
 #include "aes_key.h"
 #include "aes_operation.h"
 
@@ -32,15 +34,13 @@
   public:
     virtual KeyType registry_key() const { return KeyType(KM_ALGORITHM_AES, purpose()); }
 
-    virtual Operation* CreateOperation(const Key& key, const Logger& logger,
-                                       keymaster_error_t* error);
+    virtual Operation* CreateOperation(const Key& key, keymaster_error_t* error);
     virtual const keymaster_block_mode_t* SupportedBlockModes(size_t* block_mode_count) const;
 
     virtual keymaster_purpose_t purpose() const = 0;
 };
 
-Operation* AesOcbOperationFactory::CreateOperation(const Key& key, const Logger& logger,
-                                                   keymaster_error_t* error) {
+Operation* AesOcbOperationFactory::CreateOperation(const Key& key, keymaster_error_t* error) {
     *error = KM_ERROR_OK;
 
     keymaster_block_mode_t block_mode;
@@ -87,9 +87,9 @@
     keymaster_blob_t additional_data = {0, 0};
     symmetric_key->authorizations().GetTagValue(TAG_ASSOCIATED_DATA, &additional_data);
 
-    Operation* op = new AesOcbOperation(purpose(), logger, symmetric_key->key_data(),
-                                        symmetric_key->key_data_size(), chunk_length, tag_length,
-                                        additional_data);
+    Operation* op =
+        new AesOcbOperation(purpose(), symmetric_key->key_data(), symmetric_key->key_data_size(),
+                            chunk_length, tag_length, additional_data);
     if (!op)
         *error = KM_ERROR_MEMORY_ALLOCATION_FAILED;
     return op;