Modularize MGF1. Make EME1 and EMSA4 depend on it

5 files changed, 14 insertions, 1 deletions

diff --git a/src/get_enc.cpp b/src/get_enc.cpp
index cdef00980..fb5952a3e 100644
--- a/src/get_enc.cpp
+++ b/src/get_enc.cpp
@@ -6,9 +6,12 @@
 #include <botan/lookup.h>
 #include <botan/libstate.h>
 #include <botan/parsing.h>
-#include <botan/mgf1.h>
 #include <botan/util.h>
 
+#if defined(BOTAN_HAS_MGF1)
+  #include <botan/mgf1.h>
+#endif
+
 #if defined(BOTAN_HAS_EMSA1)
   #include <botan/emsa1.h>
 #endif
@@ -202,11 +205,13 @@ MGF* get_mgf(const std::string& algo_spec)
    std::vector<std::string> name = parse_algorithm_name(algo_spec);
    const std::string mgf_name = global_state().deref_alias(name[0]);
 
+#ifdef BOTAN_HAS_MGF1
    if(mgf_name == "MGF1")
       {
       if(name.size() == 2)
          return new MGF1(get_hash(name[1]));
       }
+#endif
 
    throw Algorithm_Not_Found(algo_spec);
    }
diff --git a/src/mgf1.cpp b/src/kdf/mgf1/mgf1.cpp
index c2cda7f4c..c2cda7f4c 100644
--- a/src/mgf1.cpp
+++ b/src/kdf/mgf1/mgf1.cpp
diff --git a/include/mgf1.h b/src/kdf/mgf1/mgf1.h
index c235821bf..c235821bf 100644
--- a/include/mgf1.h
+++ b/src/kdf/mgf1/mgf1.h
diff --git a/src/pk_pad/eme1/modinfo.txt b/src/pk_pad/eme1/modinfo.txt
index 5383d59b6..dafb595c1 100644
--- a/src/pk_pad/eme1/modinfo.txt
+++ b/src/pk_pad/eme1/modinfo.txt
@@ -8,3 +8,7 @@ load_on auto
 eme1.h
 eme1.cpp
 </add>
+
+<requires>
+mgf1
+</requires>
diff --git a/src/pk_pad/emsa4/modinfo.txt b/src/pk_pad/emsa4/modinfo.txt
index 39a34c619..e37d72d77 100644
--- a/src/pk_pad/emsa4/modinfo.txt
+++ b/src/pk_pad/emsa4/modinfo.txt
@@ -8,3 +8,7 @@ load_on auto
 emsa4.h
 emsa4.cpp
 </add>
+
+<requires>
+mgf1
+</requires>