commit d0f034a2c8a15a380f80980d791d62476a78fdb2
author yes <smriti.ayushi@intel.com> Thu Dec 29 18:35:37 2022 +0530
committer Kuiying Wang <wangkuiying.wky@alibaba-inc.com> Sat Dec 31 11:01:35 2022 +0000
tree 4809ebdfeeb9fb5a44dd779bcae6549b86547a68
parent ad54c7cb0eb23484ff27b2b01b44165fd4ba1705

Clean up in Password code file

Abstracted functions to make code more readable.

Tested:
Verified oob-bios functionality is not altered.

Change-Id: I616a2e90566fc687702f08511955ef9a6fed3c59
Signed-off-by: Smriti-Ayushi <smriti.ayushi@linux.intel.com>

include/password.hpp

diff --git a/include/password.hpp b/include/password.hpp
index ee7ace3..154de4a 100644
--- a/include/password.hpp
+++ b/include/password.hpp
@@ -79,6 +79,10 @@
   private:
     void verifyPassword(std::string userName, std::string currentPassword,
                         std::string newPassword);
+    bool compareDigest(const EVP_MD* digestFunc, size_t digestLen,
+                       const std::array<uint8_t, maxHashSize>& expected,
+                       const std::array<uint8_t, maxSeedSize>& seed,
+                       const std::string& rawData);
     bool isMatch(const std::array<uint8_t, maxHashSize>& expected,
                  const std::array<uint8_t, maxSeedSize>& seed,
                  const std::string& rawData, const std::string& algo);

src/password.cpp

diff --git a/src/password.cpp b/src/password.cpp
index f780cc5..f3cb321 100644
--- a/src/password.cpp
+++ b/src/password.cpp
@@ -33,6 +33,33 @@
 using namespace sdbusplus::xyz::openbmc_project::Common::Error;
 using namespace sdbusplus::xyz::openbmc_project::BIOSConfig::Common::Error;
 
+bool Password::compareDigest(const EVP_MD* digestFunc, size_t digestLen,
+                             const std::array<uint8_t, maxHashSize>& expected,
+                             const std::array<uint8_t, maxSeedSize>& seed,
+                             const std::string& rawData)
+{
+    std::vector<uint8_t> output(digestLen);
+    unsigned int hashLen = digestLen;
+
+    if (!PKCS5_PBKDF2_HMAC(reinterpret_cast<const char*>(rawData.c_str()),
+                           rawData.length() + 1,
+                           reinterpret_cast<const unsigned char*>(seed.data()),
+                           seed.size(), iterValue, digestFunc, hashLen,
+                           output.data()))
+    {
+        lg2::error("Generate PKCS5_PBKDF2_HMAC Integrity Check Value failed");
+        throw InternalFailure();
+    }
+
+    if (std::memcmp(output.data(), expected.data(),
+                    output.size() * sizeof(uint8_t)) == 0)
+    {
+        return true;
+    }
+
+    return false;
+}
+
 bool Password::isMatch(const std::array<uint8_t, maxHashSize>& expected,
                        const std::array<uint8_t, maxSeedSize>& seed,
                        const std::string& rawData, const std::string& algo)
@@ -41,59 +68,14 @@
 
     if (algo == "SHA256")
     {
-        std::vector<uint8_t> output(SHA256_DIGEST_LENGTH);
-        unsigned int hashLen = SHA256_DIGEST_LENGTH;
-
-        if (!PKCS5_PBKDF2_HMAC(
-                reinterpret_cast<const char*>(rawData.c_str()),
-                rawData.length() + 1,
-                reinterpret_cast<const unsigned char*>(seed.data()),
-                seed.size(), iterValue, EVP_sha256(), hashLen, output.data()))
-        {
-            lg2::error(
-                "Generate PKCS5_PBKDF2_HMAC_SHA256 Integrity Check Value failed");
-            throw InternalFailure();
-        }
-
-        int cmp;
-        cmp = std::memcmp(output.data(), expected.data(),
-                          output.size() * sizeof(uint8_t));
-        if (cmp == 0)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+        return compareDigest(EVP_sha256(), SHA256_DIGEST_LENGTH, expected, seed,
+                             rawData);
     }
+
     if (algo == "SHA384")
     {
-        std::array<uint8_t, SHA384_DIGEST_LENGTH> output;
-        unsigned int hashLen = SHA384_DIGEST_LENGTH;
-
-        if (!PKCS5_PBKDF2_HMAC(
-                reinterpret_cast<const char*>(rawData.c_str()),
-                rawData.length() + 1,
-                reinterpret_cast<const unsigned char*>(seed.data()),
-                seed.size(), iterValue, EVP_sha384(), hashLen, output.data()))
-        {
-            lg2::error(
-                "Generate PKCS5_PBKDF2_HMAC_SHA384 Integrity Check Value failed");
-            throw InternalFailure();
-        }
-
-        int cmp;
-        cmp = std::memcmp(output.data(), expected.data(),
-                          output.size() * sizeof(uint8_t));
-        if (cmp == 0)
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+        return compareDigest(EVP_sha384(), SHA384_DIGEST_LENGTH, expected, seed,
+                             rawData);
     }
 
     return false;