aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-07 15:26:10 +0000
committerlloyd <[email protected]>2008-11-07 15:26:10 +0000
commit955a5e4beddeb08cffbda3ed1aff1691fcc1d115 (patch)
tree1ad5c4b4e54f12a77b7f0030833bc85cef0e8edf
parent1bb18f29e5ec380f1b7c6b094e2eef4b94dee381 (diff)
Add AutoSeeded_RNG to benchmark output
-rw-r--r--checks/algos.cpp1
-rw-r--r--checks/dolook2.cpp9
2 files changed, 10 insertions, 0 deletions
diff --git a/checks/algos.cpp b/checks/algos.cpp
index 6d0b17b4c..faadfa5c3 100644
--- a/checks/algos.cpp
+++ b/checks/algos.cpp
@@ -90,6 +90,7 @@ std::vector<algorithm> get_algos()
algos.push_back(algorithm("MAC", "HMAC(SHA-1)", 16));
algos.push_back(algorithm("MAC", "X9.19-MAC", 16));
+ algos.push_back(algorithm("RNG", "AutoSeeded", 4096));
algos.push_back(algorithm("RNG", "HMAC_RNG", 4096));
algos.push_back(algorithm("RNG", "Randpool", 4096));
algos.push_back(algorithm("RNG", "X9.31-RNG", 4096));
diff --git a/checks/dolook2.cpp b/checks/dolook2.cpp
index ece8b261f..1e554bc0d 100644
--- a/checks/dolook2.cpp
+++ b/checks/dolook2.cpp
@@ -21,6 +21,10 @@
#include <botan/x931_rng.h>
#endif
+#if defined(BOTAN_HAS_AUTO_SEEDING_RNG)
+ #include <botan/auto_rng.h>
+#endif
+
#include "common.h"
using namespace Botan;
@@ -125,6 +129,11 @@ Filter* lookup_rng(const std::string& algname,
{
RandomNumberGenerator* prng = 0;
+#if defined(BOTAN_HAS_AUTO_SEEDING_RNG)
+ if(algname == "AutoSeeded")
+ prng = new AutoSeeded_RNG;
+#endif
+
#if defined(BOTAN_HAS_X931_RNG)
if(algname == "X9.31-RNG(TripleDES)")
prng = new ANSI_X931_RNG(get_block_cipher("TripleDES"),