From c3bad1afc1564f3bfac8434d45d6694811139333 Mon Sep 17 00:00:00 2001 From: weidai Date: Sun, 10 Dec 2006 02:12:23 +0000 Subject: port to GCC 4, reorganize implementations of SetKey git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@248 57ff6487-cd31-0410-9ec3-f628ee90f5f0 --- modes.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'modes.cpp') diff --git a/modes.cpp b/modes.cpp index 941a0dc..cdd4c26 100644 --- a/modes.cpp +++ b/modes.cpp @@ -24,11 +24,6 @@ void Modes_TestInstantiations() } #endif -void CipherModeBase::SetKey(const byte *key, size_t length, const NameValuePairs ¶ms) -{ - UncheckedSetKey(params, key, (unsigned int)length, GetIVAndThrowIfInvalid(params)); // the underlying cipher will check the key length -} - void CipherModeBase::GetNextIV(byte *IV) { if (!IsForwardTransformation()) @@ -102,12 +97,12 @@ void CTR_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv) CopyOrZero(m_counterArray, iv, s); } -void BlockOrientedCipherModeBase::UncheckedSetKey(const NameValuePairs ¶ms, const byte *key, unsigned int length, const byte *iv) +void BlockOrientedCipherModeBase::UncheckedSetKey(const byte *key, unsigned int length, const NameValuePairs ¶ms) { m_cipher->SetKey(key, length, params); ResizeBuffers(); if (IsResynchronizable()) - Resynchronize(iv); + Resynchronize(GetIVAndThrowIfInvalid(params)); } void BlockOrientedCipherModeBase::ProcessData(byte *outString, const byte *inString, size_t length) -- cgit v1.2.1