1 files changed, 14 insertions, 13 deletions
diff --git a/src/lib/block/lubyrack/lubyrack.h b/src/lib/block/lubyrack/lubyrack.h
index e28c60be7..236be53d6 100644
--- a/src/lib/block/lubyrack/lubyrack.h
+++ b/src/lib/block/lubyrack/lubyrack.h
@@ -1,6 +1,6 @@
 /*
 * Luby-Rackoff
-* (C) 1999-2008 Jack Lloyd
+* (C) 1999-2008,2014 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
@@ -10,6 +10,7 @@
 
 #include <botan/block_cipher.h>
 #include <botan/hash.h>
+#include <memory>
 
 namespace Botan {
 
@@ -19,30 +20,30 @@ namespace Botan {
 class BOTAN_DLL LubyRackoff : public BlockCipher
    {
    public:
-      void encrypt_n(const byte in[], byte out[], size_t blocks) const;
-      void decrypt_n(const byte in[], byte out[], size_t blocks) const;
+      void encrypt_n(const byte in[], byte out[], size_t blocks) const override;
+      void decrypt_n(const byte in[], byte out[], size_t blocks) const override;
 
-      size_t block_size() const { return 2 * hash->output_length(); }
+      size_t block_size() const override { return 2 * m_hash->output_length(); }
 
-      Key_Length_Specification key_spec() const
+      Key_Length_Specification key_spec() const override
          {
          return Key_Length_Specification(2, 32, 2);
          }
 
-      void clear();
-      std::string name() const;
-      BlockCipher* clone() const;
+      void clear() override;
+      std::string name() const override;
+      BlockCipher* clone() const override;
 
       /**
       * @param hash function to use to form the block cipher
       */
-      LubyRackoff(HashFunction* hash);
-      ~LubyRackoff() { delete hash; }
+      LubyRackoff(HashFunction* hash) : m_hash(hash) {}
+
    private:
-      void key_schedule(const byte[], size_t);
+      void key_schedule(const byte[], size_t) override;
 
-      HashFunction* hash;
-      secure_vector<byte> K1, K2;
+      std::unique_ptr<HashFunction> m_hash;
+      secure_vector<byte> m_K1, m_K2;
    };
 
 }