The unified diff between revisions [73df60cf..] and [b3f30c54..] is displayed below. It can also be downloaded as a raw diff.

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

#
#
# patch "src/base.cpp"
#  from [43a02e5c0ec42872bd76b43a73355c3a06828c5b]
#    to [66946b725669401993ffdd7f4838b0715d91d6b5]
#
============================================================
--- src/base.cpp	43a02e5c0ec42872bd76b43a73355c3a06828c5b
+++ src/base.cpp	66946b725669401993ffdd7f4838b0715d91d6b5
@@ -1,11 +1,10 @@
 /*************************************************
 * Base Classes Source File                       *
-* (C) 1999-2007 The Botan Project                *
+* (C) 1999-2007 Jack Lloyd                       *
 *************************************************/

 #include <botan/base.h>
 #include <botan/version.h>
-#include <botan/parsing.h>
 #include <botan/util.h>
 #include <botan/config.h>

@@ -151,7 +150,7 @@ void BufferedComputation::update(const s
 *************************************************/
 void BufferedComputation::update(const std::string& str)
    {
-   update((const byte*)str.c_str(), str.size());
+   update(reinterpret_cast<const byte*>(str.data()), str.size());
    }

 /*************************************************
@@ -221,16 +220,8 @@ u32bit RandomNumberGenerator::add_entrop
 u32bit RandomNumberGenerator::add_entropy(EntropySource& source,
                                           bool slow_poll)
    {
-   std::string poll_type;
-   if(slow_poll)
-      poll_type = "rng/slow_poll_request";
-   else
-      poll_type = "rng/fast_poll_request";
+   SecureVector<byte> buffer(DEFAULT_BUFFERSIZE);

-   u32bit poll_for = global_config().option_as_u32bit(poll_type);
-
-   SecureVector<byte> buffer(poll_for ? poll_for : 256);
-
    u32bit bytes_gathered = 0;

    if(slow_poll)
@@ -243,21 +234,4 @@ u32bit RandomNumberGenerator::add_entrop
    return entropy_estimate(buffer, bytes_gathered);
    }

-/*************************************************
-* Return the version as a string                 *
-*************************************************/
-std::string version_string()
-   {
-   return "Botan " + to_string(version_major()) + "." +
-                     to_string(version_minor()) + "." +
-                     to_string(version_patch());
-   }
-
-/*************************************************
-* Return parts of the version as integers        *
-*************************************************/
-u32bit version_major() { return BOTAN_VERSION_MAJOR; }
-u32bit version_minor() { return BOTAN_VERSION_MINOR; }
-u32bit version_patch() { return BOTAN_VERSION_PATCH; }
-
 }