commit d9b9295b8c2f17448f4eb3ea2c6f7d4a5c207c3f
author Paul Crowley <paulcrowley@google.com> Fri Mar 04 13:45:00 2016 -0800
committer Paul Crowley <paulcrowley@google.com> Tue Mar 08 14:31:49 2016 -0800
tree acfc05d08caea584dc1c49cb44ee8e8bee502f5d
parent ad8e26297b07f26376bd3125b11ae280304c22e8

Fix memory leak in generate_key wrapper. Other fixes.

- catch errors in looking for the keyring
- static_assert to prevent a buffer overrun
- remove obsolete, misleading comment
- dial down priority of some log messages
- explain why we ignore some errors
- idiomatic C++11

Bug: 27552432
Change-Id: Ic3ee05b41eae45e7c6b571a459b326a483663526

KeyStorage.cpp

diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 2338f23..d51fc4f 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -194,7 +194,7 @@
         const std::string &salt, std::string &stretched) {
     if (stretching == kStretch_nopassword) {
         if (!secret.empty()) {
-            LOG(ERROR) << "Password present but stretching is nopasswd";
+            LOG(WARNING) << "Password present but stretching is nopassword";
             // Continue anyway
         }
         stretched.clear();