From e576f52929756beb785f29aa14b6393d7ac6c298 Mon Sep 17 00:00:00 2001 From: Vitaly Chikunov Date: Wed, 10 Apr 2019 18:09:54 +0000 Subject: [PATCH] Fix Streebog alignment problem Some architectures in some circumstances do not allow unaligned memory access (such as ARM, MIPS) triggering SIGBUS. This patch very crudely fixes this issue. The issue is found and original fix is proposed by Eric Biggers: https://patchwork.kernel.org/patch/10878865/ --- gosthash2012.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gosthash2012.c b/gosthash2012.c index ee534c2..bbe7dcb 100644 --- a/gosthash2012.c +++ b/gosthash2012.c @@ -157,10 +157,13 @@ static void g(union uint512_u *h, const union uint512_u *N, 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) -- 2.39.2