Changeset 1330:112784adfac8

Timestamp:

09/03/09 20:48:06 (2 years ago)

Author:

niam

Branch:

default

Message:

{issue #68[fixed]} fixed SHA for x86_64

Location:

trunk

Files:

• include/libdodo/toolsCode.h (modified) (1 diff)
• src/toolsCode.cc (modified) (7 diffs)

trunk/include/libdodo/toolsCode.h

@@ -342 +342 @@
                          */
                         struct __SHA1_256Context__ {
-                                unsigned long      intermediateHash[8];     ///< message digest [5 for SHA-1 and 8 for SHA-251]
+                                unsigned int      intermediateHash[8];     ///< message digest [5 for SHA-1 and 8 for SHA-251]
 
                                 unsigned long long length;                  ///< message length in bits

trunk/src/toolsCode.cc

@@ -1351 +1351 @@
 
 //-------------------------------------------------------------------
+#include <iostream>
+using namespace std;
 
 void
@@ -1358 +1360 @@
         context->messageBlockIndex = 0;
 
-                /* Initial Hash Values: FIPS-180-2 section 5.3.1 */
+        /* Initial Hash Values: FIPS-180-2 section 5.3.1 */
         context->intermediateHash[0] = 0x67452301;
         context->intermediateHash[1] = 0xEFCDAB89;
@@ -1412 +1414 @@
 
                 SHA1ProcessMessageBlock(context);
-        } else
+        } else {
                 context->messageBlock[context->messageBlockIndex++] = padByte;
+        }
 
         while (context->messageBlockIndex < 56)
@@ -1435 +1438 @@
 code::SHA1ProcessMessageBlock(__SHA1_256Context__ *context)
 {
-                /* Constants defined in FIPS-180-2, section 4.2.1 */
+        /* Constants defined in FIPS-180-2, section 4.2.1 */
         const static unsigned long K[4] = {
                 0x5A827999, 0x6ED9EBA1, 0x8F1BBCDC, 0xCA62C1D6
@@ -1441 +1444 @@
 
         int t;
-        unsigned long temp;
-        unsigned long W[80];
-        unsigned long A, B, C, D, E;
+        unsigned int temp;
+        unsigned int W[80];
+        unsigned int A, B, C, D, E;
 
         for (t = 0; t < 16; ++t) {
-                W[t]  = (unsigned long)context->messageBlock[t * 4] << 24;
-                W[t] |= (unsigned long)context->messageBlock[t * 4 + 1] << 16;
-                W[t] |= (unsigned long)context->messageBlock[t * 4 + 2] << 8;
-                W[t] |= (unsigned long)context->messageBlock[t * 4 + 3];
+                W[t]  = (unsigned int)context->messageBlock[t * 4] << 24;
+                W[t] |= (unsigned int)context->messageBlock[t * 4 + 1] << 16;
+                W[t] |= (unsigned int)context->messageBlock[t * 4 + 2] << 8;
+                W[t] |= (unsigned int)context->messageBlock[t * 4 + 3];
         }
 
@@ -1636 +1639 @@
 
         int t, t4;
-        unsigned long temp1, temp2;
-        unsigned long W[64];
-        unsigned long A, B, C, D, E, F, G, H;
+        unsigned int temp1, temp2;
+        unsigned int W[64];
+        unsigned int A, B, C, D, E, F, G, H;
 
         /*
@@ -1644 +1647 @@
          */
         for (t = t4 = 0; t < 16; t++, t4 += 4) {
-                W[t] = ((unsigned long)context->messageBlock[t4] << 24) |
-                           ((unsigned long)context->messageBlock[t4 + 1] << 16) |
-                           ((unsigned long)context->messageBlock[t4 + 2] << 8) |
-                           ((unsigned long)context->messageBlock[t4 + 3]);
+                W[t] = ((unsigned int)context->messageBlock[t4] << 24) |
+                           ((unsigned int)context->messageBlock[t4 + 1] << 16) |
+                           ((unsigned int)context->messageBlock[t4 + 2] << 8) |
+                           ((unsigned int)context->messageBlock[t4 + 3]);
         }