Move get_pbe into lookup.h to avoid cyclical dependency

8 files changed, 24 insertions, 10 deletions

diff --git a/include/lookup.h b/include/lookup.h
index e37c27143..97c2eff50 100644
--- a/include/lookup.h
+++ b/include/lookup.h
@@ -12,6 +12,7 @@
 #include <botan/mode_pad.h>
 #include <botan/pk_util.h>
 #include <botan/s2k.h>
+#include <botan/pbe.h>
 
 namespace Botan {
 
@@ -38,6 +39,12 @@ BOTAN_DLL S2K* get_s2k(const std::string&);
 BOTAN_DLL const BlockCipherModePaddingMethod* get_bc_pad(const std::string&);
 
 /*************************************************
+* Get a PBE object                               *
+*************************************************/
+BOTAN_DLL PBE* get_pbe(const std::string&);
+BOTAN_DLL PBE* get_pbe(const OID&, DataSource&);
+
+/*************************************************
 * Get an EMSA/EME/KDF/MGF function               *
 *************************************************/
 BOTAN_DLL EME*  get_eme(const std::string&);
diff --git a/src/filters/modinfo.txt b/src/filters/modinfo.txt
index d21c864b5..d11585662 100644
--- a/src/filters/modinfo.txt
+++ b/src/filters/modinfo.txt
@@ -23,5 +23,6 @@ filter.h
 filters.h
 out_buf.h
 pipe.h
+pbe.h
 secqueue.h
 </add>
diff --git a/include/pbe.h b/src/filters/pbe.h
index 0a2d1ff97..4761f79d9 100644
--- a/include/pbe.h
+++ b/src/filters/pbe.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_PBE_H__
-#define BOTAN_PBE_H__
+#ifndef BOTAN_PBE_BASE_H__
+#define BOTAN_PBE_BASE_H__
 
 #include <botan/asn1_oid.h>
 #include <botan/data_src.h>
@@ -28,12 +28,6 @@ class BOTAN_DLL PBE : public Filter
       virtual OID get_oid() const = 0;
    };
 
-/*************************************************
-* Get a PBE object                               *
-*************************************************/
-BOTAN_DLL PBE* get_pbe(const std::string&);
-BOTAN_DLL PBE* get_pbe(const OID&, DataSource&);
-
 }
 
 #endif
diff --git a/src/get_pbe.cpp b/src/get_pbe.cpp
index 0839d4d98..6bd85b3e1 100644
--- a/src/get_pbe.cpp
+++ b/src/get_pbe.cpp
@@ -3,9 +3,9 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
+#include <botan/lookup.h>
 #include <botan/pbe.h>
 #include <botan/oids.h>
-#include <botan/lookup.h>
 #include <botan/parsing.h>
 
 #if defined(BOTAN_HAS_PBE_PKCS_V15)
diff --git a/src/pk/dl_algo/modinfo.txt b/src/pk/dl_algo/modinfo.txt
index 755ab8682..d3368765a 100644
--- a/src/pk/dl_algo/modinfo.txt
+++ b/src/pk/dl_algo/modinfo.txt
@@ -11,5 +11,6 @@ dl_algo.h
 
 <requires>
 asn1
+bigint
 dl_group
 </requires>
diff --git a/src/pk/dl_group/modinfo.txt b/src/pk/dl_group/modinfo.txt
index 4d2d6f13c..62446091f 100644
--- a/src/pk/dl_group/modinfo.txt
+++ b/src/pk/dl_group/modinfo.txt
@@ -8,3 +8,8 @@ define DL_GROUP
 dl_group.cpp
 dl_group.h
 </add>
+
+<requires>
+asn1
+bigint
+</requires>
diff --git a/src/pk/if_algo/modinfo.txt b/src/pk/if_algo/modinfo.txt
index f4ddd565f..e8d582c00 100644
--- a/src/pk/if_algo/modinfo.txt
+++ b/src/pk/if_algo/modinfo.txt
@@ -8,3 +8,9 @@ load_on auto
 if_algo.cpp
 if_algo.h
 </add>
+
+<requires>
+asn1
+bigint
+filters
+</requires>
diff --git a/src/pkcs8.cpp b/src/pkcs8.cpp
index f5ee5435d..2963c9d86 100644
--- a/src/pkcs8.cpp
+++ b/src/pkcs8.cpp
@@ -10,7 +10,7 @@
 #include <botan/pk_algs.h>
 #include <botan/oids.h>
 #include <botan/pem.h>
-#include <botan/pbe.h>
+#include <botan/lookup.h>
 #include <memory>
 
 namespace Botan {