Changeset 407 for branches/thune

Timestamp:

06/08/07 23:06:09 (18 months ago)

Author:

krobillard

Message:

Thune - Fixed SHA1 checksum.

Location:

branches/thune/thread_safe

Files:

• files.c (modified) (1 diff)
• support/sha1.c (modified) (15 diffs)

branches/thune/thread_safe/files.c

@@ -781 +781 @@
                 bin->used = 20;
 
-                SHA1Init( &context );
-                SHA1Update( &context, (uint8_t*) cpA, cpB - cpA );
-                SHA1Final( bin->ptr.b, &context );
-                
+                SHA1_Init( &context );
+                SHA1_Update( &context, (uint8_t*) cpA, cpB - cpA );
+                SHA1_Final( &context, bin->ptr.b );
+
                 ur_initType(res, UT_BINARY);
                 ur_setSeries(res, binN, 0);

branches/thune/thread_safe/support/sha1.c

@@ -1 +1 @@
 /*
 SHA-1 in C
-By Steve Reid <steve@edmweb.com>
+By Steve Reid <sreid@sea-to-sky.net>
 100% Public Domain
 
+-----------------
+Modified 7/98 
+By James H. Brown <jbrown@burgoyne.com>
+Still 100% Public Domain
+
+Corrected a problem which generated improper hash values on 16 bit machines
+Routine SHA1Update changed from
+        void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int
+len)
+to
+        void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned
+long len)
+
+The 'len' parameter was declared an int which works fine on 32 bit machines.
+However, on 16 bit machines an int is too small for the shifts being done
+against
+it.  This caused the hash function to generate incorrect values if len was
+greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of SHA1Update().
+
+Since the file IO in main() reads 16K at a time, any file 8K or larger would
+be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+"a"s).
+
+I also changed the declaration of variables i & j in SHA1Update to 
+unsigned long from unsigned int for the same reason.
+
+These changes should make no difference to any 32 bit implementations since
+an
+int and a long are the same size in those environments.
+
+--
+I also corrected a few compiler warnings generated by Borland C.
+1. Added #include <process.h> for exit() prototype
+2. Removed unused variable 'j' in SHA1Final
+3. Changed exit(0) to return(0) at end of main.
+
+ALL changes I made can be located by searching for comments containing 'JHB'
+-----------------
+Modified 8/98
+By Steve Reid <sreid@sea-to-sky.net>
+Still 100% public domain
+
+1- Removed #include <process.h> and used return() instead of exit()
+2- Fixed overwriting of finalcount in SHA1Final() (discovered by Chris Hall)
+3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net
+
+-----------------
+Modified 4/01
+By Saul Kravitz <Saul.Kravitz@celera.com>
+Still 100% PD
+Modified to run on Compaq Alpha hardware.  
+
+-----------------
+Modified 07/2002
+By Ralph Giles <giles@artofcode.com>
+Still 100% public domain
+modified for use with stdint types, autoconf
+code cleanup, removed attribution comments
+switched SHA1Final() argument order for consistency
+use SHA1_ prefix for public api
+move public api to sha1.h
+*/
+
+/*
 Test Vectors (from FIPS PUB 180-1)
 "abc"
@@ -13 +77 @@
 */
 
-/* #define LITTLE_ENDIAN * This should be #define'd if true. */
+/* #define __BIG_ENDIAN__ * This should be #define'd if true. */
 /* #define SHA1HANDSOFF * Copies data before messing with it. */
 
-#include <stdio.h>
+
 #include <string.h>
+#include <stdint.h>
+
 
 typedef struct {
-    unsigned long state[5];
-    unsigned long count[2];
-    unsigned char buffer[64];
+    uint32_t state[5];
+    uint32_t count[2];
+    uint8_t  buffer[64];
 } SHA1_CTX;
 
-void SHA1Transform(unsigned long state[5], unsigned char buffer[64]);
-void SHA1Init(SHA1_CTX* context);
-void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len);
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
+
+#define SHA1_DIGEST_SIZE 20
 
 #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
@@ -34 +98 @@
 /* blk0() and blk() perform the initial expand. */
 /* I got the idea of expanding during the round function from SSLeay */
-#ifdef LITTLE_ENDIAN
+/* FIXME: can we do this in an endian-proof way? */
+#ifdef __BIG_ENDIAN__
+#define blk0(i) block->l[i]
+#else
 #define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
     |(rol(block->l[i],8)&0x00FF00FF))
-#else
-#define blk0(i) block->l[i]
 #endif
 #define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
@@ -52 +117 @@
 
 /* Hash a single 512-bit block. This is the core of the algorithm. */
