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/mars/mars.h b/src/block/mars/mars.h
index ca49695af..8173fb984 100644
--- a/src/block/mars/mars.h
+++ b/src/block/mars/mars.h
@@ -15,13 +15,15 @@ namespace Botan {
 class BOTAN_DLL MARS : public BlockCipher
    {
    public:
-      void clear() throw() { EK.clear(); }
+      void encrypt_n(const byte in[], byte out[], u32bit blocks) const;
+      void decrypt_n(const byte in[], byte out[], u32bit blocks) const;
+
+      void clear() { EK.clear(); }
       std::string name() const { return "MARS"; }
       BlockCipher* clone() const { return new MARS; }
+
       MARS() : BlockCipher(16, 16, 32, 4) {}
    private:
-      void enc(const byte[], byte[]) const;
-      void dec(const byte[], byte[]) const;
       void key_schedule(const byte[], u32bit);
 
       void encrypt_round(u32bit&, u32bit&, u32bit&, u32bit&, u32bit) const;