Skip to content

Commit

Permalink
Revert Asan finding in VMAC change (GH #860)
Browse files Browse the repository at this point in the history
cryptest.sh showed it broke at -O3
  • Loading branch information
noloader committed Jul 5, 2019
1 parent f798612 commit 7fd751e
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions vmac.cpp
Expand Up @@ -194,11 +194,12 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64,
CRYPTOPP_UNUSED(blocksRemainingInWord64);

#ifdef __GNUC__

word32 temp;
__asm__ __volatile__
(
AS1( push %%ebx)
AS2( mov %0, %%ebx)
AS2( mov %%ebx, %0)
// AS1( push %%ebx)
AS2( mov %1, %%ebx)
INTEL_NOPREFIX
#else
#if defined(__INTEL_COMPILER)
Expand Down Expand Up @@ -417,9 +418,10 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64,
AS_POP_IF86( bp)
AS1( emms)
#ifdef __GNUC__
AS1( pop %%ebx)
ATT_PREFIX
:
// AS1( pop %%ebx)
AS2( mov %0, %%ebx)
: "=m" (temp)
: "m" (L1KeyLength), "c" (blocksRemainingInWord64), "S" (data),
"D" (nhK+tagPart*2), "d" (m_isFirstBlock), "a" (polyS+tagPart*4)
: "memory", "cc"
Expand Down

0 comments on commit 7fd751e

Please sign in to comment.