Fix sha256 file digest (#37)

* Always initialize sha256_out_length variable * Return true if processing was interrupted and false if not, this was erroneously inverted before * Bump version to 0.4.2 --------- Signed-off-by: Kai-Uwe Hermann <[email protected]>
EVerest · Jan 30, 2024 · 5afe436 · 5afe436
1 parent f95a98c
commit 5afe436
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(everest-evse_security VERSION 0.4.1
+project(everest-evse_security VERSION 0.4.2
         DESCRIPTION "Implementation of EVSE related security operations"
 		LANGUAGES CXX C
 )

diff --git a/lib/evse_security/crypto/openssl/openssl_supplier.cpp b/lib/evse_security/crypto/openssl/openssl_supplier.cpp
@@ -768,7 +768,7 @@ bool OpenSSLSupplier::digest_file_sha256(const fs::path& path, std::vector<std::
 
     bool digest_error = false;
 
-    unsigned int sha256_out_length;
+    unsigned int sha256_out_length = 0;
     std::byte sha256_out[EVP_MAX_MD_SIZE];
 
     // calculate sha256 of file
@@ -778,7 +778,7 @@ bool OpenSSLSupplier::digest_file_sha256(const fs::path& path, std::vector<std::
                 if (EVP_DigestUpdate(md_context_ptr.get(), bytes, read) == 0) {
                     EVLOG_error << "Error during EVP_DigestUpdate";
                     digest_error = true;
-                    return false;
+                    return true;
                 }
             }
 
@@ -787,11 +787,11 @@ bool OpenSSLSupplier::digest_file_sha256(const fs::path& path, std::vector<std::
                                        &sha256_out_length) == 0) {
                     EVLOG_error << "Error during EVP_DigestFinal_ex";
                     digest_error = true;
-                    return false;
+                    return true;
                 }
             }
 
-            return true;
+            return false;
         });
 
     if ((processed_file == false) || (digest_error == true)) {
@@ -843,4 +843,4 @@ bool OpenSSLSupplier::decode_base64_signature(const std::string& signature, std:
     return true;
 }
 
-} // namespace evse_security
+} // namespace evse_security
diff --git a/lib/evse_security/utils/evse_filesystem.cpp b/lib/evse_security/utils/evse_filesystem.cpp
@@ -87,8 +87,9 @@ bool process_file(const fs::path& file_path, size_t buffer_size,
     while (file.read(reinterpret_cast<char*>(buffer.data()), buffer_size)) {
         interupted = func(buffer.data(), buffer_size, false);
 
-        if (interupted)
+        if (interupted) {
             break;
+        }
     }
 
     // Process the remaining bytes
@@ -117,4 +118,4 @@ std::string get_random_file_name(const std::string& extension) {
     return buff.str();
 }
 
-} // namespace evse_security::filesystem_utils
+} // namespace evse_security::filesystem_utils