Remove support for block cipher padding methods in engine. Like S2K,

they were not used at all outside of the core library implementations.

One change is that now get_bc_pad returns a new object, instead of a
pointer to a const shared padding method. This does imply a bit more
dynamic memory overhead, but the modes are pretty light (stateless, for
the most part), so this doesn't seem like a big deal. So modify ECB and
CBC classes to add destructors to delete the padding object.

2 files changed, 5 insertions, 0 deletions

diff --git a/src/modes/cbc/cbc.h b/src/modes/cbc/cbc.h
index 3069d6cb5..238780067 100644
--- a/src/modes/cbc/cbc.h
+++ b/src/modes/cbc/cbc.h
@@ -20,6 +20,8 @@ class BOTAN_DLL CBC_Encryption : public BlockCipherMode
       CBC_Encryption(BlockCipher*, const BlockCipherModePaddingMethod*);
       CBC_Encryption(BlockCipher*, const BlockCipherModePaddingMethod*,
                      const SymmetricKey&, const InitializationVector&);
+
+      ~CBC_Encryption() { delete padder; }
    private:
       std::string name() const;
       void write(const byte[], u32bit);
@@ -36,6 +38,8 @@ class BOTAN_DLL CBC_Decryption : public BlockCipherMode
       CBC_Decryption(BlockCipher*, const BlockCipherModePaddingMethod*);
       CBC_Decryption(BlockCipher*, const BlockCipherModePaddingMethod*,
                      const SymmetricKey&, const InitializationVector&);
+
+      ~CBC_Decryption() { delete padder; }
    private:
       std::string name() const;
       void write(const byte[], u32bit);
diff --git a/src/modes/ecb/ecb.h b/src/modes/ecb/ecb.h
index d15d2f202..902713455 100644
--- a/src/modes/ecb/ecb.h
+++ b/src/modes/ecb/ecb.h
@@ -20,6 +20,7 @@ class BOTAN_DLL ECB : public BlockCipherMode
    protected:
       ECB(BlockCipher* ciph, const BlockCipherModePaddingMethod* pad) :
          BlockCipherMode(ciph, "ECB", 0), padder(pad) {}
+      ~ECB() { delete padder; }
 
       std::string name() const;
       const BlockCipherModePaddingMethod* padder;