Fix redefinition error

sxagiro · May 24, 2014 · afc2d00 · afc2d00
1 parent adce8dc
commit afc2d00
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/crypto/c_groestl.c b/crypto/c_groestl.c
@@ -160,7 +160,7 @@ static void F512(uint32_t *h, const uint32_t *m) {
 
 
 /* digest up to msglen bytes of input (full blocks only) */
-static void Transform(hashState *ctx, 
+static void Transform(groestlHashState *ctx,
 	       const uint8_t *input, 
 	       int msglen) {
 
@@ -176,7 +176,7 @@ static void Transform(hashState *ctx,
 }
 
 /* given state h, do h <- P(h)+h */
-static void OutputTransformation(hashState *ctx) {
+static void OutputTransformation(groestlHashState *ctx) {
   int j;
   uint32_t temp[2*COLS512];
   uint32_t y[2*COLS512];
@@ -203,7 +203,7 @@ static void OutputTransformation(hashState *ctx) {
 }
 
 /* initialise context */
-static void Init(hashState* ctx) {
+static void Init(groestlHashState* ctx) {
   int i = 0;
   /* allocate memory for state and data buffer */
 
@@ -223,7 +223,7 @@ static void Init(hashState* ctx) {
 }
 
 /* update state with databitlen bits of input */
-static void Update(hashState* ctx,
+static void Update(groestlHashState* ctx,
 		  const BitSequence* input,
 		  DataLength databitlen) {
   int index = 0;
@@ -272,7 +272,7 @@ static void Update(hashState* ctx,
 
 /* finalise: process remaining data (including padding), perform
    output transformation, and write hash result to 'output' */
-static void Final(hashState* ctx,
+static void Final(groestlHashState* ctx,
 		 BitSequence* output) {
   int i, j = 0, hashbytelen = HASH_BIT_LEN/8;
   uint8_t *s = (BitSequence*)ctx->chaining;
@@ -336,7 +336,7 @@ void groestl(const BitSequence* data,
 		DataLength databitlen,
 		BitSequence* hashval) {
 
-  hashState context;
+  groestlHashState context;
 
   /* initialise */
     Init(&context);

diff --git a/crypto/c_groestl.h b/crypto/c_groestl.h
@@ -12,6 +12,8 @@ typedef crypto_uint64 uint64_t;
 */
 #include <stdint.h>
 
+#include "hash.h"
+
 /* some sizes (number of bytes) */
 #define ROWS 8
 #define LENGTHFIELDLEN ROWS
@@ -33,8 +35,6 @@ typedef crypto_uint64 uint64_t;
 
 
 /* NIST API begin */
-typedef unsigned char BitSequence;
-typedef unsigned long long DataLength;
 typedef struct {
   uint32_t chaining[SIZE512/sizeof(uint32_t)];            /* actual state */
   uint32_t block_counter1,
@@ -43,7 +43,7 @@ typedef struct {
   int buf_ptr;              /* data buffer pointer */
   int bits_in_last_byte;    /* no. of message bits in last byte of
 			       data buffer */
-} hashState;
+} groestlHashState;
 
 /*void Init(hashState*);
 void Update(hashState*, const BitSequence*, DataLength);

diff --git a/crypto/c_jh.h b/crypto/c_jh.h
@@ -14,8 +14,6 @@
 */
 #pragma once
 
-typedef unsigned char BitSequence;
-typedef unsigned long long DataLength;
-typedef enum {SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2} HashReturn;
+#include "hash.h"
 
 HashReturn jh_hash(int hashbitlen, const BitSequence *data, DataLength databitlen, BitSequence *hashval);
diff --git a/crypto/hash.h b/crypto/hash.h
@@ -0,0 +1,5 @@
+#pragma once
+
+typedef unsigned char BitSequence;
+typedef unsigned long long DataLength;
+typedef enum {SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2} HashReturn;