Groestl hash cleanup

- Remove unused code
- Remove x86 specific optimizations (to test code which closer to ARM on
emulator)
- Fix -Wundef warnings

Makefile

@@ -10,6 +10,7 @@ CFLAGS   += $(OPTFLAGS) \
             -Wimplicit-function-declaration \
             -Wredundant-decls \
             -Wstrict-prototypes \
+            -Wundef \
             -Wpointer-arith \
             -Wformat \
             -Wreturn-type \

groestl.h

@@ -1,4 +1,5 @@
-/* $Id: sph_groestl.h 216 2010-06-08 09:46:57Z tp $ */
+/* Groestl hash from https://github.com/Groestlcoin/vanitygen
+ * Trezor adaptation by Yura Pakhuchiy <pakhuchiy@gmail.com>. */
 /**
  * Groestl interface. This code implements Groestl with the recommended
  * parameters for SHA-3, with outputs of 224, 256, 384 and 512 bits.
@@ -32,71 +33,10 @@
  * @author   Thomas Pornin <thomas.pornin@cryptolog.com>
  */
 
-#ifndef SPH_GROESTL_H__
+#ifndef GROESTL_H__
-#define SPH_GROESTL_H__
+#define GROESTL_H__
 
 #include <stddef.h>
-#include "groestl_internal.h"
-
-/**
- * Output size (in bits) for Groestl-224.
- */
-#define SPH_SIZE_groestl224   224
-
-/**
- * Output size (in bits) for Groestl-256.
- */
-#define SPH_SIZE_groestl256   256
-
-/**
- * Output size (in bits) for Groestl-384.
- */
-#define SPH_SIZE_groestl384   384
-
-/**
- * Output size (in bits) for Groestl-512.
- */
-#define SPH_SIZE_groestl512   512
-
-/**
- * This structure is a context for Groestl-224 and Groestl-256 computations:
- * it contains the intermediate values and some data from the last
- * entered block. Once a Groestl computation has been performed, the
- * context can be reused for another computation.
- *
- * The contents of this structure are private. A running Groestl
- * computation can be cloned by copying the context (e.g. with a simple
- * <code>memcpy()</code>).
- */
-typedef struct {
-#ifndef DOXYGEN_IGNORE
-	unsigned char buf[64];    /* first field, for alignment */
-	size_t ptr;
-	union {
-#if SPH_64
-		sph_u64 wide[8];
-#endif
-		sph_u32 narrow[16];
-	} state;
-#if SPH_64
-	sph_u64 count;
-#else
-	sph_u32 count_high, count_low;
-#endif
-#endif
-} sph_groestl_small_context;
-
-/**
- * This structure is a context for Groestl-224 computations. It is
- * identical to the common <code>sph_groestl_small_context</code>.
- */
-typedef sph_groestl_small_context sph_groestl224_context;
-
-/**
- * This structure is a context for Groestl-256 computations. It is
- * identical to the common <code>sph_groestl_small_context</code>.
- */
-typedef sph_groestl_small_context sph_groestl256_context;
 
 /**
  * This structure is a context for Groestl-384 and Groestl-512 computations:
@@ -109,170 +49,17 @@ typedef sph_groestl_small_context sph_groestl256_context;
  * <code>memcpy()</code>).
  */
 typedef struct {
-#ifndef DOXYGEN_IGNORE
 	unsigned char buf[128];    /* first field, for alignment */
 	size_t ptr;
 	union {
-#if SPH_64
+		uint64_t wide[16];
-		sph_u64 wide[16];
+		uint32_t narrow[32];
-#endif
-		sph_u32 narrow[32];
 	} state;
-#if SPH_64
+	uint64_t count;
-	sph_u64 count;
-#else
-	sph_u32 count_high, count_low;
-#endif
-#endif
 } sph_groestl_big_context;
 
-/**
- * This structure is a context for Groestl-384 computations. It is
- * identical to the common <code>sph_groestl_small_context</code>.
- */
-typedef sph_groestl_big_context sph_groestl384_context;
-
-/**
- * This structure is a context for Groestl-512 computations. It is
- * identical to the common <code>sph_groestl_small_context</code>.
- */
 typedef sph_groestl_big_context GROESTL512_CTX;
 
