Pass a pointer to a HashFunction to the MGF1 constructor, and have that

pointer used over and over again in MGF1::mask.

1 files changed, 9 insertions, 3 deletions

diff --git a/include/mgf1.h b/include/mgf1.h
index 9e227dd93..c235821bf 100644
--- a/include/mgf1.h
+++ b/include/mgf1.h
@@ -11,15 +11,21 @@
 namespace Botan {
 
 /*************************************************
-* MGF1                                           *
+* MGF1 (Mask Generation Function)                *
 *************************************************/
 class BOTAN_DLL MGF1 : public MGF
    {
    public:
       void mask(const byte[], u32bit, byte[], u32bit) const;
-      MGF1(const std::string&);
+
+      /**
+      MGF1 constructor: takes ownership of hash
+      */
+      MGF1(HashFunction* hash);
+
+      ~MGF1();
    private:
-      const std::string hash_name;
+      HashFunction* hash;
    };
 
 }