Inline no-op Engine virtual functions

2 files changed, 18 insertions, 63 deletions

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index e52304c59..59621a7d3 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -194,62 +194,6 @@ Engine::~Engine()
    delete cache_of_bc_pad;
    }
 
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-BlockCipher* Engine::find_block_cipher(const std::string&) const
-   {
-   return 0;
-   }
-
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-StreamCipher* Engine::find_stream_cipher(const std::string&) const
-   {
-   return 0;
-   }
-
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-HashFunction* Engine::find_hash(const std::string&) const
-   {
-   return 0;
-   }
-
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-MessageAuthenticationCode* Engine::find_mac(const std::string&) const
-   {
-   return 0;
-   }
-
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-S2K* Engine::find_s2k(const std::string&) const
-   {
-   return 0;
-   }
-
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-BlockCipherModePaddingMethod* Engine::find_bc_pad(const std::string&) const
-   {
-   return 0;
-   }
-
-/*************************************************
-* Basic No-Op Engine Implementation              *
-*************************************************/
-Keyed_Filter* Engine::get_cipher(const std::string&, Cipher_Dir)
-   {
-   return 0;
-   }
-
 namespace Engine_Core {
 
 #if defined(BOTAN_HAS_IF_PUBLIC_KEY_FAMILY)
diff --git a/src/engine/engine.h b/src/engine/engine.h
index f21c67a79..83870bb27 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -112,7 +112,8 @@ class BOTAN_DLL Engine
                                              Power_Mod::Usage_Hints) const
          { return 0; }
 
-      virtual Keyed_Filter* get_cipher(const std::string&, Cipher_Dir);
+      virtual Keyed_Filter* get_cipher(const std::string&, Cipher_Dir)
+         { return 0; }
 
       const BlockCipher* block_cipher(const std::string&) const;
       const StreamCipher* stream_cipher(const std::string&) const;
@@ -134,13 +135,23 @@ class BOTAN_DLL Engine
       Engine();
       virtual ~Engine();
    private:
-      virtual BlockCipher* find_block_cipher(const std::string&) const;
-      virtual StreamCipher* find_stream_cipher(const std::string&) const;
-      virtual HashFunction* find_hash(const std::string&) const;
-      virtual MessageAuthenticationCode* find_mac(const std::string&) const;
-      virtual class S2K* find_s2k(const std::string&) const;
+      virtual BlockCipher* find_block_cipher(const std::string&) const
+         { return 0; }
+      virtual StreamCipher* find_stream_cipher(const std::string&) const
+         { return 0; }
+
+      virtual HashFunction* find_hash(const std::string&) const
+         { return 0; }
+
+      virtual MessageAuthenticationCode* find_mac(const std::string&) const
+         { return 0; }
+
+      virtual class S2K* find_s2k(const std::string&) const
+         { return 0; }
+
       virtual class BlockCipherModePaddingMethod*
-         find_bc_pad(const std::string&) const;
+         find_bc_pad(const std::string&) const
+         { return 0; }
 
       template<typename T>
       const T* lookup_algo(const Algorithm_Cache<T>* cache,