Add variable block size support for block ciphers

This should lead the way for more modern block ciphers like Threefish and Kalyna. It tested well with both regular cipher modes (the mode has an instance of the cipher) and external cipher modes (the cipher and mode are distinct objects, and the mode holds a reference to the cipher).

We still have to work out the details of naming a cipher. For example, Kalyna with a 128-bit key can use a 128-bit or 256-bit block size. Kalyna-128 is not enough to describe the algorithm and locate it in the object registry. Kalyna-128-128 looks kind of weird; maybe Kalyna-128(128) or Kalyna-128(256) would be better.

Here are the initial test cases to verify functionality:

byte key[64] = {}, iv[32] = {};

ECB_Mode<Kalyna>::Encryption enc1;
enc1.SetKey(key, 16);

CBC_Mode<Kalyna>::Encryption enc2;
enc2.SetKeyWithIV(key, 16, iv);

AlgorithmParameters params = MakeParameters
                        (Name::BlockSize(), 32)
                        (Name::IV(), ConstByteArrayParameter(iv, 32));

CTR_Mode<Kalyna>::Encryption enc3;
enc3.SetKey(key, 16, params);

CBC_Mode<Kalyna>::Encryption enc4;
enc4.SetKey(key, 32, params);

Kalyna::Encryption enc5;
ECB_Mode_ExternalCipher::Encryption ecb(enc5);
ecb.SetKey(key, 16, params);

Kalyna::Encryption enc6;
ECB_Mode_ExternalCipher::Encryption cbc(enc6);
cbc.SetKey(key, 32, params);

1 files changed, 3 insertions, 3 deletions

diff --git a/modes.cpp b/modes.cpp
index 6b8e81ae..0d9849ce 100644
--- a/modes.cpp
+++ b/modes.cpp
@@ -67,7 +67,7 @@ void CFB_ModePolicy::TransformRegister()
 void CFB_ModePolicy::CipherResynchronize(const byte *iv, size_t length)

 {

 	CRYPTOPP_ASSERT(length == BlockSize());

-	CopyOrZero(m_register, iv, length);

+	CopyOrZero(m_register, m_register.size(), iv, length);

 	TransformRegister();

 }

 

@@ -99,7 +99,7 @@ void OFB_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv,
 	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);

 	CRYPTOPP_ASSERT(length == BlockSize());

 

-	CopyOrZero(m_register, iv, length);

+	CopyOrZero(m_register, m_register.size(), iv, length);

 }

 

 void CTR_ModePolicy::SeekToIteration(lword iterationCount)

@@ -144,7 +144,7 @@ void CTR_ModePolicy::CipherResynchronize(byte *keystreamBuffer, const byte *iv,
 	CRYPTOPP_UNUSED(keystreamBuffer), CRYPTOPP_UNUSED(length);

 	CRYPTOPP_ASSERT(length == BlockSize());

 

-	CopyOrZero(m_register, iv, length);

+	CopyOrZero(m_register, m_register.size(), iv, length);

 	m_counterArray = m_register;

 }