Remove the keymaster::Logger::log() method and add debug().

Also, have the logger provide newlines, so every caller doesn't have to.

Change-Id: I9f009e7c2d5c686a0ca97e10daef92a846a57d9a

3 files changed, 9 insertions, 5 deletions

diff --git a/asymmetric_key.cpp b/asymmetric_key.cpp
index a06515b..40b01fb 100644
--- a/asymmetric_key.cpp
+++ b/asymmetric_key.cpp
@@ -298,11 +298,11 @@ DsaKey* DsaKey::GenerateKey(const AuthorizationSet& key_description, const Logge
     *error = KM_ERROR_INVALID_DSA_PARAMS;
 
     if (g_blob.data == NULL && p_blob.data == NULL && q_blob.data == NULL) {
-        logger.log("DSA parameters unspecified, generating them for key size %d\n", key_size);
+        logger.info("DSA parameters unspecified, generating them for key size %d", key_size);
         if (!DSA_generate_parameters_ex(dsa_key.get(), key_size, NULL /* seed */, 0 /* seed_len */,
                                         NULL /* counter_ret */, NULL /* h_ret */,
                                         NULL /* callback */)) {
-            logger.log("DSA parameter generation failed.\n");
+            logger.severe("DSA parameter generation failed.");
             return NULL;
         }
 
@@ -310,7 +310,7 @@ DsaKey* DsaKey::GenerateKey(const AuthorizationSet& key_description, const Logge
         SetDsaParamData(&authorizations, TAG_DSA_P, dsa_key->p);
         SetDsaParamData(&authorizations, TAG_DSA_Q, dsa_key->q);
     } else if (g_blob.data == NULL || p_blob.data == NULL || q_blob.data == NULL) {
-        logger.log("Some DSA parameters provided.  Provide all or none\n");
+        logger.severe("Some DSA parameters provided.  Provide all or none");
         return NULL;
     } else {
         // All params provided. Use them.
diff --git a/google_keymaster_test_utils.h b/google_keymaster_test_utils.h
index e681b3f..bb14951 100644
--- a/google_keymaster_test_utils.h
+++ b/google_keymaster_test_utils.h
@@ -92,10 +92,11 @@ inline bool contains(const AuthorizationSet& set, keymaster_tag_t tag) {
 
 class StdoutLogger : public Logger {
   public:
-    int log(const char* fmt, ...) const {
+    int debug(const char* fmt, ...) const {
         va_list args;
         va_start(args, fmt);
         int result = vprintf(fmt, args);
+        result += printf("\n");
         va_end(args);
         return result;
     }
@@ -104,6 +105,7 @@ class StdoutLogger : public Logger {
         va_list args;
         va_start(args, fmt);
         int result = vprintf(fmt, args);
+        result += printf("\n");
         va_end(args);
         return result;
     }
@@ -112,6 +114,7 @@ class StdoutLogger : public Logger {
         va_list args;
         va_start(args, fmt);
         int result = vfprintf(stderr, fmt, args);
+        result += printf("\n");
         va_end(args);
         return result;
     }
@@ -120,6 +123,7 @@ class StdoutLogger : public Logger {
         va_list args;
         va_start(args, fmt);
         int result = vfprintf(stderr, fmt, args);
+        result += printf("\n");
         va_end(args);
         return result;
     }
diff --git a/include/keymaster/logger.h b/include/keymaster/logger.h
index 7dde77f..74779ae 100644
--- a/include/keymaster/logger.h
+++ b/include/keymaster/logger.h
@@ -23,7 +23,7 @@ class Logger {
   public:
     Logger() {}
     virtual ~Logger() {}
-    virtual int log(const char* fmt, ...) const = 0;
+    virtual int debug(const char* fmt, ...) const = 0;
     virtual int info(const char* fmt, ...) const = 0;
     virtual int error(const char* fmt, ...) const = 0;
     virtual int severe(const char* fmt, ...) const = 0;