propagate from branch 'net.randombit.botan' (head 91305e3daaae9ea8a1786daf058d961991c68251)

            to branch 'net.randombit.botan.tls-state-machine' (head 474a00b316f5b21a4e56033d4d990d87d9d3eed6)

4 files changed, 8 insertions, 4 deletions

diff --git a/doc/examples/bench.cpp b/doc/examples/bench.cpp
index 20e6ec40b..6cfd9205f 100644
--- a/doc/examples/bench.cpp
+++ b/doc/examples/bench.cpp
@@ -70,11 +70,11 @@ const std::string algos[] = {
 void benchmark_algo(const std::string& algo,
                     RandomNumberGenerator& rng)
    {
-   u32bit milliseconds = 3000;
+   u32bit milliseconds = 1000;
    Algorithm_Factory& af = global_state().algorithm_factory();
 
    std::map<std::string, double> speeds =
-      algorithm_benchmark(algo, af, rng, milliseconds, 16*1024);
+      algorithm_benchmark(algo, af, rng, milliseconds, 16);
 
    std::cout << algo << ":";
 
diff --git a/doc/examples/benchmark.cpp b/doc/examples/benchmark.cpp
index 7ad1775e2..b5adb3d4f 100644
--- a/doc/examples/benchmark.cpp
+++ b/doc/examples/benchmark.cpp
@@ -33,7 +33,7 @@ int main(int argc, char* argv[])
       std::string algo = argv[i];
 
       std::map<std::string, double> results =
-         algorithm_benchmark(algo, af, rng, ms, 16*1024);
+         algorithm_benchmark(algo, af, rng, ms, 16);
 
       std::cout << algo << ":\n";
       for(std::map<std::string, double>::iterator r = results.begin();
diff --git a/doc/examples/hash_quickly.cpp b/doc/examples/hash_quickly.cpp
index 005a6d719..a18ab4fa6 100644
--- a/doc/examples/hash_quickly.cpp
+++ b/doc/examples/hash_quickly.cpp
@@ -34,7 +34,7 @@ void set_fastest_implementation(const std::string& algo,
    Botan::Algorithm_Factory& af = Botan::global_state().algorithm_factory();
 
    std::map<std::string, double> results =
-      Botan::algorithm_benchmark(algo, af, rng, ms, 16*1024);
+      Botan::algorithm_benchmark(algo, af, rng, ms, 16);
 
    std::string fastest_provider = "";
    double best_res = 0;
diff --git a/doc/log.txt b/doc/log.txt
index 38944227b..478b27a94 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -10,6 +10,10 @@ Series 1.10
 Version 1.10.2, Not Yet Released
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+* The SSL/TLS code is disabled by default in this release. A new
+  version is being developed and the current iteration should not be
+  used unless needed for existing code.
+
 * Add the Camellia block cipher
 
 * An implementation of SRP-6a compatible with the specification in