changes for 5.6:

    - added AuthenticatedSymmetricCipher interface class and Filter wrappers
    - added CCM, GCM (with SSE2 assembly), CMAC, and SEED
    - improved AES speed on x86 and x64
    - removed WORD64_AVAILABLE; compiler 64-bit int support is now required

1 files changed, 4 insertions, 5 deletions

diff --git a/cbcmac.cpp b/cbcmac.cpp
index dfac071b..6b0e8858 100644
--- a/cbcmac.cpp
+++ b/cbcmac.cpp
@@ -25,12 +25,11 @@ void CBC_MAC_Base::Update(const byte *input, size_t length)
 		length--;
 	}
 
-	while (length >= blockSize)
+	if (length >= blockSize)
 	{
-		xorbuf(m_reg, input, blockSize);
-		ProcessBuf();
-		input += blockSize;
-		length -= blockSize;
+		size_t leftOver = AccessCipher().AdvancedProcessBlocks(m_reg, input, m_reg, length, BlockTransformation::BT_DontIncrementInOutPointers|BlockTransformation::BT_XorInput);
+		input += (length - leftOver);
+		length = leftOver;
 	}
 
 	while (length--)