Changeset 481 for trunk/src/sh_tiger1_64.c

Timestamp:

Jul 18, 2015, 5:06:52 PM (10 years ago)

Author:

katerina

Message:

Enhancements and fixes for tickets #374, #375, #376, #377, #378, and #379.

File:

• trunk/src/sh_tiger1_64.c (modified) (7 diffs)

trunk/src/sh_tiger1_64.c

@@ -384 +384 @@
 void tiger_compress(const word64 *str, word64 state[3])
 {
-  tiger_compress_macro(((word64*)str), ((word64*)state));
+  tiger_compress_macro(((const word64*)str), ((word64*)state));
 }
 
@@ -419 +419 @@
   register word64 i;
   register word64 j = 0;
-  unsigned char temp[64];
+  union {
+    word64 w64_temp[8];
+    unsigned char temp[64];
+  } dd;
   union {
     word64 itmp;
@@ -435 +438 @@
 #ifdef BIG_ENDIAN
       for(j=0; j<64; j++)
-        temp[j^7] = ((sh_byte*)str)[j];
-      tiger_compress(((word64*)temp), res);
+        dd.temp[j^7] = ((sh_byte*)str)[j];
+      tiger_compress((dd.w64_temp), res);
 #else
       tiger_compress(str, res);
@@ -445 +448 @@
 #ifdef BIG_ENDIAN
   for(j=0; j<i; j++)
-    temp[j^7] = ((sh_byte*)str)[j];
-
-  temp[j^7] = 0x01;
+    dd.temp[j^7] = ((sh_byte*)str)[j];
+
+  dd.temp[j^7] = 0x01;
   j++;
   for(; j&7; j++)
-    temp[j^7] = 0;
+    dd.temp[j^7] = 0;
 #else
 
 #ifndef USE_MEMSET
   for(j=0; j<i; j++)
-    temp[j] = ((sh_byte*)str)[j];
-#else
-  memcpy( temp, str, j=i );
-#endif
-  temp[j++] = 0x01;
+    dd.temp[j] = ((const sh_byte*)str)[j];
+#else
+  memcpy( dd.temp, str, j=i );
+#endif
+  dd.temp[j++] = 0x01;
   for(; j&7; j++)
-        temp[j] = 0;
+        dd.temp[j] = 0;
 
 #endif
@@ -469 +472 @@
 #ifndef USE_MEMSET
       for(; j<64; j++)
-        temp[j] = 0;
-#else
-      memset( temp+j, 0, 64-j);
-#endif
-      tiger_compress(((word64*)temp), res);
+        dd.temp[j] = 0;
+#else
+      memset( (dd.temp)+j, 0, 64-j);
+#endif
+      tiger_compress((dd.w64_temp), res);
       j=0;
     }
@@ -479 +482 @@
 #ifndef USE_MEMSET
   for(; j<56; j++)
-    temp[j] = 0;
-#else
-  memset( temp+j, 0, 56-j);
+    dd.temp[j] = 0;
+#else
+  memset( (dd.temp)+j, 0, 56-j);
 #endif
 
@@ -488 +491 @@
   uu.itmp = ((word64)length)<<3;
   for (j=0; j<8; j++)
-        temp[56+j] = uu.ctmp[j];
-
-  tiger_compress(((word64*)temp), res);
+        dd.temp[56+j] = uu.ctmp[j];
+
+  tiger_compress((dd.w64_temp), res);
 }