aboutsummaryrefslogtreecommitdiffstats
path: root/checks
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-03-10 16:35:12 +0000
committerlloyd <[email protected]>2010-03-10 16:35:12 +0000
commitffebc65a41fbe22934830203cfa4ee791804796b (patch)
tree8ce04eba960bd524f58e096ac979e7f639696c6a /checks
parentd3e279ec353133e9f80f13a536aae15e49c2a206 (diff)
parentfd79f63a44ad0b59507ac67bdb3eccbe4d45adbc (diff)
propagate from branch 'net.randombit.botan' (head 74e9e8642943d126a5e5efa5be1da8351f0fb6d7)
to branch 'net.randombit.botan.c++0x' (head 24371f742c2a1c7e5f3aace364fbb21e01c94657)
Diffstat (limited to 'checks')
-rw-r--r--checks/pk_bench.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/checks/pk_bench.cpp b/checks/pk_bench.cpp
index c6f411379..a09d3a090 100644
--- a/checks/pk_bench.cpp
+++ b/checks/pk_bench.cpp
@@ -1,13 +1,13 @@
/*
-* (C) 2009 Jack Lloyd
+* (C) 2009-2010 Jack Lloyd
*
* Distributed under the terms of the Botan license
*/
#include <botan/pkcs8.h>
#include <botan/mem_ops.h>
-#include <botan/libstate.h>
#include <botan/parsing.h>
+#include <map>
#if defined(BOTAN_HAS_RSA)
#include <botan/rsa.h>
@@ -721,8 +721,6 @@ void bench_pk(RandomNumberGenerator& rng,
there is no way to encode a RW key into a PKCS #8 structure).
*/
- global_state().set_option("pk/test/private_gen", "basic");
-
Benchmark_Report report;
#if defined(BOTAN_HAS_RSA)