From 399a1546de71f41598c15edada28e7f0d616f541 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Fri, 16 Sep 2016 11:27:15 -0400 Subject: Add CRYPTOPP_ASSERT (Issue 277, CVE-2016-7420) trap.h and CRYPTOPP_ASSERT has existed for over a year in Master. We deferred on the cut-over waiting for a minor version bump (5.7). We have to use it now due to CVE-2016-7420 --- tea.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tea.cpp') diff --git a/tea.cpp b/tea.cpp index dba159f6..3c0daa4c 100644 --- a/tea.cpp +++ b/tea.cpp @@ -106,8 +106,8 @@ void XTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const { CRYPTOPP_UNUSED(xorBlock); - assert(IsAlignedOn(inBlock,GetAlignmentOf())); - assert(IsAlignedOn(outBlock,GetAlignmentOf())); + CRYPTOPP_ASSERT(IsAlignedOn(inBlock,GetAlignmentOf())); + CRYPTOPP_ASSERT(IsAlignedOn(outBlock,GetAlignmentOf())); unsigned int n = m_blockSize / 4; word32 *v = (word32*)(void *)outBlock; @@ -136,8 +136,8 @@ void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by void BTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const { CRYPTOPP_UNUSED(xorBlock); - assert(IsAlignedOn(inBlock,GetAlignmentOf())); - assert(IsAlignedOn(outBlock,GetAlignmentOf())); + CRYPTOPP_ASSERT(IsAlignedOn(inBlock,GetAlignmentOf())); + CRYPTOPP_ASSERT(IsAlignedOn(outBlock,GetAlignmentOf())); unsigned int n = m_blockSize / 4; word32 *v = (word32*)(void *)outBlock; -- cgit v1.2.1