Diff: hash/SHA1.cpp

Revision:

10:bc9c23aa3870

Parent:

7:2dbbdfb08123

Child:

13:ac8e23b98dae

--- a/hash/SHA1.cpp	Mon Sep 16 08:35:36 2013 +0000
+++ b/hash/SHA1.cpp	Tue Sep 24 07:19:04 2013 +0000
@@ -5,27 +5,25 @@
 
 #include "SHA1.h"
 #include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
 
 #define F0(B,C,D) ((B & C) | ((~B) & D))
 #define F1(B,C,D) (B ^ C ^ D)
 #define F2(B,C,D) ((B & C) | (B & D) | (C & D))
 #define ROTL(W,N) (((W) << N) | ((W) >> (32-N)))
                         
-static const uint32_t K0 = 0x5A827999;
-static const uint32_t K1 = 0x6ED9EBA1;
-static const uint32_t K2 = 0x8F1BBCDC;
-static const uint32_t K3 = 0xCA62C1D6;
+#define K0 0x5A827999
+#define K1 0x6ED9EBA1
+#define K2 0x8F1BBCDC
+#define K3 0xCA62C1D6
 
 
-static const uint32_t H0 = 0x67452301;
-static const uint32_t H1 = 0xEFCDAB89;
-static const uint32_t H2 = 0x98BADCFE;
-static const uint32_t H3 = 0x10325476;
-static const uint32_t H4 = 0xC3D2E1F0;
+#define H0 0x67452301
+#define H1 0xEFCDAB89
+#define H2 0x98BADCFE
+#define H3 0x10325476
+#define H4 0xC3D2E1F0
 
-static const uint32_t MASK = 0xF;
+#define MASK 0xF
 
 #define W(s) ( w[s] = ROTL(w[((s) + 13) & MASK] ^ w[((s) + 8) & MASK] ^ w[((s) + 2) & MASK] ^ w[s],1))
 
@@ -181,6 +179,7 @@
 {
     uint32_t *buffer2 = (uint32_t*)buffer;
     uint32_t w[16];
+
     for(int t = 0; t < 16; ++t)
         w[t] = __rev(buffer2[t]);