Digest generation using OpenSSL library (SHA2_256 & SHA3_256 algos).

arc-vmware · Jun 13, 2022 · 770e674 · 770e674
1 parent 7de3f2b
commit 770e674
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/bftengine/src/bftengine/ReplicaImp.cpp b/bftengine/src/bftengine/ReplicaImp.cpp
@@ -1340,8 +1340,12 @@ void ReplicaImp::sendPartialProof(SeqNumInfo &seqNumInfo) {
       else
         commitSigner = CryptoManager::instance().thresholdSignerForOptimisticCommit(seqNum);
 
+<<<<<<< HEAD
       Digest tmpDigest;
       Digest digestHelper;
+=======
+      Digest tmpDigest, digestHelper;
+>>>>>>> Digest generation using OpenSSL library (SHA2_256 & SHA3_256 algos).
       digestHelper.calcCombination(ppDigest, getCurrentView(), seqNum, tmpDigest);
 
       const auto &span_context = pp->spanContext<std::remove_pointer<decltype(pp)>::type>();
@@ -4118,8 +4122,12 @@ ReplicaImp::ReplicaImp(const LoadedReplicaData &ld,
         else
           commitSigner = CryptoManager::instance().thresholdSignerForOptimisticCommit(seqNum);
 
+<<<<<<< HEAD
         Digest tmpDigest;
         Digest digestHelper;
+=======
+        Digest tmpDigest, digestHelper;
+>>>>>>> Digest generation using OpenSSL library (SHA2_256 & SHA3_256 algos).
         digestHelper.calcCombination(ppDigest, getCurrentView(), seqNum, tmpDigest);
 
         PartialCommitProofMsg *p = new PartialCommitProofMsg(

diff --git a/util/include/evp_hash.hpp b/util/include/evp_hash.hpp
@@ -45,6 +45,9 @@ class EVPHash {
   };
 
   EVPHash& operator=(EVPHash&& other) noexcept {
+    if (nullptr != ctx_) {  // Prevent memory leak.
+      EVP_MD_CTX_destroy(ctx_);
+    }
     *this = EVPHash{std::move(other)};
     return *this;
   }