Merge pull request adegtyarev#5 from KirillSmirnov/master

Fix overflow check in add512(). Improve compatibility.
Molocher · Nov 30, 2017 · 8a4e74f · 8a4e74f
2 parents e8b8020 + f0754e9
commit 8a4e74f
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/auto/header/endianness b/auto/header/endianness
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-end-autotest-XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-end-autotest-XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/auto/header/mmx b/auto/header/mmx
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-autotest.XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-autotest.XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/auto/header/sse2 b/auto/header/sse2
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-autotest.XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-autotest.XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/auto/header/sse41 b/auto/header/sse41
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-autotest.XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-autotest.XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/auto/mk/mmx b/auto/mk/mmx
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-autotest.XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-autotest.XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/auto/mk/sse2 b/auto/mk/sse2
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-autotest.XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-autotest.XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/auto/mk/sse41 b/auto/mk/sse41
@@ -7,7 +7,7 @@
 #
 # $Id$
 
-TMPFILE=`mktemp -t gost3411-autotest.XXX` || exit 1
+TMPFILE=`mktemp -t gost3411-autotest.XXXXXX` || exit 1
 trap "rm -f ${TMPFILE} ${TMPFILE}.c 2>/dev/null" INT TERM EXIT
 
 cat <<EOF > ${TMPFILE}.c

diff --git a/gost3411-2012-core.c b/gost3411-2012-core.c
@@ -59,20 +59,22 @@ add512(const union uint512_u *x, const union uint512_u *y, union uint512_u *r)
 {
 #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]) )
+        tmp = x->QWORD[i] + y->QWORD[i];
+        if ( (tmp < y->QWORD[i]) ||
+             (tmp < x->QWORD[i]) )
             OF = 1;
         else
             OF = 0;
 
-        r->QWORD[i] += CF;
+        tmp += CF;
         CF = OF;
+        r->QWORD[i] = tmp;
     }
 #else
     const unsigned char *xp, *yp;