Modularize MGF1. Make EME1 and EMSA4 depend on it

2 files changed, 88 insertions, 0 deletions

diff --git a/src/kdf/mgf1/mgf1.cpp b/src/kdf/mgf1/mgf1.cpp
new file mode 100644
index 000000000..c2cda7f4c
--- /dev/null
+++ b/src/kdf/mgf1/mgf1.cpp
@@ -0,0 +1,55 @@
+/*************************************************
+* MGF1 Source File                               *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/mgf1.h>
+#include <botan/loadstor.h>
+#include <botan/xor_buf.h>
+#include <algorithm>
+#include <memory>
+
+namespace Botan {
+
+/*************************************************
+* MGF1 Mask Generation Function                  *
+*************************************************/
+void MGF1::mask(const byte in[], u32bit in_len, byte out[],
+                u32bit out_len) const
+   {
+   u32bit counter = 0;
+
+   while(out_len)
+      {
+      hash->update(in, in_len);
+      for(u32bit j = 0; j != 4; ++j)
+         hash->update(get_byte(j, counter));
+      SecureVector<byte> buffer = hash->final();
+
+      u32bit xored = std::min(buffer.size(), out_len);
+      xor_buf(out, buffer.begin(), xored);
+      out += xored;
+      out_len -= xored;
+
+      ++counter;
+      }
+   }
+
+/*************************************************
+* MGF1 Constructor                               *
+*************************************************/
+MGF1::MGF1(HashFunction* h) : hash(h)
+   {
+   if(!hash)
+      throw Invalid_Argument("MGF1 given null hash object");
+   }
+
+/*************************************************
+* MGF1 Destructor                                *
+*************************************************/
+MGF1::~MGF1()
+   {
+   delete hash;
+   }
+
+}
diff --git a/src/kdf/mgf1/mgf1.h b/src/kdf/mgf1/mgf1.h
new file mode 100644
index 000000000..c235821bf
--- /dev/null
+++ b/src/kdf/mgf1/mgf1.h
@@ -0,0 +1,33 @@
+/*************************************************
+* MGF1 Header File                               *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_MGF1_H__
+#define BOTAN_MGF1_H__
+
+#include <botan/pk_util.h>
+
+namespace Botan {
+
+/*************************************************
+* MGF1 (Mask Generation Function)                *
+*************************************************/
+class BOTAN_DLL MGF1 : public MGF
+   {
+   public:
+      void mask(const byte[], u32bit, byte[], u32bit) const;
+
+      /**
+      MGF1 constructor: takes ownership of hash
+      */
+      MGF1(HashFunction* hash);
+
+      ~MGF1();
+   private:
+      HashFunction* hash;
+   };
+
+}
+
+#endif