Introduce byte `.B' union type to `union uint512_u'.
Change `CTX.buffer' type from `unsigned char' to `union uint512_u'.
Change `data' argument of `stage2()' to `union uint512_u *'.
Change `g()' arguments to `union uint512_u *' with `RESTRICT'
allowing compiler to optimize more.
No code changes, only type changes here.
Committed-by: Vitaly Chikunov <vt@altlinux.org>
static INLINE void pad(gost2012_hash_ctx * CTX)
{
static INLINE void pad(gost2012_hash_ctx * CTX)
{
- memset(&(CTX->buffer[CTX->bufsize]), 0, sizeof(CTX->buffer) - CTX->bufsize);
- CTX->buffer[CTX->bufsize] = 1;
+ memset(&(CTX->buffer.B[CTX->bufsize]), 0, sizeof(CTX->buffer) - CTX->bufsize);
+ CTX->buffer.B[CTX->bufsize] = 1;
-static void g(union uint512_u *h, const union uint512_u *N,
- const unsigned char *m)
+static void g(union uint512_u *h, const union uint512_u * RESTRICT N,
+ const union uint512_u * RESTRICT m)
{
#ifdef __GOST3411_HAS_SSE2__
__m128i xmm0, xmm2, xmm4, xmm6; /* XMMR0-quadruple */
{
#ifdef __GOST3411_HAS_SSE2__
__m128i xmm0, xmm2, xmm4, xmm6; /* XMMR0-quadruple */
/* E() done */
X((&data), h, (&data));
/* E() done */
X((&data), h, (&data));
- X((&data), ((const union uint512_u *)&m[0]), h);
-static INLINE void stage2(gost2012_hash_ctx * CTX, const unsigned char *data)
+static INLINE void stage2(gost2012_hash_ctx * CTX, const union uint512_u *data)
{
g(&(CTX->h), &(CTX->N), data);
add512(&(CTX->N), &buffer512);
{
g(&(CTX->h), &(CTX->N), data);
add512(&(CTX->N), &buffer512);
- add512(&(CTX->Sigma), (const union uint512_u *)data);
+ add512(&(CTX->Sigma), data);
}
static INLINE void stage3(gost2012_hash_ctx * CTX)
}
static INLINE void stage3(gost2012_hash_ctx * CTX)
- g(&(CTX->h), &(CTX->N), (const unsigned char *)&(CTX->buffer));
+ g(&(CTX->h), &(CTX->N), &(CTX->buffer));
- add512(&(CTX->Sigma), (const union uint512_u *)&CTX->buffer[0]);
+ add512(&(CTX->Sigma), &CTX->buffer);
- g(&(CTX->h), &buffer0, (const unsigned char *)&(CTX->N));
+ g(&(CTX->h), &buffer0, &(CTX->N));
- g(&(CTX->h), &buffer0, (const unsigned char *)&(CTX->Sigma));
+ g(&(CTX->h), &buffer0, &(CTX->Sigma));
size_t chunksize;
while (len > 63 && CTX->bufsize == 0) {
size_t chunksize;
while (len > 63 && CTX->bufsize == 0) {
- memcpy(&CTX->buffer[0], data, 64);
- stage2(CTX, &CTX->buffer[0]);
+ memcpy(CTX->buffer.B, data, 64);
+ stage2(CTX, &(CTX->buffer));
if (chunksize > len)
chunksize = len;
if (chunksize > len)
chunksize = len;
- memcpy(&CTX->buffer[CTX->bufsize], data, chunksize);
+ memcpy(&CTX->buffer.B[CTX->bufsize], data, chunksize);
CTX->bufsize += chunksize;
len -= chunksize;
data += chunksize;
if (CTX->bufsize == 64) {
CTX->bufsize += chunksize;
len -= chunksize;
data += chunksize;
if (CTX->bufsize == 64) {
- stage2(CTX, CTX->buffer);
+ stage2(CTX, &(CTX->buffer));
ALIGN(16)
typedef union uint512_u {
unsigned long long QWORD[8];
ALIGN(16)
typedef union uint512_u {
unsigned long long QWORD[8];
} uint512_u;
#include "gosthash2012_const.h"
} uint512_u;
#include "gosthash2012_const.h"
/* GOST R 34.11-2012 hash context */
typedef struct gost2012_hash_ctx {
/* GOST R 34.11-2012 hash context */
typedef struct gost2012_hash_ctx {
- unsigned char buffer[64];
+ union uint512_u buffer;
union uint512_u h;
union uint512_u N;
union uint512_u Sigma;
union uint512_u h;
union uint512_u N;
union uint512_u Sigma;