version 5

Author: stbrumme

digest.cpp

@@ -33,29 +33,43 @@ int main(int argc, char** argv)
   bool computeKeccak    = algorithm.empty() || algorithm == "--keccak";
   bool computeSha3      = algorithm.empty() || algorithm == "--sha3";
 
-  // each cycle processes about 1 MByte (divisible by 144 => improves Keccak performance)
-  const size_t BufferSize = 144*7*1024;
-  char* buffer = new char[BufferSize];
-
   CRC32  digestCrc32;
   MD5    digestMd5;
   SHA1   digestSha1;
   SHA256 digestSha2;
   Keccak digestKeccak(Keccak::Keccak256);
   SHA3   digestSha3  (SHA3  ::Bits256);
 
-  // open file
-  std::ifstream file(filename.c_str(), std::ios::in | std::ios::binary);
-  if (!file)
+  // each cycle processes about 1 MByte (divisible by 144 => improves Keccak/SHA3 performance)
+  const size_t BufferSize = 144*7*1024;
+  char* buffer = new char[BufferSize];
+
+  // select input source: either file or standard-in
+  std::ifstream file;
+  std::istream* input = NULL;
+  // accept std::cin, syntax will be: "./digest - --sha3 < data"
+  if (filename == "-")
   {
-    std::cerr << "Can't open '" << filename << "'" << std::endl;
-    return 2;
+    input = &std::cin;
   }
+  else
+  {
+    // open file
+    file.open(filename.c_str(), std::ios::in | std::ios::binary);
+    if (!file)
+    {
+      std::cerr << "Can't open '" << filename << "'" << std::endl;
+      return 2;
+    }
 
-  while (!file.eof())
+    input = &file;
+  }
+
+  // process file
+  while (*input)
   {
-    file.read(buffer, BufferSize);
-    std::size_t numBytesRead = size_t(file.gcount());
+    input->read(buffer, BufferSize);
+    std::size_t numBytesRead = size_t(input->gcount());
 
     if (computeCrc32)
       digestCrc32 .add(buffer, numBytesRead);
@@ -70,9 +84,12 @@ int main(int argc, char** argv)
     if (computeSha3)
       digestSha3  .add(buffer, numBytesRead);
   }
+
+  // clean up
   file.close();
   delete[] buffer;
 
+  // show results
   if (computeCrc32)
     std::cout << "CRC32:      " << digestCrc32 .getHash() << std::endl;
   if (computeMd5)

keccak.cpp

@@ -60,7 +60,7 @@ namespace
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap64(x);
 #endif
-#ifdef MSC_VER
+#ifdef _MSC_VER
     return _byteswap_uint64(x);
 #endif
 

sha1.cpp

@@ -245,14 +245,14 @@ void SHA1::processBuffer()
     addLength = extra + paddedLength - BlockSize;
 
   // must be big endian
-  *addLength++ = (msgBits >> 56) & 0xFF;
-  *addLength++ = (msgBits >> 48) & 0xFF;
-  *addLength++ = (msgBits >> 40) & 0xFF;
-  *addLength++ = (msgBits >> 32) & 0xFF;
-  *addLength++ = (msgBits >> 24) & 0xFF;
-  *addLength++ = (msgBits >> 16) & 0xFF;
-  *addLength++ = (msgBits >>  8) & 0xFF;
-  *addLength   =  msgBits        & 0xFF;
+  *addLength++ = (unsigned char)((msgBits >> 56) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 48) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 40) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 32) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 24) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 16) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >>  8) & 0xFF);
+  *addLength   = (unsigned char)( msgBits        & 0xFF);
 
   // process blocks
   processBlock(m_buffer);

sha256.cpp

@@ -330,14 +330,14 @@ void SHA256::processBuffer()
     addLength = extra + paddedLength - BlockSize;
 
   // must be big endian
-  *addLength++ = (msgBits >> 56) & 0xFF;
-  *addLength++ = (msgBits >> 48) & 0xFF;
-  *addLength++ = (msgBits >> 40) & 0xFF;
-  *addLength++ = (msgBits >> 32) & 0xFF;
-  *addLength++ = (msgBits >> 24) & 0xFF;
-  *addLength++ = (msgBits >> 16) & 0xFF;
-  *addLength++ = (msgBits >>  8) & 0xFF;
-  *addLength   =  msgBits        & 0xFF;
+  *addLength++ = (unsigned char)((msgBits >> 56) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 48) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 40) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 32) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 24) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >> 16) & 0xFF);
+  *addLength++ = (unsigned char)((msgBits >>  8) & 0xFF);
+  *addLength   = (unsigned char)( msgBits        & 0xFF);
 
   // process blocks
   processBlock(m_buffer);

sha3.cpp

@@ -60,7 +60,7 @@ namespace
 #if defined(__GNUC__) || defined(__clang__)
     return __builtin_bswap64(x);
 #endif
-#ifdef MSC_VER
+#ifdef _MSC_VER
     return _byteswap_uint64(x);
 #endif