use BSWAP intrinsic in sha256.c

* other minor changes (style/comments)

Author: Christopher Gurnee

HashCheckTranslations.rc

@@ -32,7 +32,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 	IDS_HP_FIND_NOTFOUND     "Text not found."
 	IDS_HP_SAVE              "&Save..."
 	IDS_HP_OPTIONS           "&Options"
-	IDS_HP_FILELABEL         "   File: "               // should have the same width as "CRC-32: "; may translate "Name" if "File" is too long
+	IDS_HP_FILELABEL         "   File: "               // should have the same width as "SHA-256: "; may translate "Name" if "File" is too long
 
 	// Strings used exclusively in the HashVerify module
 	IDS_HV_LOADERROR_FMT     "Cannot load ""%s"""      // %s == name of the checksum file

libs/WinHash.c

@@ -1,6 +1,6 @@
 /**
  * Windows Hashing/Checksumming Library
- * Last modified: 2009/01/13
+ * Last modified: 2014/12/04
  * Original work copyright (C) Kai Liu.  All rights reserved.
  * Modified work copyright (C) 2014 Christopher Gurnee.  All rights reserved.
  *

libs/WinHash.h

@@ -1,6 +1,6 @@
 /**
  * Windows Hashing/Checksumming Library
- * Last modified: 2009/01/13
+ * Last modified: 2014/12/04
  * Original work copyright (C) Kai Liu.  All rights reserved.
  * Modified work copyright (C) 2014 Christopher Gurnee.  All rights reserved.
  *

libs/sha256.c

@@ -20,8 +20,10 @@
 //
 #if _MSC_VER >= 1300
 #  define ROTR(n, x)  _rotr(x, n)
+#  define SWAP_32(x)  _byteswap_ulong(x)  // swap endianness of a uint32
 #else
 #  define ROTR(n, x)  (  (x) >> (n)  |  (x) << (32-(n))  )
+#  define SWAP_32(x)  (  (x) << 24   |  ((x) & 0xff00) << 8  |  ((x) & 0xff0000) >> 8  |  (x) >> 24  )
 #endif
 
 // secion 4.1.2
@@ -46,9 +48,6 @@ const uint32_t K[] = {
 };
 
 
-// swap endianness of a uint32
-#define SWAP_32(x)  (  (x) << 24  |  ((x) & 0xff00) << 8  |  ((x) & 0xff0000) >> 8  |  (x) >> 24  )
-
 // array length (WARNING: arg must be of array type, not pointer)
 #define ARRAYLEN(a)  ( sizeof(a) / sizeof(a[0]) )
 
@@ -110,14 +109,14 @@ void sha256_block(uint32_t H[8], const uint32_t M[16])
     }
 
     // section 6.2.2 step 4
-    H[0] = a + H[0];
-    H[1] = b + H[1];
-    H[2] = c + H[2];
-    H[3] = d + H[3];
-    H[4] = e + H[4];
-    H[5] = f + H[5];
-    H[6] = g + H[6];
-    H[7] = h + H[7];
+    H[0] += a;
+    H[1] += b;
+    H[2] += c;
+    H[3] += d;
+    H[4] += e;
+    H[5] += f;
+    H[6] += g;
+    H[7] += h;
 }
 
 
@@ -135,7 +134,7 @@ void sha256_update(Sha256Context* context, const uint8_t* input, size_t input_si
         // copy bytes from the input to the working buffer
         int num_bytes_to_copy = (int)min(input_size, sizeof(context->buffer) - context->cur_buffer_size);
         memcpy(&context->buffer[context->cur_buffer_size], input, num_bytes_to_copy);
- 
+
         // update our data structures
         context->cur_buffer_size += num_bytes_to_copy;
         input                    += num_bytes_to_copy;
@@ -190,7 +189,7 @@ void sha256_finalize(Sha256Context* context)
         context->cur_buffer_size = 0;
         empty_bytes = sizeof(context->buffer);
     }
-    
+
     // append the "0" padding bits (leaving 64 bits at the end untouched)
     memset(&context->buffer[context->cur_buffer_size], 0, empty_bytes - 8);
 

version.h

@@ -11,10 +11,10 @@
 #define HASHCHECK_NAME_STR "HashCheck Shell Extension"
 
 // Full version: MUST be in the form of major,minor,revision,build
-#define HASHCHECK_VERSION_FULL 2,2,0,3
+#define HASHCHECK_VERSION_FULL 2,2,1,4
 
 // String version: May be any suitable string
-#define HASHCHECK_VERSION_STR "2.2.0.3"
+#define HASHCHECK_VERSION_STR "2.2.1.4"
 
 #ifdef _USRDLL
 // PE version: MUST be in the form of major.minor