From d9384064106440d03f2e05b1475135d5722e0f7c Mon Sep 17 00:00:00 2001 From: weidai Date: Thu, 5 Aug 2010 09:48:04 +0000 Subject: fix CTR mode not allowing NULL as IV --- modes.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'modes.cpp') diff --git a/modes.cpp b/modes.cpp index 789fafb2..46332284 100644 --- a/modes.cpp +++ b/modes.cpp @@ -56,7 +56,8 @@ void CFB_ModePolicy::TransformRegister() void CFB_ModePolicy::CipherResynchronize(const byte *iv, size_t length) { - memcpy_s(m_register, m_register.size(), iv, BlockSize()); + assert(length == BlockSize()); + CopyOrZero(m_register, iv, length); TransformRegister(); } @@ -85,6 +86,7 @@ void OFB_ModePolicy::WriteKeystream(byte *keystreamBuffer, size_t iterationCount void OFB_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) { + assert(length == BlockSize()); CopyOrZero(m_register, iv, length); } -- cgit v1.2.1