arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleared compile error masked behind ASSERT

reviewable/pr7/r1
Jeffrey Walton 2015-07-14 01:25:59 -04:00
parent 828c550389
commit 866fbeb8e4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
misc.cpp
View File

@ -25,8 +25,8 @@ void xorbuf(byte *buf, const byte *mask, size_t count)
{ {
if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask)) if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask))
{ {
assert(IsAlignedOn(input, GetStrictAlignedOn<word64>(buf))); assert(IsAlignedOn(buf, GetStrictAlignmentOf<word64>()));
assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask))); assert(IsAlignedOn(mask, GetStrictAlignmentOf<word64>()));
for (i=0; i<count/8; i++) for (i=0; i<count/8; i++)
((word64*)buf)[i] ^= ((word64*)mask)[i]; ((word64*)buf)[i] ^= ((word64*)mask)[i];
@ -58,9 +58,9 @@ void xorbuf(byte *output, const byte *input, const byte *mask, size_t count)
{ {
if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(output) && IsStrictAligned<word64>(input) && IsStrictAligned<word64>(mask)) if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(output) && IsStrictAligned<word64>(input) && IsStrictAligned<word64>(mask))
{ {
assert(IsAlignedOn(output, GetStrictAlignedOn<word64>(output))); assert(IsAlignedOn(output, GetStrictAlignmentOf<word64>()));
assert(IsAlignedOn(input, GetStrictAlignedOn<word64>(input))); assert(IsAlignedOn(input, GetStrictAlignmentOf<word64>()));
assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask))); assert(IsAlignedOn(mask, GetStrictAlignmentOf<word64>()));
for (i=0; i<count/8; i++) for (i=0; i<count/8; i++)
((word64*)output)[i] = ((word64*)input)[i] ^ ((word64*)mask)[i]; ((word64*)output)[i] = ((word64*)input)[i] ^ ((word64*)mask)[i];
@ -96,8 +96,8 @@ bool VerifyBufsEqual(const byte *buf, const byte *mask, size_t count)
word32 acc32 = 0; word32 acc32 = 0;
if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask)) if (!CRYPTOPP_BOOL_SLOW_WORD64 && IsStrictAligned<word64>(buf) && IsStrictAligned<word64>(mask))
{ {
assert(IsAlignedOn(buf, GetStrictAlignedOn<word64>(buf))); assert(IsAlignedOn(buf, GetStrictAlignmentOf<word64>()));
assert(IsAlignedOn(mask, GetStrictAlignedOn<word64>(mask))); assert(IsAlignedOn(mask, GetStrictAlignmentOf<word64>()));
word64 acc64 = 0; word64 acc64 = 0;
for (i=0; i<count/8; i++) for (i=0; i<count/8; i++)