summaryrefslogtreecommitdiff
path: root/vmac.h
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2019-07-05 03:38:03 -0400
committerJeffrey Walton <noloader@gmail.com>2019-07-05 03:38:03 -0400
commitf7986129dfe3203ad8d754a213c977452cacf709 (patch)
tree165a52c87676c557f0d6b05644279b2546c8619c /vmac.h
parent6bead34bd9fc875c155aecc8ec25cdccd6d9ce56 (diff)
downloadcryptopp-git-f7986129dfe3203ad8d754a213c977452cacf709.tar.gz
Clear Asan finding in VMAC under 32-bit inline ASM (GH #860)
This one has been nagging us for a while. Tested OK under i686 and x86_64.
Diffstat (limited to 'vmac.h')
-rw-r--r--vmac.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/vmac.h b/vmac.h
index e229abc2..23ffef78 100644
--- a/vmac.h
+++ b/vmac.h
@@ -52,10 +52,10 @@ protected:
void VHASH_Update_Template(const word64 *data, size_t blockRemainingInWord128);
void VHASH_Update(const word64 *data, size_t blocksRemainingInWord128);
- CRYPTOPP_BLOCK_1(polyState, word64, 4*(m_is128+1))
+ CRYPTOPP_BLOCK_1(polyState, word64, (m_is128 ? 8 : 4))
CRYPTOPP_BLOCK_2(nhKey, word64, m_L1KeyLength/sizeof(word64) + 2*m_is128)
CRYPTOPP_BLOCK_3(data, byte, m_L1KeyLength)
- CRYPTOPP_BLOCK_4(l3Key, word64, 2*(m_is128+1))
+ CRYPTOPP_BLOCK_4(l3Key, word64, (m_is128 ? 4 : 2))
CRYPTOPP_BLOCK_5(nonce, byte, IVSize())
CRYPTOPP_BLOCK_6(pad, byte, IVSize())
CRYPTOPP_BLOCKS_END(6)