From 2308b8bfaf1307c76c2a50984047a71fdaff7e53 Mon Sep 17 00:00:00 2001 From: Saqib Khan Date: Tue, 19 Sep 2017 15:33:06 -0500 Subject: Use sha512 to calcualte the versionID for images. - We needed a hash algorithm that can be replicated on multiple platforms and across multiple programming languages. - This would allow the user to calculate the versionID by executing the following command to obtain correct versionID. echo -n "" | sha512sum | cut -b 1-8 - This is part of the change required for openbmc/openbmc#2323 Change-Id: I799a9a2b83fdf35beaf61b9df5ed69162f610d2f Signed-off-by: Saqib Khan --- version.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'version.cpp') diff --git a/version.cpp b/version.cpp index 013cc68b0..8e36071fd 100644 --- a/version.cpp +++ b/version.cpp @@ -8,6 +8,7 @@ #include #include "xyz/openbmc_project/Common/error.hpp" #include "item_updater.hpp" +#include namespace openpower { @@ -22,7 +23,6 @@ using Argument = xyz::openbmc_project::Common::InvalidArgument; std::string Version::getId(const std::string& version) { - std::stringstream hexId; if (version.empty()) { @@ -31,10 +31,20 @@ std::string Version::getId(const std::string& version) Argument::ARGUMENT_VALUE(version.c_str())); } - // Only want 8 hex digits. - hexId << std::hex << ((std::hash {}( - version)) & 0xFFFFFFFF); - return hexId.str(); + unsigned char digest[SHA512_DIGEST_LENGTH]; + SHA512_CTX ctx; + SHA512_Init(&ctx); + SHA512_Update(&ctx, version.c_str(), strlen(version.c_str())); + SHA512_Final(digest, &ctx); + char mdString[SHA512_DIGEST_LENGTH*2+1]; + for (int i = 0; i < SHA512_DIGEST_LENGTH; i++) + { + snprintf(&mdString[i*2], 3, "%02x", (unsigned int)digest[i]); + } + + // Only need 8 hex digits. + std::string hexId = std::string(mdString); + return (hexId.substr(0, 8)); } std::map Version::getValue( -- cgit v1.2.1