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

key.cpp

diff --git a/key.cpp b/key.cpp
index 0706ce7..df668eb 100644
--- a/key.cpp
+++ b/key.cpp
@@ -28,20 +28,20 @@
     void operator()(PKCS8_PRIV_KEY_INFO* p) const { PKCS8_PRIV_KEY_INFO_free(p); }
 };
 
-Key::Key(const KeyBlob& blob) {
+Key::Key(const KeyBlob& blob, const Logger& logger) : logger_(logger) {
     authorizations_.push_back(blob.unenforced());
     authorizations_.push_back(blob.enforced());
 }
 
 /* static */
-Key* Key::CreateKey(const KeyBlob& blob, keymaster_error_t* error) {
+Key* Key::CreateKey(const KeyBlob& blob, const Logger& logger, keymaster_error_t* error) {
     switch (blob.algorithm()) {
     case KM_ALGORITHM_RSA:
-        return new RsaKey(blob, error);
+        return new RsaKey(blob, logger, error);
     case KM_ALGORITHM_DSA:
-        return new DsaKey(blob, error);
+        return new DsaKey(blob, logger, error);
     case KM_ALGORITHM_ECDSA:
-        return new EcdsaKey(blob, error);
+        return new EcdsaKey(blob, logger, error);
     default:
         *error = KM_ERROR_UNSUPPORTED_ALGORITHM;
         return NULL;
@@ -49,7 +49,8 @@
 }
 
 /* static */
-Key* Key::GenerateKey(const AuthorizationSet& key_description, keymaster_error_t* error) {
+Key* Key::GenerateKey(const AuthorizationSet& key_description, const Logger& logger,
+                      keymaster_error_t* error) {
     keymaster_algorithm_t algorithm;
     if (!key_description.GetTagValue(TAG_ALGORITHM, &algorithm)) {
         *error = KM_ERROR_UNSUPPORTED_ALGORITHM;
@@ -58,11 +59,11 @@
 
     switch (algorithm) {
     case KM_ALGORITHM_RSA:
-        return RsaKey::GenerateKey(key_description, error);
+        return RsaKey::GenerateKey(key_description, logger, error);
     case KM_ALGORITHM_DSA:
-        return DsaKey::GenerateKey(key_description, error);
+        return DsaKey::GenerateKey(key_description, logger, error);
     case KM_ALGORITHM_ECDSA:
-        return EcdsaKey::GenerateKey(key_description, error);
+        return EcdsaKey::GenerateKey(key_description, logger, error);
     default:
         *error = KM_ERROR_UNSUPPORTED_ALGORITHM;
         return NULL;
@@ -71,7 +72,8 @@
 
 /* static */
 Key* Key::ImportKey(const AuthorizationSet& key_description, keymaster_key_format_t key_format,
-                    const uint8_t* key_data, size_t key_data_length, keymaster_error_t* error) {
+                    const uint8_t* key_data, size_t key_data_length, const Logger& logger,
+                    keymaster_error_t* error) {
     *error = KM_ERROR_OK;
 
     if (key_data == NULL || key_data_length <= 0) {
@@ -100,7 +102,7 @@
     UniquePtr<Key> key;
     switch (EVP_PKEY_type(pkey->type)) {
     case EVP_PKEY_RSA:
-        return RsaKey::ImportKey(key_description, pkey.get(), error);
+        return RsaKey::ImportKey(key_description, pkey.get(), logger, error);
     case EVP_PKEY_DSA:
     case EVP_PKEY_EC:
     default: