propagate from branch 'net.randombit.botan.1_8' (head 3158f8272a3582dd44dfb771665eb71f7d005339)

            to branch 'net.randombit.botan' (head bf629b13dd132b263e76a72b7eca0f7e4ab19aac)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/block/twofish/twofish.h b/src/block/twofish/twofish.h
index 0640e32f8..71a1e8781 100644
--- a/src/block/twofish/twofish.h
+++ b/src/block/twofish/twofish.h
@@ -18,13 +18,15 @@ namespace Botan {
 class BOTAN_DLL Twofish : public BlockCipher
    {
    public:
-      void clear() throw();
+      void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
+      void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
+
+      void clear();
       std::string name() const { return "Twofish"; }
       BlockCipher* clone() const { return new Twofish; }
+
       Twofish() : BlockCipher(16, 16, 32, 8) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
 
       static void rs_mul(byte[4], byte, u32bit);