version 8

Author: stbrumme

keccak.cpp

@@ -149,7 +149,7 @@ void Keccak::processBlock(const void* data)
                       m_hash[ 1] = rotateLeft(last, 44);
 
     // Chi
-    for (unsigned int j = 0; j < 25; j += 5)
+    for (unsigned int j = 0; j < StateSize; j += 5)
     {
       // temporaries
       uint64_t one = m_hash[j];
@@ -235,6 +235,11 @@ void Keccak::processBuffer()
 /// return latest hash as 16 hex characters
 std::string Keccak::getHash()
 {
+  // save hash state
+  uint64_t oldHash[StateSize];
+  for (unsigned int i = 0; i < StateSize; i++)
+    oldHash[i] = m_hash[i];
+
   // process remaining bytes
   processBuffer();
 
@@ -267,6 +272,10 @@ std::string Keccak::getHash()
     processed += 8;
   }
 
+  // restore state
+  for (unsigned int i = 0; i < StateSize; i++)
+    m_hash[i] = oldHash[i];
+
   return result;
 }
 

sha3.cpp

@@ -11,6 +11,8 @@
 #include <endian.h>
 #endif
 
+#include <iostream>
+
 
 /// same as reset()
 SHA3::SHA3(Bits bits)
@@ -149,7 +151,7 @@ void SHA3::processBlock(const void* data)
                       m_hash[ 1] = rotateLeft(last, 44);
 
     // Chi
-    for (unsigned int j = 0; j < 25; j += 5)
+    for (unsigned int j = 0; j < StateSize; j += 5)
     {
       // temporaries
       uint64_t one = m_hash[j];
@@ -234,6 +236,11 @@ void SHA3::processBuffer()
 /// return latest hash as 16 hex characters
 std::string SHA3::getHash()
 {
+  // save hash state
+  uint64_t oldHash[StateSize];
+  for (unsigned int i = 0; i < StateSize; i++)
+    oldHash[i] = m_hash[i];
+
   // process remaining bytes
   processBuffer();
 
@@ -267,6 +274,10 @@ std::string SHA3::getHash()
     processed += 8;
   }
 
+  // restore state
+  for (unsigned int i = 0; i < StateSize; i++)
+    m_hash[i] = oldHash[i];
+
   return result;
 }
 

tests/github-issue2.cpp

@@ -0,0 +1,64 @@
+// minimal test case for https://github.com/stbrumme/hash-library/issues/2
+// g++ github-issue2.cpp ../sha*.cpp ../keccak.cpp ../md5.cpp -o github-issue2 && ./github-issue2
+
+#include "../sha1.h"
+#include "../sha256.h"
+#include "../sha3.h"
+#include "../keccak.h"
+#include "../md5.h"
+#include <iostream>
+
+int main()
+{
+  std::string text = "hello world";
+
+  std::cout << "SHA1:" << std::endl;
+  SHA1 sha1;
+  sha1.add(text.c_str(), text.size());
+
+  std::cout << sha1.getHash() << std::endl;
+  std::cout << sha1.getHash() << std::endl;
+  std::cout << sha1.getHash() << std::endl;
+
+  std::cout << std::endl;
+
+  std::cout << "SHA256:" << std::endl;
+  SHA256 sha256;
+  sha256.add(text.c_str(), text.size());
+
+  std::cout << sha256.getHash() << std::endl;
+  std::cout << sha256.getHash() << std::endl;
+  std::cout << sha256.getHash() << std::endl;
+
+  std::cout << std::endl;
+
+  std::cout << "SHA3:" << std::endl;
+  SHA3 sha3;
+  sha3.add(text.c_str(), text.size());
+
+  std::cout << sha3.getHash() << std::endl;
+  std::cout << sha3.getHash() << std::endl;
+  std::cout << sha3.getHash() << std::endl;
+
+  std::cout << std::endl;
+
+  std::cout << "Keccak:" << std::endl;
+  Keccak keccak;
+  keccak.add(text.c_str(), text.size());
+
+  std::cout << keccak.getHash() << std::endl;
+  std::cout << keccak.getHash() << std::endl;
+  std::cout << keccak.getHash() << std::endl;
+
+  std::cout << std::endl;
+
+  std::cout << "MD5:" << std::endl;
+  MD5 md5;
+  md5.add(text.c_str(), text.size());
+
+  std::cout << md5.getHash() << std::endl;
+  std::cout << md5.getHash() << std::endl;
+  std::cout << md5.getHash() << std::endl;
+
+  return 0;
+}

tests/github-issue6.cpp

@@ -0,0 +1,16 @@
+// minimal test case for https://github.com/stbrumme/hash-library/issues/6
+// g++ github-issue6.cpp ../sha3.cpp -o github-issue6 && ./github-issue6
+
+#include "../sha3.h"
+#include <iostream>
+
+int main(int argc, char *argv[])
+{
+  std::string text = "72a5f501151ca974002f34";
+
+  SHA3 hasher(SHA3::Bits512);
+  hasher.add(text.data(), text.size());
+  std::cout << hasher.getHash() << std::endl;
+
+  return 0;
+}