traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Christian Heimes 2016-09-07 11:39:21 +02:00
parent 680cb152c5
commit dfb9ef1357
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/_blake2/impl/blake2b-ref.c
View File

@ -307,8 +307,8 @@ int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
} }
else /* inlen <= fill */ else /* inlen <= fill */
{ {
memcpy( S->buf + left, in, inlen ); memcpy( S->buf + left, in, (size_t)inlen );
S->buflen += inlen; /* Be lazy, do not compress */ S->buflen += (size_t)inlen; /* Be lazy, do not compress */
in += inlen; in += inlen;
inlen -= inlen; inlen -= inlen;
} }

4
Modules/_blake2/impl/blake2s-ref.c
View File

@ -298,8 +298,8 @@ int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen )
} }
else /* inlen <= fill */ else /* inlen <= fill */
{ {
memcpy( S->buf + left, in, inlen ); memcpy( S->buf + left, in, (size_t)inlen );
S->buflen += inlen; /* Be lazy, do not compress */ S->buflen += (size_t)inlen; /* Be lazy, do not compress */
in += inlen; in += inlen;
inlen -= inlen; inlen -= inlen;
} }

2
setup.py
View File

@ -894,7 +894,7 @@ class PyBuildExt(build_ext):
blake2_deps.append('hashlib.h') blake2_deps.append('hashlib.h')
blake2_macros = [] 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. # Every x86_64 machine has at least SSE2.
blake2_macros.append(('BLAKE2_USE_SSE', '1')) blake2_macros.append(('BLAKE2_USE_SSE', '1'))