From 6409c4bbaa9ecfe9bf526821a62ef2d8c0c211f1 Mon Sep 17 00:00:00 2001
From: Sergey Gomenyuk <sergey@fairmath.xyz>
Date: Thu, 21 Nov 2024 22:33:49 +0300
Subject: [PATCH] move code to build with clang 15

---
 .github/workflows/release.yml |   2 +-
 src/configProcessor.h         | 131 +++++++++++++++++-----------------
 2 files changed, 66 insertions(+), 67 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7de9a16..924e486 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
             cmakeGen: '"Unix Makefiles"'
             cc: clang
             cxx: clang++
-            tools: NONINTERACTIVE=1 brew install libomp llvm
+            tools: NONINTERACTIVE=1 brew install libomp
 
     steps:
       - uses: actions/checkout@v3
diff --git a/src/configProcessor.h b/src/configProcessor.h
index a848d9b..9b646fd 100644
--- a/src/configProcessor.h
+++ b/src/configProcessor.h
@@ -87,27 +87,86 @@ class ConfigProcessor final
     template <typename KeyType>
     [[nodiscard]] std::shared_ptr<KeyType> aquireKey(
         const std::string_view keyName);
+
     [[nodiscard]] std::shared_ptr<lbcrypto::CryptoContextImpl<lbcrypto::DCRTPoly>> aquireCC(
         const std::string_view ccName);
 
     template <typename KeyType>