-
-void SHA1Transform(unsigned long state[5], unsigned char buffer[64])
-{
-unsigned long a, b, c, d, e;
-typedef union {
-    unsigned char c[64];
-    unsigned long l[16];
-} CHAR64LONG16;
-CHAR64LONG16* block;
+void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+{
+    uint32_t a, b, c, d, e;
+    typedef union {
+        uint8_t c[64];
+        uint32_t l[16];
+    } CHAR64LONG16;
+    CHAR64LONG16* block;
+
 #ifdef SHA1HANDSOFF
-static unsigned char workspace[64];
+    static uint8_t workspace[64];
     block = (CHAR64LONG16*)workspace;
     memcpy(block, buffer, 64);
@@ -68 +133 @@
     block = (CHAR64LONG16*)buffer;
 #endif
+
     /* Copy context->state[] to working vars */
     a = state[0];
@@ -74 +140 @@
     d = state[3];
     e = state[4];
+
     /* 4 rounds of 20 operations each. Loop unrolled. */
     R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
@@ -95 +162 @@
     R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
     R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+
     /* Add the working vars back into context.state[] */
     state[0] += a;
@@ -101 +169 @@
     state[3] += d;
     state[4] += e;
+
     /* Wipe variables */
     a = b = c = d = e = 0;
@@ -107 +176 @@
 
 /* SHA1Init - Initialize new context */
-
-void SHA1Init(SHA1_CTX* context)
+void SHA1_Init(SHA1_CTX* context)
 {
     /* SHA1 initialization constants */
@@ -121 +189 @@
 
 /* Run your data through this. */
-
-void SHA1Update(SHA1_CTX* context, unsigned char* data, unsigned int len)
-{
-unsigned int i, j;
+void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
+{
+    size_t i, j;
 
     j = (context->count[0] >> 3) & 63;
@@ -131 +198 @@
     if ((j + len) > 63) {
         memcpy(&context->buffer[j], data, (i = 64-j));
-        SHA1Transform(context->state, context->buffer);
+        SHA1_Transform(context->state, context->buffer);
         for ( ; i + 63 < len; i += 64) {
-            SHA1Transform(context->state, &data[i]);
+            SHA1_Transform(context->state, data + i);
         }
         j = 0;
@@ -143 +210 @@
 
 /* Add padding and return the message digest. */
-
-void SHA1Final(unsigned char digest[20], SHA1_CTX* context)
-{
-unsigned long i, j;
-unsigned char finalcount[8];
+void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+{
+    uint32_t i;
+    uint8_t  finalcount[8];
 
     for (i = 0; i < 8; i++) {
@@ -153 +219 @@
          >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
     }
-    SHA1Update(context, (unsigned char *)"\200", 1);
+    SHA1_Update(context, (uint8_t *)"\200", 1);
     while ((context->count[0] & 504) != 448) {
-        SHA1Update(context, (unsigned char *)"\0", 1);
-    }
-    SHA1Update(context, finalcount, 8);  /* Should cause a SHA1Transform() */
-    for (i = 0; i < 20; i++) {
-        digest[i] = (unsigned char)
+        SHA1_Update(context, (uint8_t *)"\0", 1);
+    }
+    SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
+    for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
+        digest[i] = (uint8_t)
          ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
     }
+    
     /* Wipe variables */
-    i = j = 0;
+    i = 0;
     memset(context->buffer, 0, 64);
     memset(context->state, 0, 20);
     memset(context->count, 0, 8);
-    memset(&finalcount, 0, 8);
-#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */
-    SHA1Transform(context->state, context->buffer);
-#endif
-}
-
-
+    memset(finalcount, 0, 8);   /* SWR */
+
+#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite its own static vars */
+    SHA1_Transform(context->state, context->buffer);
+#endif
+}
+  
 /*************************************************************/
 
-
 #ifdef UNIT_TEST
+#include <stdio.h>
+
 int main(int argc, char** argv)
 {
 int i, j;
 SHA1_CTX context;
-unsigned char digest[20], buffer[16384];
+unsigned char digest[SHA1_DIGEST_SIZE], buffer[16384];
 FILE* file;
 
     if (argc > 2) {
-        puts("Public domain SHA-1 implementation - by Steve Reid <steve@edmweb.com>");
+        puts("Public domain SHA-1 implementation - by Steve Reid <sreid@sea-to-sky.net>");
+        puts("Modified for 16 bit environments 7/98 - by James H. Brown <jbrown@burgoyne.com>");        /* JHB */
         puts("Produces the SHA-1 hash of a file, or stdin if no file is specified.");
-        exit(0);
+        return(0);
     }
     if (argc < 2) {
@@ -196 +265 @@
         if (!(file = fopen(argv[1], "rb"))) {
             fputs("Unable to open file.", stderr);
-            exit(-1);
+            return(-1);
         }
     } 
-    SHA1Init(&context);
+    SHA1_Init(&context);
     while (!feof(file)) {  /* note: what if ferror(file) */
         i = fread(buffer, 1, 16384, file);
-        SHA1Update(&context, buffer, i);
-    }
-    SHA1Final(digest, &context);
+        SHA1_Update(&context, buffer, i);
+    }
+    SHA1_Final(&context, digest);
     fclose(file);
-    for (i = 0; i < 5; i++) {
+    for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
         for (j = 0; j < 4; j++) {
             printf("%02X", digest[i*4+j]);
@@ -213 +282 @@
     }
     putchar('\n');
-    exit(0);
-}
-#endif
+    return(0);  /* JHB */
+}
+#endif