aboutsummaryrefslogtreecommitdiffstats
path: root/src/modes/cbc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-08 21:59:52 +0000
committerlloyd <[email protected]>2008-11-08 21:59:52 +0000
commitda5a5cbea7f611ebf41a8d3065700106a8d89f2d (patch)
tree2063c22d19d8583d93208889967b68b10c0a3760 /src/modes/cbc
parenta9f747ab6c6f1949410368514e5af74786494318 (diff)
Remove lookup.h from modebase
Diffstat (limited to 'src/modes/cbc')
-rw-r--r--src/modes/cbc/cbc.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/modes/cbc/cbc.cpp b/src/modes/cbc/cbc.cpp
index 9ad598bed..eea039ce3 100644
--- a/src/modes/cbc/cbc.cpp
+++ b/src/modes/cbc/cbc.cpp
@@ -15,7 +15,8 @@ namespace Botan {
*************************************************/
CBC_Encryption::CBC_Encryption(const std::string& cipher_name,
const std::string& padding_name) :
- BlockCipherMode(cipher_name, "CBC", block_size_of(cipher_name)),
+ BlockCipherMode(get_block_cipher(cipher_name),
+ "CBC", block_size_of(cipher_name)),
padder(get_bc_pad(padding_name))
{
if(!padder->valid_blocksize(BLOCK_SIZE))
@@ -29,7 +30,8 @@ CBC_Encryption::CBC_Encryption(const std::string& cipher_name,
const std::string& padding_name,
const SymmetricKey& key,
const InitializationVector& iv) :
- BlockCipherMode(cipher_name, "CBC", block_size_of(cipher_name)),
+ BlockCipherMode(get_block_cipher(cipher_name),
+ "CBC", block_size_of(cipher_name)),
padder(get_bc_pad(padding_name))
{
if(!padder->valid_blocksize(BLOCK_SIZE))
@@ -84,7 +86,8 @@ std::string CBC_Encryption::name() const
*************************************************/
CBC_Decryption::CBC_Decryption(const std::string& cipher_name,
const std::string& padding_name) :
- BlockCipherMode(cipher_name, "CBC", block_size_of(cipher_name)),
+ BlockCipherMode(get_block_cipher(cipher_name),
+ "CBC", block_size_of(cipher_name)),
padder(get_bc_pad(padding_name))
{
if(!padder->valid_blocksize(BLOCK_SIZE))
@@ -99,7 +102,8 @@ CBC_Decryption::CBC_Decryption(const std::string& cipher_name,
const std::string& padding_name,
const SymmetricKey& key,
const InitializationVector& iv) :
- BlockCipherMode(cipher_name, "CBC", block_size_of(cipher_name)),
+ BlockCipherMode(get_block_cipher(cipher_name),
+ "CBC", block_size_of(cipher_name)),
padder(get_bc_pad(padding_name))
{
if(!padder->valid_blocksize(BLOCK_SIZE))