Misc OpenSSL 3.x fixes (#5650)

.daily_canary

@@ -1,4 +1,4 @@
    -^-     ___           ___
-  (- -)   (= =)   |     Y   &  +--???
- (  V  ) /  .  \  O    +---=---'
-/--x-m- /--n-n---xXx--/--yY--------
+  (- -)   (= =)   |     Y   &  +--?
+ (  V  ) /  .  \  |    +---=---'
+/--x-m- /--n-n---xXx--/--yY------

CMakeLists.txt

@@ -949,13 +949,13 @@ if(BUILD_TESTS)
     target_link_libraries(
       historical_queries_test PRIVATE http_parser.host sss.host ccf_kv.host
     )
-
     # Temporarily disabled flaky test
     # https://github.com/microsoft/CCF/issues/4403 add_unit_test( indexing_test
     # ${CMAKE_CURRENT_SOURCE_DIR}/src/indexing/test/indexing.cpp
     # ${CMAKE_CURRENT_SOURCE_DIR}/src/indexing/test/lfs.cpp )
     # target_link_libraries( indexing_test PRIVATE ccf_endpoints.host sss.host
-    # ccf_kv.host )
+    # ccf_kv.host ) target_link_libraries( indexing_test PRIVATE
+    # ccf_endpoints.host sss.host ccf_kv.host )
 
     add_unit_test(
       snapshot_test ${CMAKE_CURRENT_SOURCE_DIR}/src/node/test/snapshot.cpp

src/apps/tpcc/clients/tpcc_client.cpp

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the Apache 2.0 License.
 #include "../tpcc_serializer.h"
+#include "crypto/openssl/hash.h"
 #include "perf_client.h"
 
 using namespace std;
@@ -156,13 +157,15 @@ int main(int argc, char** argv)
 {
   logger::config::default_init();
   logger::config::level() = LoggerLevel::INFO;
+  crypto::openssl_sha256_init();
 
   CLI::App cli_app{"Tpcc Client"};
   TpccClientOptions options(cli_app, argv[0]);
   CLI11_PARSE(cli_app, argc, argv);
 
   TpccClient client(options);
   client.run();
+  crypto::openssl_sha256_shutdown();
 
   return 0;
 }

src/apps/tpcc/tpcc.cmake

@@ -28,14 +28,12 @@ sign_app_library(
 add_unit_test(tpcc_test ${CMAKE_CURRENT_LIST_DIR}/app/test/tpcc.cpp)
 
 if(BUILD_TESTS)
-  foreach(CONSENSUS ${CONSENSUSES})
-    set(TPCC_ITERATIONS 50000)
+  set(TPCC_ITERATIONS 50000)
 
-    add_perf_test(
-      NAME tpcc
-      PYTHON_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/tests/tpcc.py
-      CLIENT_BIN ./tpcc_client
-      ADDITIONAL_ARGS --transactions ${TPCC_ITERATIONS} --max-writes-ahead 250
-    )
-  endforeach()
+  add_perf_test(
+    NAME tpcc
+    PYTHON_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/tests/tpcc.py
+    CLIENT_BIN ./tpcc_client
+    ADDITIONAL_ARGS --transactions ${TPCC_ITERATIONS} --max-writes-ahead 250
+  )
 endif()

src/indexing/test/indexing.cpp

@@ -5,6 +5,7 @@
 #include "ccf/indexing/strategies/seqnos_by_key_in_memory.h"
 #include "consensus/aft/raft.h"
 #include "consensus/aft/test/logging_stub.h"
+#include "crypto/openssl/hash.h"
 #include "ds/test/stub_writer.h"
 #include "host/lfs_file_handler.h"
 #include "indexing/enclave_lfs_access.h"
@@ -13,7 +14,7 @@
 #include "node/share_manager.h"
 
 #include <thread>
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#define DOCTEST_CONFIG_IMPLEMENT
 #include <doctest/doctest.h>
 
 // Transitively see a header that tries to use ThreadMessaging, so need to
@@ -509,6 +510,7 @@ TEST_CASE(
   std::atomic<size_t> writes_to_42 = 0;
 
   auto tx_advancer = [&]() {
+    crypto::openssl_sha256_init();
     size_t i = 0;
     while (i < 1'000)
     {
@@ -530,6 +532,7 @@ TEST_CASE(
       ++i;
       std::this_thread::yield();
     }
+    crypto::openssl_sha256_shutdown();
     finished = true;
   };
 
@@ -569,6 +572,7 @@ TEST_CASE(
   std::atomic<bool> work_done = false;
 
   std::thread index_ticker([&]() {
+    crypto::openssl_sha256_init();
     while (!work_done)
     {
       size_t post_work_done_loops = 0;
@@ -621,6 +625,7 @@ TEST_CASE(
         std::this_thread::yield();
       }
     }
+    crypto::openssl_sha256_shutdown();
   });
 
   std::vector<std::thread> threads;
@@ -793,6 +798,7 @@ TEST_CASE(
   std::atomic<size_t> writes_to_42 = 0;
 
   auto tx_advancer = [&]() {
+    crypto::openssl_sha256_init();
     size_t i = 0;
     constexpr auto tx_count =
 #if NDEBUG
@@ -822,10 +828,12 @@ TEST_CASE(
       std::this_thread::yield();
     }
     all_submitted = true;
+    crypto::openssl_sha256_shutdown();
   };
 
   auto get_all =
     [&](const std::string& key) -> std::optional<ccf::SeqNoCollection> {
+    crypto::openssl_sha256_init();
     const auto max_range = index_a->max_requestable_range();
     auto range_start = 0;
 
@@ -857,13 +865,15 @@ TEST_CASE(
 
       if (range_end == end_seqno)
       {
+        crypto::openssl_sha256_shutdown();
         return all_results;
       }
       else
       {
         range_start = range_end + 1;
       }
     }
+    crypto::openssl_sha256_shutdown();
   };
 
   auto fetch_index_a = [&]() {
@@ -920,13 +930,15 @@ TEST_CASE(
   });
 
   std::thread index_ticker([&]() {
+    crypto::openssl_sha256_init();
     while (!work_done)
     {
       while (indexer.update_strategies(step_time, kv_store.current_txid()))
       {
         std::this_thread::yield();
       }
     }
+    crypto::openssl_sha256_shutdown();
   });
 
   std::thread watchdog([&]() {
@@ -951,3 +963,15 @@ TEST_CASE(
   index_ticker.join();
   watchdog.join();
 }
+
+int main(int argc, char** argv)
+{
+  crypto::openssl_sha256_init();
+  doctest::Context context;
+  context.applyCommandLine(argc, argv);
+  int res = context.run();
+  crypto::openssl_sha256_shutdown();
+  if (context.shouldExit())
+    return res;
+  return res;
+}