blake2: silence two more warnings on platforms with size_t < uint64_t. Don't use SSE2 when cross-compiling

tiran · tiran · commit dfb9ef13575b · 2016-09-07T11:39:21.000+02:00
diff --git a/Modules/_blake2/impl/blake2b-ref.c b/Modules/_blake2/impl/blake2b-ref.c
@@ -307,8 +307,8 @@ int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
     }
     else /* inlen <= fill */
     {
-      memcpy( S->buf + left, in, inlen );
-      S->buflen += inlen; /* Be lazy, do not compress */
+      memcpy( S->buf + left, in, (size_t)inlen );
+      S->buflen += (size_t)inlen; /* Be lazy, do not compress */
       in += inlen;
       inlen -= inlen;
     }
diff --git a/Modules/_blake2/impl/blake2s-ref.c b/Modules/_blake2/impl/blake2s-ref.c
@@ -298,8 +298,8 @@ int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen )
     }
     else /* inlen <= fill */
     {
-      memcpy( S->buf + left, in, inlen );
-      S->buflen += inlen; /* Be lazy, do not compress */
+      memcpy( S->buf + left, in, (size_t)inlen );
+      S->buflen += (size_t)inlen; /* Be lazy, do not compress */
       in += inlen;
       inlen -= inlen;
     }
diff --git a/setup.py b/setup.py
@@ -894,7 +894,7 @@ def detect_modules(self):
         blake2_deps.append('hashlib.h')
 
         blake2_macros = []
-        if os.uname().machine == "x86_64":
+        if not cross_compiling and os.uname().machine == "x86_64":
             # Every x86_64 machine has at least SSE2.
             blake2_macros.append(('BLAKE2_USE_SSE', '1'))
 

Original file line number	Diff line number	Diff line change
`@@ -307,8 +307,8 @@ int blake2b_update( blake2b_state S, const uint8_t in, uint64_t inlen )`
`307`	`307`	`}`
`308`	`308`	`else /* inlen <= fill */`
`309`	`309`	`{`
`310`		`- memcpy( S->buf + left, in, inlen );`
`311`		`- S->buflen += inlen; /* Be lazy, do not compress */`
	`310`	`+ memcpy( S->buf + left, in, (size_t)inlen );`
	`311`	`+ S->buflen += (size_t)inlen; /* Be lazy, do not compress */`
`312`	`312`	`in += inlen;`
`313`	`313`	`inlen -= inlen;`
`314`	`314`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,8 +298,8 @@ int blake2s_update( blake2s_state S, const uint8_t in, uint64_t inlen )`
`298`	`298`	`}`
`299`	`299`	`else /* inlen <= fill */`
`300`	`300`	`{`
`301`		`- memcpy( S->buf + left, in, inlen );`
`302`		`- S->buflen += inlen; /* Be lazy, do not compress */`
	`301`	`+ memcpy( S->buf + left, in, (size_t)inlen );`
	`302`	`+ S->buflen += (size_t)inlen; /* Be lazy, do not compress */`
`303`	`303`	`in += inlen;`
`304`	`304`	`inlen -= inlen;`
`305`	`305`	`}`