commit 7dad86fd4478a08f706b6c7ea17f7aacb37f9b4e
author Patrick Venture <venture@google.com> Fri May 17 08:52:20 2019 -0700
committer Patrick Venture <venture@google.com> Fri May 17 14:09:20 2019 -0700
tree e987b31acbdb627974afde5faec6a73684c56ab0
parent 3676670d7c9b81ed50cbdba8863e05b08185a7eb

util: create util object for bmc and tool

Create a common util object for the BMC library and host tool.  Place in
blobs namespace favoring BMC.

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I036fd65d924c65fcfa71aba5cd76275a2941ff14

firmware_handler.hpp

diff --git a/firmware_handler.hpp b/firmware_handler.hpp
index 314516f..3e36897 100644
--- a/firmware_handler.hpp
+++ b/firmware_handler.hpp
@@ -4,6 +4,7 @@
 
 #include "data_handler.hpp"
 #include "image_handler.hpp"
+#include "util.hpp"
 
 #include <blobs-ipmid/blobs.hpp>
 #include <cstdint>
@@ -146,8 +147,8 @@
                         std::uint16_t bitmask) :
         bus(std::move(bus)),
         handlers(firmwares), blobIDs(blobs), transports(transports),
-        bitmask(bitmask), activeImage(activeImageBlobID),
-        activeHash(activeHashBlobID), verifyImage(verifyBlobID), lookup(),
+        bitmask(bitmask), activeImage(activeImageBlobId),
+        activeHash(activeHashBlobId), verifyImage(verifyBlobId), lookup(),
         state(UpdateState::notYetStarted)
     {
     }
@@ -176,11 +177,6 @@
 
     bool triggerVerification();
 
-    static const std::string verifyBlobID;
-    static const std::string hashBlobID;
-    static const std::string activeImageBlobID;
-    static const std::string activeHashBlobID;
-
     /** Allow grabbing the current state. */
     UpdateState getCurrentState() const
     {