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

symmetric_key.cpp

diff --git a/symmetric_key.cpp b/symmetric_key.cpp
index a850076..fc8472f 100644
--- a/symmetric_key.cpp
+++ b/symmetric_key.cpp
@@ -21,19 +21,22 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
 
+#include <keymaster/logger.h>
+
 #include "aes_key.h"
 #include "hmac_key.h"
+#include "openssl_err.h"
 #include "unencrypted_key_blob.h"
 
 namespace keymaster {
 
-Key* SymmetricKeyFactory::GenerateKey(const AuthorizationSet& key_description, const Logger& logger,
+Key* SymmetricKeyFactory::GenerateKey(const AuthorizationSet& key_description,
                                       keymaster_error_t* error) {
     if (!error)
         return NULL;
     *error = KM_ERROR_OK;
 
-    UniquePtr<SymmetricKey> key(CreateKey(key_description, logger));
+    UniquePtr<SymmetricKey> key(CreateKey(key_description));
 
     uint32_t key_size_bits;
     if (!key_description.GetTagValue(TAG_KEY_SIZE, &key_size_bits) || key_size_bits % 8 != 0) {
@@ -47,8 +50,8 @@
         return NULL;
     }
     if (!RAND_bytes(key->key_data_, key->key_data_size_)) {
-        logger.error("Error %ul generating %d bit AES key", ERR_get_error(), key_size_bits);
-        *error = KM_ERROR_UNKNOWN_ERROR;
+        LOG_E("Error %ul generating %d bit AES key", ERR_get_error(), key_size_bits);
+        *error = TranslateLastOpenSslError();
         return NULL;
     }
 
@@ -57,9 +60,8 @@
     return key.release();
 }
 
-SymmetricKey::SymmetricKey(const UnencryptedKeyBlob& blob, const Logger& logger,
-                           keymaster_error_t* error)
-    : Key(blob, logger), key_data_size_(blob.unencrypted_key_material_length()) {
+SymmetricKey::SymmetricKey(const UnencryptedKeyBlob& blob, keymaster_error_t* error)
+    : Key(blob), key_data_size_(blob.unencrypted_key_material_length()) {
     memcpy(key_data_, blob.unencrypted_key_material(), key_data_size_);
     if (error)
         *error = KM_ERROR_OK;