engine.h had copies of some declarations from pk_engine.h that had not

been removed when that portion of the code was split off. Remove the
duplicated code from engine.h and update some code in pubkey that still
relied on the declarations in engine.h instead of pk_engine.h

8 files changed, 7 insertions, 50 deletions

diff --git a/src/engine/engine.h b/src/engine/engine.h
index d23fc4dca..66a159e38 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -135,49 +135,6 @@ class BOTAN_DLL Engine
 #endif
    };
 
-namespace Engine_Core {
-
-/*
-* Get an operation from an Engine
-*/
-Modular_Exponentiator* mod_exp(const BigInt&, Power_Mod::Usage_Hints);
-
-#if defined(BOTAN_HAS_IF_PUBLIC_KEY_FAMILY)
-IF_Operation* if_op(const BigInt&, const BigInt&, const BigInt&,
-                    const BigInt&, const BigInt&, const BigInt&,
-                    const BigInt&, const BigInt&);
-#endif
-
-#if defined(BOTAN_HAS_DSA)
-DSA_Operation* dsa_op(const DL_Group&, const BigInt&, const BigInt&);
-#endif
-
-#if defined(BOTAN_HAS_NYBERG_RUEPPEL)
-NR_Operation* nr_op(const DL_Group&, const BigInt&, const BigInt&);
-#endif
-
-#if defined(BOTAN_HAS_ELGAMAL)
-ELG_Operation* elg_op(const DL_Group&, const BigInt&, const BigInt&);
-#endif
-
-#if defined(BOTAN_HAS_DIFFIE_HELLMAN)
-DH_Operation* dh_op(const DL_Group&, const BigInt&);
-#endif
-
-#if defined(BOTAN_HAS_ECDSA)
-ECDSA_Operation* ecdsa_op(const EC_Domain_Params& dom_pars,
-                          const BigInt& priv_key,
-                          const PointGFp& pub_key);
-#endif
-
-#if defined(BOTAN_HAS_ECKAEG)
-ECKAEG_Operation* eckaeg_op(const EC_Domain_Params& dom_pars,
-                            const BigInt& priv_key,
-                            const PointGFp& pub_key);
-#endif
-
-}
-
 }
 
 #endif
diff --git a/src/pubkey/dh/dh_core.cpp b/src/pubkey/dh/dh_core.cpp
index bd744a3e1..78a26a8ef 100644
--- a/src/pubkey/dh/dh_core.cpp
+++ b/src/pubkey/dh/dh_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dh_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/dsa/dsa_core.cpp b/src/pubkey/dsa/dsa_core.cpp
index 2d958a316..e144d2467 100644
--- a/src/pubkey/dsa/dsa_core.cpp
+++ b/src/pubkey/dsa/dsa_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dsa_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/ecdsa/ecdsa_core.cpp b/src/pubkey/ecdsa/ecdsa_core.cpp
index e1104e52f..93808ccd5 100644
--- a/src/pubkey/ecdsa/ecdsa_core.cpp
+++ b/src/pubkey/ecdsa/ecdsa_core.cpp
@@ -8,7 +8,7 @@
 
 #include <botan/ecdsa_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/eckaeg/eckaeg_core.cpp b/src/pubkey/eckaeg/eckaeg_core.cpp
index 6dcc1d1fa..dc89a878d 100644
--- a/src/pubkey/eckaeg/eckaeg_core.cpp
+++ b/src/pubkey/eckaeg/eckaeg_core.cpp
@@ -8,7 +8,7 @@
 
 #include <botan/eckaeg_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/elgamal/elg_core.cpp b/src/pubkey/elgamal/elg_core.cpp
index 2abd6a639..8b8c8f50b 100644
--- a/src/pubkey/elgamal/elg_core.cpp
+++ b/src/pubkey/elgamal/elg_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/elg_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/if_algo/if_core.cpp b/src/pubkey/if_algo/if_core.cpp
index d112e8a77..8cc6a816f 100644
--- a/src/pubkey/if_algo/if_core.cpp
+++ b/src/pubkey/if_algo/if_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/if_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>
 
diff --git a/src/pubkey/nr/nr_core.cpp b/src/pubkey/nr/nr_core.cpp
index 50be8fbb3..afa1115db 100644
--- a/src/pubkey/nr/nr_core.cpp
+++ b/src/pubkey/nr/nr_core.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/nr_core.h>
 #include <botan/numthry.h>
-#include <botan/engine.h>
+#include <botan/pk_engine.h>
 #include <botan/parsing.h>
 #include <algorithm>