-/**
- * Initialize a Groestl-224 context. This process performs no memory allocation.
- *
- * @param cc   the Groestl-224 context (pointer to a
- *             <code>sph_groestl224_context</code>)
- */
-void sph_groestl224_init(void *cc);
-
-/**
- * Process some data bytes. It is acceptable that <code>len</code> is zero
- * (in which case this function does nothing).
- *
- * @param cc     the Groestl-224 context
- * @param data   the input data
- * @param len    the input data length (in bytes)
- */
-void sph_groestl224(void *cc, const void *data, size_t len);
-
-/**
- * Terminate the current Groestl-224 computation and output the result into
- * the provided buffer. The destination buffer must be wide enough to
- * accomodate the result (28 bytes). The context is automatically
- * reinitialized.
- *
- * @param cc    the Groestl-224 context
- * @param dst   the destination buffer
- */
-void sph_groestl224_close(void *cc, void *dst);
-
-/**
- * Add a few additional bits (0 to 7) to the current computation, then
- * terminate it and output the result in the provided buffer, which must
- * be wide enough to accomodate the result (28 bytes). If bit number i
- * in <code>ub</code> has value 2^i, then the extra bits are those
- * numbered 7 downto 8-n (this is the big-endian convention at the byte
- * level). The context is automatically reinitialized.
- *
- * @param cc    the Groestl-224 context
- * @param ub    the extra bits
- * @param n     the number of extra bits (0 to 7)
- * @param dst   the destination buffer
- */
-void sph_groestl224_addbits_and_close(
-	void *cc, unsigned ub, unsigned n, void *dst);
-
-/**
- * Initialize a Groestl-256 context. This process performs no memory allocation.
- *
- * @param cc   the Groestl-256 context (pointer to a
- *             <code>sph_groestl256_context</code>)
- */
-void sph_groestl256_init(void *cc);
-
-/**
- * Process some data bytes. It is acceptable that <code>len</code> is zero
- * (in which case this function does nothing).
- *
- * @param cc     the Groestl-256 context
- * @param data   the input data
- * @param len    the input data length (in bytes)
- */
-void sph_groestl256(void *cc, const void *data, size_t len);
-
-/**
- * Terminate the current Groestl-256 computation and output the result into
- * the provided buffer. The destination buffer must be wide enough to
- * accomodate the result (32 bytes). The context is automatically
- * reinitialized.
- *
- * @param cc    the Groestl-256 context
- * @param dst   the destination buffer
- */
-void sph_groestl256_close(void *cc, void *dst);
-
-/**
- * Add a few additional bits (0 to 7) to the current computation, then
- * terminate it and output the result in the provided buffer, which must
- * be wide enough to accomodate the result (32 bytes). If bit number i
- * in <code>ub</code> has value 2^i, then the extra bits are those
- * numbered 7 downto 8-n (this is the big-endian convention at the byte
- * level). The context is automatically reinitialized.
- *
- * @param cc    the Groestl-256 context
- * @param ub    the extra bits
- * @param n     the number of extra bits (0 to 7)
- * @param dst   the destination buffer
- */
-void sph_groestl256_addbits_and_close(
-	void *cc, unsigned ub, unsigned n, void *dst);
-
-/**
- * Initialize a Groestl-384 context. This process performs no memory allocation.
- *
- * @param cc   the Groestl-384 context (pointer to a
- *             <code>sph_groestl384_context</code>)
- */
-void sph_groestl384_init(void *cc);
-
-/**
- * Process some data bytes. It is acceptable that <code>len</code> is zero
- * (in which case this function does nothing).
- *
- * @param cc     the Groestl-384 context
- * @param data   the input data
- * @param len    the input data length (in bytes)
- */
-void sph_groestl384(void *cc, const void *data, size_t len);
-
-/**
- * Terminate the current Groestl-384 computation and output the result into
- * the provided buffer. The destination buffer must be wide enough to
- * accomodate the result (48 bytes). The context is automatically
- * reinitialized.
- *
- * @param cc    the Groestl-384 context
- * @param dst   the destination buffer
- */
-void sph_groestl384_close(void *cc, void *dst);
-
-/**
- * Add a few additional bits (0 to 7) to the current computation, then
- * terminate it and output the result in the provided buffer, which must
- * be wide enough to accomodate the result (48 bytes). If bit number i
- * in <code>ub</code> has value 2^i, then the extra bits are those
- * numbered 7 downto 8-n (this is the big-endian convention at the byte
- * level). The context is automatically reinitialized.
- *
- * @param cc    the Groestl-384 context
- * @param ub    the extra bits
- * @param n     the number of extra bits (0 to 7)
- * @param dst   the destination buffer
- */
-void sph_groestl384_addbits_and_close(
-	void *cc, unsigned ub, unsigned n, void *dst);
-
 /**
  * Initialize a Groestl-512 context. This process performs no memory allocation.
  *