summaryrefslogtreecommitdiff
path: root/modes.cpp
diff options
context:
space:
mode:
authorweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2010-08-05 09:48:04 +0000
committerweidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>2010-08-05 09:48:04 +0000
commit71b5051ebc9d2558818e272ae92e20abb48fc88c (patch)
tree881a275084027522d12baa3ea9c63105e5c35ccf /modes.cpp
parent2b729488b9a3944a384bdaa13fecc34b3ba6de92 (diff)
downloadcryptopp-71b5051ebc9d2558818e272ae92e20abb48fc88c.tar.gz
fix CTR mode not allowing NULL as IV
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@516 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'modes.cpp')
-rw-r--r--modes.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modes.cpp b/modes.cpp
index 789fafb..4633228 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);
}