diff options
| -rw-r--r-- | src/modes/cbc/cbc.cpp | 8 | ||||
| -rw-r--r-- | src/modes/cbc/cbc.h | 8 | ||||
| -rw-r--r-- | src/modes/ecb/ecb.h | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/modes/cbc/cbc.cpp b/src/modes/cbc/cbc.cpp index ff0c417b2..2bb2320e6 100644 --- a/src/modes/cbc/cbc.cpp +++ b/src/modes/cbc/cbc.cpp @@ -13,7 +13,7 @@ namespace Botan { * CBC Encryption Constructor * *************************************************/ CBC_Encryption::CBC_Encryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad) : + BlockCipherModePaddingMethod* pad) : BlockCipherMode(ciph, "CBC", ciph->BLOCK_SIZE), padder(pad) { @@ -25,7 +25,7 @@ CBC_Encryption::CBC_Encryption(BlockCipher* ciph, * CBC Encryption Constructor * *************************************************/ CBC_Encryption::CBC_Encryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad, + BlockCipherModePaddingMethod* pad, const SymmetricKey& key, const InitializationVector& iv) : BlockCipherMode(ciph, "CBC", ciph->BLOCK_SIZE), @@ -82,7 +82,7 @@ std::string CBC_Encryption::name() const * CBC Decryption Constructor * *************************************************/ CBC_Decryption::CBC_Decryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad) : + BlockCipherModePaddingMethod* pad) : BlockCipherMode(ciph, "CBC", ciph->BLOCK_SIZE), padder(pad) { @@ -95,7 +95,7 @@ CBC_Decryption::CBC_Decryption(BlockCipher* ciph, * CBC Decryption Constructor * *************************************************/ CBC_Decryption::CBC_Decryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad, + BlockCipherModePaddingMethod* pad, const SymmetricKey& key, const InitializationVector& iv) : BlockCipherMode(ciph, "CBC", ciph->BLOCK_SIZE), diff --git a/src/modes/cbc/cbc.h b/src/modes/cbc/cbc.h index 238780067..e7b250e33 100644 --- a/src/modes/cbc/cbc.h +++ b/src/modes/cbc/cbc.h @@ -17,8 +17,8 @@ namespace Botan { class BOTAN_DLL CBC_Encryption : public BlockCipherMode { public: - CBC_Encryption(BlockCipher*, const BlockCipherModePaddingMethod*); - CBC_Encryption(BlockCipher*, const BlockCipherModePaddingMethod*, + CBC_Encryption(BlockCipher*, BlockCipherModePaddingMethod*); + CBC_Encryption(BlockCipher*, BlockCipherModePaddingMethod*, const SymmetricKey&, const InitializationVector&); ~CBC_Encryption() { delete padder; } @@ -35,8 +35,8 @@ class BOTAN_DLL CBC_Encryption : public BlockCipherMode class BOTAN_DLL CBC_Decryption : public BlockCipherMode { public: - CBC_Decryption(BlockCipher*, const BlockCipherModePaddingMethod*); - CBC_Decryption(BlockCipher*, const BlockCipherModePaddingMethod*, + CBC_Decryption(BlockCipher*, BlockCipherModePaddingMethod*); + CBC_Decryption(BlockCipher*, BlockCipherModePaddingMethod*, const SymmetricKey&, const InitializationVector&); ~CBC_Decryption() { delete padder; } diff --git a/src/modes/ecb/ecb.h b/src/modes/ecb/ecb.h index 902713455..81fee28d2 100644 --- a/src/modes/ecb/ecb.h +++ b/src/modes/ecb/ecb.h @@ -18,12 +18,12 @@ namespace Botan { class BOTAN_DLL ECB : public BlockCipherMode { protected: - ECB(BlockCipher* ciph, const BlockCipherModePaddingMethod* pad) : + ECB(BlockCipher* ciph, BlockCipherModePaddingMethod* pad) : BlockCipherMode(ciph, "ECB", 0), padder(pad) {} ~ECB() { delete padder; } std::string name() const; - const BlockCipherModePaddingMethod* padder; + BlockCipherModePaddingMethod* padder; private: bool valid_iv_size(u32bit) const; }; @@ -35,11 +35,11 @@ class BOTAN_DLL ECB_Encryption : public ECB { public: ECB_Encryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad) : + BlockCipherModePaddingMethod* pad) : ECB(ciph, pad) {} ECB_Encryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad, + BlockCipherModePaddingMethod* pad, const SymmetricKey& key) : ECB(ciph, pad) { set_key(key); } private: @@ -54,11 +54,11 @@ class BOTAN_DLL ECB_Decryption : public ECB { public: ECB_Decryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad) : + BlockCipherModePaddingMethod* pad) : ECB(ciph, pad) {} ECB_Decryption(BlockCipher* ciph, - const BlockCipherModePaddingMethod* pad, + BlockCipherModePaddingMethod* pad, const SymmetricKey& key) : ECB(ciph, pad) { set_key(key); } private: |