gosthash2012: Remove redundant `hash' field from `struct gost2012_hash_ctx'

And save 64 bytes.

Committed-by: Vitaly Chikunov <vt@altlinux.org>

diff --git a/gosthash2012.c b/gosthash2012.c
index bbe7dcbf83d1cb8932bf24d34b10c5f9540e04dd..dce3e9b38e464111d534aa5c8b0d7c0a1d69d98a 100644 (file)
--- a/gosthash2012.c
+++ b/gosthash2012.c
@@ -192,7 +192,6 @@ static INLINE void stage3(gost2012_hash_ctx * CTX)
     g(&(CTX->h), &buffer0, (const unsigned char *)&(CTX->N));
 
     g(&(CTX->h), &buffer0, (const unsigned char *)&(CTX->Sigma));
-    memcpy(&(CTX->hash), &(CTX->h), sizeof(uint512_u));
 }
 
 /*
@@ -242,7 +241,7 @@ void gost2012_finish_hash(gost2012_hash_ctx * CTX, unsigned char *digest)
     CTX->bufsize = 0;
 
     if (CTX->digest_size == 256)
-        memcpy(digest, &(CTX->hash.QWORD[4]), 32);
+        memcpy(digest, &(CTX->h.QWORD[4]), 32);
     else
-        memcpy(digest, &(CTX->hash.QWORD[0]), 64);
+        memcpy(digest, &(CTX->h.QWORD[0]), 64);
 }

diff --git a/gosthash2012.h b/gosthash2012.h
index 0556a5330a83996a3fc54c4a07915647c891470f..fa45c30903cf65d31f489c24b45cd81243c077d2 100644 (file)
--- a/gosthash2012.h
+++ b/gosthash2012.h
@@ -50,7 +50,6 @@ typedef union uint512_u {
 /* GOST R 34.11-2012 hash context */
 typedef struct gost2012_hash_ctx {
     unsigned char buffer[64];
-    union uint512_u hash;
     union uint512_u h;
     union uint512_u N;
     union uint512_u Sigma;