void init_gost2012_hash_ctx(gost2012_hash_ctx * CTX,
const unsigned int digest_size)
{
- unsigned int i;
-
memset(CTX, 0, sizeof(gost2012_hash_ctx));
CTX->digest_size = digest_size;
{
#ifndef __GOST3411_BIG_ENDIAN__
unsigned int CF, OF;
+ unsigned long long tmp;
unsigned int i;
CF = 0;
- for (i = 0; i < 8; i++) {
- r->QWORD[i] = x->QWORD[i] + y->QWORD[i];
- if (r->QWORD[i] < y->QWORD[i] || r->QWORD[i] < x->QWORD[i])
+ for (i = 0; i < 8; i++)
+ {
+ /* Detecting integer overflow condition for three numbers
+ * in a portable way is tricky a little. */
+
+ /* Step 1: numbers cause overflow */
+ tmp = x->QWORD[i] + y->QWORD[i];
+
+ /* Compare with any of two summands, no need to check both */
+ if (tmp < x->QWORD[i])
OF = 1;
else
OF = 0;
- r->QWORD[i] += CF;
+ /* Step 2: carry bit causes overflow */
+ tmp += CF;
+
+ if (CF > 0 && tmp == 0)
+ OF = 1;
+
CF = OF;
+
+ r->QWORD[i] = tmp;
}
#else
const unsigned char *xp, *yp;
static INLINE void stage2(gost2012_hash_ctx * CTX, const unsigned char *data)
{
- g(&(CTX->h), &(CTX->N), data);
+ union uint512_u m;
+
+ memcpy(&m, data, sizeof(m));
+ g(&(CTX->h), &(CTX->N), (const unsigned char *)&m);
add512(&(CTX->N), &buffer512, &(CTX->N));
- add512(&(CTX->Sigma), (const union uint512_u *)data, &(CTX->Sigma));
+ add512(&(CTX->Sigma), &m, &(CTX->Sigma));
}
static INLINE void stage3(gost2012_hash_ctx * CTX)