Rename Default_Engine to Core_Engine which describes its purposes

(slightly) better.

13 files changed, 36 insertions, 38 deletions

diff --git a/src/engine/def_engine/default_engine.h b/src/engine/core_engine/core_engine.h
index 0d864e514..b8b8262ce 100644
--- a/src/engine/def_engine/default_engine.h
+++ b/src/engine/core_engine/core_engine.h
@@ -1,21 +1,21 @@
 /*
-* Default Engine
+* Core Engine
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_DEFAULT_ENGINE_H__
-#define BOTAN_DEFAULT_ENGINE_H__
+#ifndef BOTAN_CORE_ENGINE_H__
+#define BOTAN_CORE_ENGINE_H__
 
 #include <botan/engine.h>
 
 namespace Botan {
 
 /**
-* Default Engine
+* Core Engine
 */
-class Default_Engine : public Engine
+class Core_Engine : public Engine
    {
    public:
       std::string provider_name() const { return "core"; }
diff --git a/src/engine/def_engine/def_mode.cpp b/src/engine/core_engine/core_modes.cpp
index 233385eda..a0d857a11 100644
--- a/src/engine/def_engine/def_mode.cpp
+++ b/src/engine/core_engine/core_modes.cpp
@@ -1,11 +1,11 @@
 /*
-* Default Engine
+* Core Engine
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/parsing.h>
 #include <botan/filters.h>
 #include <botan/algo_factory.h>
@@ -178,7 +178,7 @@ Keyed_Filter* get_cipher_mode(const BlockCipher* block_cipher,
 /*
 * Get a cipher object
 */
-Keyed_Filter* Default_Engine::get_cipher(const std::string& algo_spec,
+Keyed_Filter* Core_Engine::get_cipher(const std::string& algo_spec,
                                          Cipher_Dir direction,
                                          Algorithm_Factory& af)
    {
diff --git a/src/engine/def_engine/def_pk_ops.cpp b/src/engine/core_engine/def_pk_ops.cpp
index 878d7d35c..db418d5bc 100644
--- a/src/engine/def_engine/def_pk_ops.cpp
+++ b/src/engine/core_engine/def_pk_ops.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 
 #if defined(BOTAN_HAS_RSA)
   #include <botan/rsa.h>
@@ -46,7 +46,7 @@
 namespace Botan {
 
 PK_Ops::Encryption*
-Default_Engine::get_encryption_op(const Public_Key& key) const
+Core_Engine::get_encryption_op(const Public_Key& key) const
    {
 #if defined(BOTAN_HAS_RSA)
    if(const RSA_PublicKey* s = dynamic_cast<const RSA_PublicKey*>(&key))
@@ -62,7 +62,7 @@ Default_Engine::get_encryption_op(const Public_Key& key) const
    }
 
 PK_Ops::Decryption*
-Default_Engine::get_decryption_op(const Private_Key& key) const
+Core_Engine::get_decryption_op(const Private_Key& key) const
    {
 #if defined(BOTAN_HAS_RSA)
    if(const RSA_PrivateKey* s = dynamic_cast<const RSA_PrivateKey*>(&key))
@@ -78,7 +78,7 @@ Default_Engine::get_decryption_op(const Private_Key& key) const
    }
 
 PK_Ops::Key_Agreement*
-Default_Engine::get_key_agreement_op(const Private_Key& key) const
+Core_Engine::get_key_agreement_op(const Private_Key& key) const
    {
 #if defined(BOTAN_HAS_DIFFIE_HELLMAN)
    if(const DH_PrivateKey* dh = dynamic_cast<const DH_PrivateKey*>(&key))
@@ -94,7 +94,7 @@ Default_Engine::get_key_agreement_op(const Private_Key& key) const
    }
 
 PK_Ops::Signature*
-Default_Engine::get_signature_op(const Private_Key& key) const
+Core_Engine::get_signature_op(const Private_Key& key) const
    {
 #if defined(BOTAN_HAS_RSA)
    if(const RSA_PrivateKey* s = dynamic_cast<const RSA_PrivateKey*>(&key))
@@ -131,7 +131,7 @@ Default_Engine::get_signature_op(const Private_Key& key) const
    }
 
 PK_Ops::Verification*
-Default_Engine::get_verify_op(const Public_Key& key) const
+Core_Engine::get_verify_op(const Public_Key& key) const
    {
 #if defined(BOTAN_HAS_RSA)
    if(const RSA_PublicKey* s = dynamic_cast<const RSA_PublicKey*>(&key))
diff --git a/src/engine/def_engine/def_powm.cpp b/src/engine/core_engine/def_powm.cpp
index 9767e51ef..56a4b6844 100644
--- a/src/engine/def_engine/def_powm.cpp
+++ b/src/engine/core_engine/def_powm.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/internal/def_powm.h>
 
 namespace Botan {
@@ -14,7 +14,7 @@ namespace Botan {
 * Choose a modular exponentation algorithm
 */
 Modular_Exponentiator*
-Default_Engine::mod_exp(const BigInt& n, Power_Mod::Usage_Hints hints) const
+Core_Engine::mod_exp(const BigInt& n, Power_Mod::Usage_Hints hints) const
    {
    if(n.is_odd())
       return new Montgomery_Exponentiator(n, hints);
diff --git a/src/engine/def_engine/info.txt b/src/engine/core_engine/info.txt
index faa591696..ea059b3c6 100644
--- a/src/engine/def_engine/info.txt
+++ b/src/engine/core_engine/info.txt
@@ -1,11 +1,11 @@
-define DEFAULT_ENGINE
+define CORE_ENGINE
 
 <header:internal>
-default_engine.h
+core_engine.h
 </header:internal>
 
 <source>
-def_mode.cpp
+core_modes.cpp
 def_pk_ops.cpp
 def_powm.cpp
 lookup_block.cpp
diff --git a/src/engine/def_engine/lookup_block.cpp b/src/engine/core_engine/lookup_block.cpp
index 097a471b7..52967fade 100644
--- a/src/engine/def_engine/lookup_block.cpp
+++ b/src/engine/core_engine/lookup_block.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/scan_name.h>
 #include <botan/algo_factory.h>
 
@@ -112,9 +112,8 @@ namespace Botan {
 /*
 * Look for an algorithm with this name
 */
-BlockCipher*
-Default_Engine::find_block_cipher(const SCAN_Name& request,
-                                  Algorithm_Factory& af) const
+BlockCipher* Core_Engine::find_block_cipher(const SCAN_Name& request,
+                                            Algorithm_Factory& af) const
    {
 
 #if defined(BOTAN_HAS_AES)
diff --git a/src/engine/def_engine/lookup_hash.cpp b/src/engine/core_engine/lookup_hash.cpp
index 47c6c0a56..1524015dd 100644
--- a/src/engine/def_engine/lookup_hash.cpp
+++ b/src/engine/core_engine/lookup_hash.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/scan_name.h>
 #include <botan/algo_factory.h>
 #include <memory>
@@ -88,9 +88,8 @@ namespace Botan {
 /*
 * Look for an algorithm with this name
 */
-HashFunction*
-Default_Engine::find_hash(const SCAN_Name& request,
-                          Algorithm_Factory& af) const
+HashFunction* Core_Engine::find_hash(const SCAN_Name& request,
+                                     Algorithm_Factory& af) const
    {
 #if defined(BOTAN_HAS_ADLER32)
    if(request.algo_name() == "Adler32")
diff --git a/src/engine/def_engine/lookup_mac.cpp b/src/engine/core_engine/lookup_mac.cpp
index adeec881b..9f322b399 100644
--- a/src/engine/def_engine/lookup_mac.cpp
+++ b/src/engine/core_engine/lookup_mac.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/scan_name.h>
 #include <botan/algo_factory.h>
 
@@ -35,8 +35,8 @@ namespace Botan {
 * Look for an algorithm with this name
 */
 MessageAuthenticationCode*
-Default_Engine::find_mac(const SCAN_Name& request,
-                         Algorithm_Factory& af) const
+Core_Engine::find_mac(const SCAN_Name& request,
+                      Algorithm_Factory& af) const
    {
 
 #if defined(BOTAN_HAS_CBC_MAC)
diff --git a/src/engine/def_engine/lookup_stream.cpp b/src/engine/core_engine/lookup_stream.cpp
index 0ec9620e6..52ca4fb8d 100644
--- a/src/engine/def_engine/lookup_stream.cpp
+++ b/src/engine/core_engine/lookup_stream.cpp
@@ -5,7 +5,7 @@
 * Distributed under the terms of the Botan license
 */
 
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/scan_name.h>
 
 #if defined(BOTAN_HAS_ARC4)
@@ -30,8 +30,8 @@ namespace Botan {
 * Look for an algorithm with this name
 */
 StreamCipher*
-Default_Engine::find_stream_cipher(const SCAN_Name& request,
-                                   Algorithm_Factory&) const
+Core_Engine::find_stream_cipher(const SCAN_Name& request,
+                                Algorithm_Factory&) const
    {
 #if defined(BOTAN_HAS_ARC4)
    if(request.algo_name() == "ARC4")
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index 749b6afaf..22095d1a3 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -26,7 +26,7 @@ algo_factory
 alloc
 bigint
 block
-def_engine
+core_engine
 engine
 filters
 hash
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp
index 1db9ca44c..8d8634bab 100644
--- a/src/libstate/libstate.cpp
+++ b/src/libstate/libstate.cpp
@@ -10,7 +10,7 @@
 #include <botan/engine.h>
 #include <botan/cpuid.h>
 #include <botan/internal/defalloc.h>
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/internal/mutex.h>
 #include <botan/internal/mux_noop.h>
 #include <botan/internal/stl_util.h>
@@ -301,7 +301,7 @@ void Library_State::initialize(bool thread_safe)
    algorithm_factory().add_engine(new Assembler_Engine);
 #endif
 
-   algorithm_factory().add_engine(new Default_Engine);
+   algorithm_factory().add_engine(new Core_Engine);
 
 #if defined(BOTAN_HAS_SELFTESTS)
    confirm_startup_self_tests(algorithm_factory());
diff --git a/src/selftest/info.txt b/src/selftest/info.txt
index 53c6d286d..1a53ea021 100644
--- a/src/selftest/info.txt
+++ b/src/selftest/info.txt
@@ -3,5 +3,5 @@ define SELFTESTS
 <requires>
 algo_factory
 filters
-def_engine
+core_engine
 </requires>
diff --git a/src/selftest/selftest.cpp b/src/selftest/selftest.cpp
index 93af4f1b7..72e49cfbd 100644
--- a/src/selftest/selftest.cpp
+++ b/src/selftest/selftest.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/selftest.h>
 #include <botan/filters.h>
-#include <botan/internal/default_engine.h>
+#include <botan/internal/core_engine.h>
 #include <botan/internal/stl_util.h>
 
 namespace Botan {