Fixed #1 getSha1ByFile, Fixed #2 getMd5ByFile

Author: sea5kg

src/wsjcpp_hashes.cpp

@@ -3,6 +3,7 @@
 #include <md5.h>
 #include <iostream>
 #include <cstring>
+#include <fstream>
 
 // ---------------------------------------------------------------------
 // WsjcppHashes
@@ -27,6 +28,35 @@ std::string WsjcppHashes::getMd5ByString(const std::string &sStr) {
     return md5.hexdigest();
 }
 
+std::string WsjcppHashes::getMd5ByFile(const std::string &sFilename) {
+    std::ifstream f(sFilename, std::ifstream::binary);
+    if (!f) {
+        return "Could not open file";
+    }
+
+    // get length of file:
+    f.seekg (0, f.end);
+    int nBufferSize = f.tellg();
+    f.seekg (0, f.beg);
+
+    char *pBuffer = new char [nBufferSize];
+
+    // read data as a block:
+    f.read(pBuffer, nBufferSize);
+    if (!f) {
+        delete[] pBuffer;
+        f.close();
+        return "Could not read file. Only " + std::to_string(f.gcount()) + " could be read";
+    }
+    f.close();
+
+    
+    MD5 md5;
+    md5.update(pBuffer, nBufferSize);
+    md5.finalize();
+    return md5.hexdigest();
+}
+
 std::string WsjcppHashes::getSha1ByString(const std::string &sStr) {
     char hexstring[41]; // 40 chars + a zero
     std::memset(hexstring, 0, sizeof hexstring);
@@ -37,11 +67,33 @@ std::string WsjcppHashes::getSha1ByString(const std::string &sStr) {
     return std::string(hexstring);
 }
 
-std::string WsjcppHashes::getMd5ByFile(const std::string &sFilename) {
-    return "todo";
-}
-
 std::string WsjcppHashes::getSha1ByFile(const std::string &sFilename) {
-    return "todo";
+    std::ifstream f(sFilename, std::ifstream::binary);
+    if (!f) {
+        return "Could not open file";
+    }
+
+    // get length of file:
+    f.seekg (0, f.end);
+    int nBufferSize = f.tellg();
+    f.seekg (0, f.beg);
+
+    char *pBuffer = new char [nBufferSize];
+
+    // read data as a block:
+    f.read(pBuffer, nBufferSize);
+    if (!f) {
+        delete[] pBuffer;
+        f.close();
+        return "Could not read file. Only " + std::to_string(f.gcount()) + " could be read";
+    }
+    f.close();
+
+    char hexstring[41]; // 40 chars + a zero
+    std::memset(hexstring, 0, sizeof hexstring);
+    unsigned char hash[20];
+    sha1::calc(pBuffer, nBufferSize, hash);
+    sha1::toHexString(hash, hexstring);
+    return std::string(hexstring);
 }
 

src/wsjcpp_hashes.h

@@ -9,8 +9,9 @@ class WsjcppHashes {
         static std::string md5_calc_hex(const std::string &sSource); // deprecated
 
         static std::string getMd5ByString(const std::string &sStr);
-        static std::string getSha1ByString(const std::string &sStr);
         static std::string getMd5ByFile(const std::string &sFilename);
+
+        static std::string getSha1ByString(const std::string &sStr);
         static std::string getSha1ByFile(const std::string &sFilename);
 
 };