Tidy-check compilation error resolved.

arc-vmware · Jun 10, 2022 · 06b3943 · 06b3943
1 parent 4a21a2e
commit 06b3943
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 25 deletions.
diff --git a/.github/workflows/build_and_test_clang_debug.yml b/.github/workflows/build_and_test_clang_debug.yml
@@ -59,9 +59,6 @@ jobs:
                               -DUSE_OPENTRACING=ON \
                               -DOMIT_TEST_OUTPUT=OFF\
                               -DKEEP_APOLLO_LOGS=TRUE\
-                              -DUSE_CRYPTOPP_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA3_256=TRUE\
                               -DUSE_FAKE_CLOCK_IN_TIME_SERVICE=TRUE\" "\
               && script -q -e -c "make test"
         - name: Prepare artifacts

diff --git a/.github/workflows/build_and_test_clang_release.yml b/.github/workflows/build_and_test_clang_release.yml
@@ -60,9 +60,6 @@ jobs:
                               -DUSE_OPENTRACING=ON \
                               -DOMIT_TEST_OUTPUT=OFF\
                               -DKEEP_APOLLO_LOGS=TRUE\
-                              -DUSE_CRYPTOPP_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA3_256=TRUE\
                               -DUSE_FAKE_CLOCK_IN_TIME_SERVICE=TRUE\" "\
               && script -q -e -c "make test"
         - name: Prepare artifacts

diff --git a/.github/workflows/build_and_test_gcc_debug.yml b/.github/workflows/build_and_test_gcc_debug.yml
@@ -59,9 +59,6 @@ jobs:
                               -DOMIT_TEST_OUTPUT=OFF\
                               -DKEEP_APOLLO_LOGS=TRUE\
                               -DRUN_APOLLO_TESTS=FALSE\
-                              -DUSE_CRYPTOPP_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA3_256=TRUE\
                               -DUSE_FAKE_CLOCK_IN_TIME_SERVICE=TRUE\" "\
               && script -q -e -c "make test"
         - name: Prepare artifacts

diff --git a/.github/workflows/build_and_test_gcc_release.yml b/.github/workflows/build_and_test_gcc_release.yml
@@ -59,9 +59,6 @@ jobs:
                               -DOMIT_TEST_OUTPUT=OFF\
                               -DKEEP_APOLLO_LOGS=TRUE\
                               -DRUN_APOLLO_TESTS=FALSE\
-                              -DUSE_CRYPTOPP_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA_256=FALSE\
-                              -DUSE_OPENSSL_SHA3_256=TRUE\
                               -DUSE_FAKE_CLOCK_IN_TIME_SERVICE=TRUE\" "\
               && script -q -e -c "make test"
         - name: Prepare artifacts

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -37,9 +37,6 @@ jobs:
                             -DUSE_S3_OBJECT_STORE=TRUE \
                             -DUSE_OPENTRACING=ON \
                             -DOMIT_TEST_OUTPUT=OFF\
-                            -DUSE_CRYPTOPP_SHA_256=FALSE\
-                            -DUSE_OPENSSL_SHA_256=FALSE\
-                            -DUSE_OPENSSL_SHA3_256=TRUE\
                             -DUSE_FAKE_CLOCK_IN_TIME_SERVICE=TRUE\" "\
         - name: Print failure info
           if: failure()

diff --git a/Makefile b/Makefile
@@ -57,9 +57,6 @@ CONCORD_BFT_CMAKE_TSAN?=FALSE
 CONCORD_BFT_CMAKE_CODECOVERAGE?=FALSE
 CONCORD_BFT_CMAKE_USE_FAKE_CLOCK_IN_TIME_SERVICE?=FALSE
 ENABLE_RESTART_RECOVERY_TESTS?=FALSE
-CONCORD_BFT_CMAKE_USE_CRYPTOPP_SHA_256?=FALSE
-CONCORD_BFT_CMAKE_USE_OPENSSL_SHA_256?=FALSE
-CONCORD_BFT_CMAKE_USE_OPENSSL_SHA3_256?=TRUE
 
 ifeq (${CONCORD_BFT_CMAKE_ASAN},TRUE)
 	CONCORD_BFT_CMAKE_CXX_FLAGS_RELEASE='-O0 -g'
@@ -95,9 +92,6 @@ CONCORD_BFT_CMAKE_FLAGS?= \
 			-DCODECOVERAGE=${CONCORD_BFT_CMAKE_CODECOVERAGE} \
 			-DTXN_SIGNING_ENABLED=${CONCORD_BFT_CMAKE_TRANSACTION_SIGNING_ENABLED} \
 			-DENABLE_RESTART_RECOVERY_TESTS=${ENABLE_RESTART_RECOVERY_TESTS}
-			-DUSE_OPENSSL_SHA_256=${CONCORD_BFT_CMAKE_USE_OPENSSL_SHA_256} \
-			-DUSE_OPENSSL_SHA3_256=${CONCORD_BFT_CMAKE_USE_OPENSSL_SHA3_256} \
-			-DUSE_CRYPTOPP_SHA_256=${CONCORD_BFT_CMAKE_USE_CRYPTOPP_SHA_256}
 
 # The consistency parameter makes sense only at MacOS.
 # It is ignored at all other platforms.

diff --git a/reconfiguration/src/reconfiguration_handler.cpp b/reconfiguration/src/reconfiguration_handler.cpp
@@ -29,7 +29,12 @@
 
 using namespace concord::messages;
 using concord::util::crypto::KeyFormat;
+
+#if ECDSA_Algo
+using concord::util::cryptopp_utils::ECDSAVerifier;
+#else
 using concord::util::openssl_utils::EdDSA_Verifier;
+#endif
 
 namespace concord::reconfiguration {
 
@@ -336,7 +341,7 @@ BftReconfigurationHandler::BftReconfigurationHandler() {
   }
   key_str.append(buf, 0, key_content.gcount());
 #if ECDSA_Algo
-  verifier_.reset(new concord::util::cryptopp_utils::ECDSAVerifier(key_str, KeyFormat::PemFormat));
+  verifier_.reset(new ECDSAVerifier(key_str, KeyFormat::PemFormat));
 #else
   verifier_.reset(new EdDSA_Verifier(key_str, KeyFormat::PemFormat));
 #endif

diff --git a/secretsmanager/src/aes.cpp b/secretsmanager/src/aes.cpp
@@ -57,7 +57,7 @@ vector<uint8_t> AES_CBC::encrypt(const string& input) const {
     return {};
   }
 
-  int c_len = input.size() + AES_BLOCK_SIZE;
+  int c_len = (int)input.size() + AES_BLOCK_SIZE;
   int f_len = 0;
 
   auto deleter = [](unsigned char* p) {

diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
@@ -20,8 +20,8 @@ add_library(util        STATIC ${util_source_files})
 add_library(util_shared SHARED ${util_source_files})
 
 # Use below macros to use CryptoPP's SHA_256 or OpenSSL's SHA_256 hashing.
-# USE_CRYPTOPP_SHA_256=FALSE
-# USE_OPENSSL_SHA_256=FALSE
+# USE_CRYPTOPP_SHA_256
+# USE_OPENSSL_SHA_256
 target_compile_definitions(util PUBLIC USE_OPENSSL_SHA3_256)
 target_compile_definitions(util_shared PUBLIC USE_OPENSSL_SHA3_256)