The unified diff between revisions [6afe2db1..] and [4e40e885..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'src/modules.cpp'

#
#
# patch "src/modules.cpp"
#  from [34b37b30ef1537b4e7b1dca707b4ee9f0d8d103c]
#    to [6f7f44e1c3b66c17ea4a6ffe4cd28152d08012cf]
#
============================================================
--- src/modules.cpp	34b37b30ef1537b4e7b1dca707b4ee9f0d8d103c
+++ src/modules.cpp	6f7f44e1c3b66c17ea4a6ffe4cd28152d08012cf
@@ -5,7 +5,6 @@

 #include <botan/modules.h>
 #include <botan/defalloc.h>
-#include <botan/def_char.h>
 #include <botan/eng_def.h>
 #include <botan/timers.h>
 #include <botan/parsing.h>
@@ -95,24 +94,6 @@ Mutex_Factory* Builtin_Modules::mutex_fa
    }

 /*************************************************
-* Find a high resolution timer, if possible      *
-*************************************************/
-Timer* Builtin_Modules::timer() const
-   {
-#if defined(BOTAN_EXT_TIMER_HARDWARE)
-   return new Hardware_Timer;
-#elif defined(BOTAN_EXT_TIMER_POSIX)
-   return new POSIX_Timer;
-#elif defined(BOTAN_EXT_TIMER_UNIX)
-   return new Unix_Timer;
-#elif defined(BOTAN_EXT_TIMER_WIN32)
-   return new Win32_Timer;
-#else
-   return new Timer;
-#endif
-   }
-
-/*************************************************
 * Find any usable allocators                     *
 *************************************************/
 std::vector<Allocator*> Builtin_Modules::allocators() const
@@ -153,17 +134,34 @@ std::vector<EntropySource*> Builtin_Modu
    {
    std::vector<EntropySource*> sources;

+#if defined(BOTAN_EXT_TIMER_HARDWARE)
+   sources.push_back(new Hardware_Timer);
+#elif defined(BOTAN_EXT_TIMER_POSIX)
+   sources.push_back(new POSIX_Timer);
+#elif defined(BOTAN_EXT_TIMER_UNIX)
+   sources.push_back(new Unix_Timer);
+#elif defined(BOTAN_EXT_TIMER_WIN32)
+   sources.push_back(new Win32_Timer);
+#else
+   sources.push_back(new Timer);
+#endif
+
 #if defined(BOTAN_EXT_ENTROPY_SRC_AEP)
    sources.push_back(new AEP_EntropySource);
 #endif

 #if defined(BOTAN_EXT_ENTROPY_SRC_EGD)
-   sources.push_back(new EGD_EntropySource(split_on("/var/run/egd-pool:/dev/egd-pool", ':')));
+   sources.push_back(
+      new EGD_EntropySource(split_on("/var/run/egd-pool:/dev/egd-pool", ':'))
+      );
 #endif

 #if defined(BOTAN_EXT_ENTROPY_SRC_DEVICE)
    sources.push_back(
-      new Device_EntropySource(split_on("/dev/random:/dev/srandom:/dev/urandom", ':')));
+      new Device_EntropySource(
+         split_on("/dev/random:/dev/srandom:/dev/urandom", ':')
+         )
+      );
 #endif

 #if defined(BOTAN_EXT_ENTROPY_SRC_CAPI)
@@ -175,7 +173,9 @@ std::vector<EntropySource*> Builtin_Modu
 #endif

 #if defined(BOTAN_EXT_ENTROPY_SRC_UNIX)
-   sources.push_back(new Unix_EntropySource(split_on("/bin:/sbin:/usr/bin:/usr/sbin", ':')));
+   sources.push_back(
+      new Unix_EntropySource(split_on("/bin:/sbin:/usr/bin:/usr/sbin", ':'))
+      );
 #endif

 #if defined(BOTAN_EXT_ENTROPY_SRC_BEOS)
@@ -217,14 +217,6 @@ std::vector<Engine*> Builtin_Modules::en
    }

 /*************************************************
-* Find the best transcoder option                *
-*************************************************/
-Charset_Transcoder* Builtin_Modules::transcoder() const
-   {
-   return new Default_Charset_Transcoder;
-   }
-
-/*************************************************
 * Builtin_Modules Constructor                    *
 *************************************************/
 Builtin_Modules::Builtin_Modules(const InitializerOptions& args) :