-    void generateKeyPairAndSerialize(
-        const std::string_view keyName,
-        nlohmann::json& keyContent);
+    void generateKeyPairAndSerialize(const std::string_view keyName, nlohmann::json& keyContent)
+    {
+        std::shared_ptr<lbcrypto::CryptoContextImpl<lbcrypto::DCRTPoly>> cc =
+            aquireCC(keyContent["cryptocontext"].get<std::string_view>());
+        cc->Enable(lbcrypto::PKE);
+        lbcrypto::KeyPair<lbcrypto::DCRTPoly> keyPair = cc->KeyGen();
+        const std::string& linkedKeyName
+            = keyContent["linked_key_for_generation"].get_ref<const std::string&>();
+        if (!linkedKeyName.empty())
+        {
+            if (!(m_configJson[linkedKeyName]["linked_key_for_generation"].get<std::string_view>() == keyName &&
+                m_configJson[linkedKeyName]["source"].get<std::string_view>().empty()))
+            {
+                throw std::runtime_error("Incorrect linking between keys");
+            }
+            if constexpr (std::is_same_v<KeyType, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
+            {
+                auto itKey = getKeyMap<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>().emplace(
+                    linkedKeyName, std::move(getKeyFromKeyPair<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(keyPair))).first;
+                serialize<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(linkedKeyName, itKey->second);
+            }
+            else
+            {
+                auto itKey = getKeyMap<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>().emplace(
+                    linkedKeyName, std::move(getKeyFromKeyPair<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(keyPair))).first;
+                serialize<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(linkedKeyName, itKey->second);
+            }
+            updateSource(linkedKeyName, m_configJson[linkedKeyName]);
+        }
+        else
+        {
+            if constexpr (std::is_same_v<KeyType, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
+            {
+                serialize<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(std::string(keyName) + "." +
+                    m_configJson[linkedKeyName]["type"].get<std::string>(),
+                    getKeyFromKeyPair<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(keyPair));
+            }
+            else
+            {
+                serialize<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(std::string(keyName) + "." +
+                    m_configJson[linkedKeyName]["type"].get<std::string>(),
+                    getKeyFromKeyPair<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(keyPair));
+            }
+        }
+        auto itKey = getKeyMap<KeyType>().emplace(keyName, std::move(getKeyFromKeyPair<KeyType>(keyPair))).first;
+        const std::string keyNameStr(itKey->first);
+        serialize<KeyType>(keyNameStr, itKey->second);
+        updateSource(keyNameStr, keyContent);
+    }
 
     [[nodiscard]] std::shared_ptr<lbcrypto::CryptoContextImpl<lbcrypto::DCRTPoly>> generateCC(
         const std::string_view ccName,
         const nlohmann::json& ccContent);
+
     template <typename SchemeType>
     [[nodiscard]] static lbcrypto::CCParams<SchemeType> getCCParams(
         const nlohmann::json& ccContent);
 
     template <typename KeyType>
-    [[nodiscard]] inline auto& getKeyMap() noexcept;
+    [[nodiscard]] inline auto& getKeyMap() noexcept
+    {
+        if constexpr (std::is_same_v<std::remove_cvref_t<KeyType>, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
+            return m_privateKeyMap;
+        else
+            return m_publicKeyMap;
+    }
 
     template <typename KeyType>
-    [[nodiscard]] inline auto& getKeyFromKeyPair(
-        lbcrypto::KeyPair<lbcrypto::DCRTPoly>& keyPair) noexcept;
+    [[nodiscard]] inline auto& getKeyFromKeyPair(lbcrypto::KeyPair<lbcrypto::DCRTPoly>& keyPair) noexcept
+    {
+        if constexpr (std::is_same_v<std::remove_cvref_t<KeyType>, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
+            return keyPair.secretKey;
+        else
+            return keyPair.publicKey;
+    }
 
     inline void updateSource(
         const std::string& filename,
@@ -382,57 +441,6 @@ template <typename KeyType>
     return itCC->second;
 }
 
-template <typename KeyType>
-void ConfigProcessor::generateKeyPairAndSerialize(const std::string_view keyName, nlohmann::json& keyContent)
-{
-    std::shared_ptr<lbcrypto::CryptoContextImpl<lbcrypto::DCRTPoly>> cc =
-        aquireCC(keyContent["cryptocontext"].get<std::string_view>());
-    cc->Enable(lbcrypto::PKE);
-    lbcrypto::KeyPair<lbcrypto::DCRTPoly> keyPair = cc->KeyGen();
-    const std::string& linkedKeyName
-        = keyContent["linked_key_for_generation"].get_ref<const std::string&>();
-    if (!linkedKeyName.empty())
-    {
-        if (!(m_configJson[linkedKeyName]["linked_key_for_generation"].get<std::string_view>() == keyName &&
-            m_configJson[linkedKeyName]["source"].get<std::string_view>().empty()))
-        {
-            throw std::runtime_error("Incorrect linking between keys");
-        }
-        if constexpr (std::is_same_v<KeyType, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
-        {
-            auto itKey = getKeyMap<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>().emplace(
-                linkedKeyName, std::move(getKeyFromKeyPair<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(keyPair))).first;
-            serialize<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(linkedKeyName, itKey->second);
-        }
-        else
-        {
-            auto itKey = getKeyMap<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>().emplace(
-                linkedKeyName, std::move(getKeyFromKeyPair<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(keyPair))).first;
-            serialize<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(linkedKeyName, itKey->second);
-        }
-        updateSource(linkedKeyName, m_configJson[linkedKeyName]);
-    }
-    else
-    {
-        if constexpr (std::is_same_v<KeyType, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
-        {
-            serialize<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(std::string(keyName) + "." +
-                m_configJson[linkedKeyName]["type"].get<std::string>(),
-                getKeyFromKeyPair<lbcrypto::PublicKeyImpl<lbcrypto::DCRTPoly>>(keyPair));
-        }
-        else
-        {
-            serialize<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(std::string(keyName) + "." +
-                m_configJson[linkedKeyName]["type"].get<std::string>(),
-                getKeyFromKeyPair<lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>(keyPair));
-        }
-    }
-    auto itKey = getKeyMap<KeyType>().emplace(keyName, std::move(getKeyFromKeyPair<KeyType>(keyPair))).first;
-    const std::string keyNameStr(itKey->first);
-    serialize<KeyType>(keyNameStr, itKey->second);
-    updateSource(keyNameStr, keyContent);
-}
-
 [[nodiscard]] std::shared_ptr<lbcrypto::CryptoContextImpl<lbcrypto::DCRTPoly>> ConfigProcessor::generateCC(
     const std::string_view ccName, const nlohmann::json& ccContent)
 {
@@ -531,15 +539,6 @@ template <typename KeyType>
         return m_publicKeyMap;
 }
 
-template <typename KeyType>
-[[nodiscard]] inline auto& ConfigProcessor::getKeyFromKeyPair(lbcrypto::KeyPair<lbcrypto::DCRTPoly>& keyPair) noexcept
-{
-    if constexpr (std::is_same_v<std::remove_cvref_t<KeyType>, lbcrypto::PrivateKeyImpl<lbcrypto::DCRTPoly>>)
-        return keyPair.secretKey;
-    else
-        return keyPair.publicKey;
-}
-
 inline void ConfigProcessor::updateSource(const std::string& filename, nlohmann::json& argContent)
 {
     static const std::string path = "local://" + m_outputCryptoObjectsDirectory;