Changeset 444 for trunk/src/sh_tiger0.c

Timestamp:

Oct 31, 2013, 11:31:47 PM (11 years ago)

Author:

katerina

Message:

Support for sha2-256 checksum (ticket #348).

File:

• trunk/src/sh_tiger0.c (modified) (8 diffs)

trunk/src/sh_tiger0.c

@@ -1386 +1386 @@
 /*@+type@*/
 
+#include "sh_checksum.h"
+
+#define SH_VAR_SHA1   0
+#define SH_VAR_SHA256 1
+
 /* Compute SHA1 message digest for bytes read from STREAM.  The
    resulting message digest number will be written into the 16 bytes
    beginning at RESBLOCK.  */
-static int sha1_stream(char * filename, void *resblock, 
-                       UINT64 * Length, int timeout, SL_TICKET fd)
+static int SHA_stream(char * filename, void *resblock, 
+                      UINT64 * Length, int timeout, SL_TICKET fd, int variant)
 {
   /* Important: BLOCKSIZE must be a multiple of 64.  */
   static const int BLOCKSIZE = 4096;
   struct sha_ctx ctx;
+  SHA256_CTX ctx_sha2;
   char * buffer = SH_ALLOC(4168); /* BLOCKSIZE + 72 AIX compiler chokes */
   off_t sum = 0;
@@ -1410 +1416 @@
 
   /* Initialize the computation context.  */
-  (void) sha_init(&ctx);
+  if (variant == SH_VAR_SHA256)
+    (void) SHA256_Init(&ctx_sha2);
+  else
+    (void) sha_init(&ctx);
 
   if (SL_ISERROR (fd))
@@ -1506 +1515 @@
        BLOCKSIZE % 64 == 0
     */
-    sha_update(&ctx, (sha_word8*) buffer, (sha_word32) BLOCKSIZE);
+    if (variant == SH_VAR_SHA256)
+      SHA256_Update(&ctx_sha2, (sha2_byte*) buffer, (size_t) BLOCKSIZE);
+    else
+      sha_update(&ctx, (sha_word8*) buffer, (sha_word32) BLOCKSIZE);
     sh.statistics.bytes_hashed += BLOCKSIZE;
 
@@ -1528 +1540 @@
   if (sum > 0)
     {
-      sha_update(&ctx, (sha_word8*) buffer, (sha_word32) sum);
+      if (variant == SH_VAR_SHA256)
+        SHA256_Update(&ctx_sha2, (sha2_byte*) buffer, (size_t) sum);
+      else
+        sha_update(&ctx, (sha_word8*) buffer, (sha_word32) sum);
       sh.statistics.bytes_hashed += sum;
     }
 
-  sha_final (&ctx);
-
   /* Construct result in desired memory.  */
-  sha_digest (&ctx, resblock);
+  if (variant == SH_VAR_SHA256)
+    {
+      SHA256_End(&ctx_sha2, resblock);
+    }
+  else
+    {
+      sha_final (&ctx);
+      sha_digest (&ctx, resblock);
+    }
+
   *Length = bcount;
   SH_FREE(buffer);
@@ -1550 +1572 @@
   unsigned char sha1buffer[20];
 
-  (void) sha1_stream (filename, sha1buffer, Length, timeout, what);
+  (void) SHA_stream (filename, sha1buffer, Length, timeout, what, SH_VAR_SHA1);
 
   /*@-bufferoverflowhigh -usedef@*/
@@ -1565 +1587 @@
 }
 
+static char * sh_tiger_sha256_hash  (char * filename, TigerType what, 
+                                     UINT64 * Length, int timeout, 
+                                     char * out, size_t len)
+{
+  char outbuf[KEYBUF_SIZE];
+
+  (void) SHA_stream (filename, outbuf, Length, timeout, what, SH_VAR_SHA256);
+
+  sl_strlcpy(out, outbuf, len);
+  return out;
+}
+
 /* ifdef USE_SHA1 */
 #endif
 
-static int hash_type = 0;
+static int hash_type = SH_TIGER192;
 
 int sh_tiger_get_hashtype ()
@@ -1585 +1619 @@
 
   if (0 == strcmp(c, _("TIGER192")))
-    hash_type = 0;
+    hash_type = SH_TIGER192;
 #ifdef USE_SHA1
   else if (0 == strcmp(c, _("SHA1")))    
-    hash_type = 1;
+    hash_type = SH_SHA1;
 #endif
 #ifdef USE_MD5
   else if (0 == strcmp(c, _("MD5")))    
-    hash_type = 2;
+    hash_type = SH_MD5;
+#endif
+#ifdef USE_SHA1
+  else if (0 == strcmp(c, _("SHA256")))    
+    hash_type = SH_SHA256;
 #endif
   else
@@ -1618 +1656 @@
 {
 #ifdef USE_SHA1
-  if (hash_type == 1)
+  if (hash_type == SH_SHA1)
     return sh_tiger_sha1_hash    (filename, what, Length, timeout, out, len);
 #endif
 #ifdef USE_MD5
-  if (hash_type == 2)
+  if (hash_type == SH_MD5)
     return sh_tiger_md5_hash     (filename, what, Length, timeout, out, len);
+#endif
+#ifdef USE_SHA1
+  if (hash_type == SH_SHA256)
+    return sh_tiger_sha256_hash  (filename, what, Length, timeout, out, len);
 #endif
   return sh_tiger_hash_internal  (filename, what, Length, timeout, out, len);