mirror of
https://github.com/shadps4-emu/ext-cryptopp.git
synced 2024-11-27 03:40:22 +00:00
Revert Asan finding in VMAC change (GH #860)
cryptest.sh showed it broke at -O3
This commit is contained in:
parent
f7986129df
commit
7fd751ed36
12
vmac.cpp
12
vmac.cpp
@ -194,11 +194,12 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64,
|
|||||||
CRYPTOPP_UNUSED(blocksRemainingInWord64);
|
CRYPTOPP_UNUSED(blocksRemainingInWord64);
|
||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
|
word32 temp;
|
||||||
__asm__ __volatile__
|
__asm__ __volatile__
|
||||||
(
|
(
|
||||||
AS1( push %%ebx)
|
AS2( mov %%ebx, %0)
|
||||||
AS2( mov %0, %%ebx)
|
// AS1( push %%ebx)
|
||||||
|
AS2( mov %1, %%ebx)
|
||||||
INTEL_NOPREFIX
|
INTEL_NOPREFIX
|
||||||
#else
|
#else
|
||||||
#if defined(__INTEL_COMPILER)
|
#if defined(__INTEL_COMPILER)
|
||||||
@ -417,9 +418,10 @@ VMAC_Base::VHASH_Update_SSE2(const word64 *data, size_t blocksRemainingInWord64,
|
|||||||
AS_POP_IF86( bp)
|
AS_POP_IF86( bp)
|
||||||
AS1( emms)
|
AS1( emms)
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
AS1( pop %%ebx)
|
|
||||||
ATT_PREFIX
|
ATT_PREFIX
|
||||||
:
|
// AS1( pop %%ebx)
|
||||||
|
AS2( mov %0, %%ebx)
|
||||||
|
: "=m" (temp)
|
||||||
: "m" (L1KeyLength), "c" (blocksRemainingInWord64), "S" (data),
|
: "m" (L1KeyLength), "c" (blocksRemainingInWord64), "S" (data),
|
||||||
"D" (nhK+tagPart*2), "d" (m_isFirstBlock), "a" (polyS+tagPart*4)
|
"D" (nhK+tagPart*2), "d" (m_isFirstBlock), "a" (polyS+tagPart*4)
|
||||||
: "memory", "cc"
|
: "memory", "cc"
|
||||||
|
Loading…
Reference in New Issue
Block a user