aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/entropy/hres_timer/hres_timer.h
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-07-18 15:36:27 -0400
committerJack Lloyd <[email protected]>2016-07-18 15:36:27 -0400
commite33c989417b7ad9557b02936a1a814e37bf85fcd (patch)
treec36944002c46e7098d4ab33209c2deaca391b4c1 /src/lib/entropy/hres_timer/hres_timer.h
parent7438e0b4c85403ba6f4c864a76cd8865f9659ed3 (diff)
parent8f2f800c7ea841fa5ab963349178ac3a9f56a513 (diff)
Merge GH #520 RNG changes
Adds Stateful_RNG base class which handles reseeding after some amount of output (configurable at instantiation time, defaults to the build.h value) as well as detecting forks (just using pid comparisons, so still vulnerable to pid wraparound). Implemented by HMAC_RNG and HMAC_DRBG. I did not update X9.31 since its underlying RNG should already be fork safe and handle reseeding at the appropriate time, since a new block is taken from the underlying RNG (for the datetime vector) for each block of output. Adds RNG::randomize_with_input which for most PRNGs is just a call to add_entropy followed by randomize. However for HMAC_DRBG it is used for additional input. Adds tests for HMAC_DRBG with AD from the CAVS file. RNG::add_entropy is implemented by System_RNG now, as both CryptGenRandom and /dev/urandom support receiving application provided data. The AutoSeeded_RNG underlying type is currently selectable in build.h and defaults to HMAC_DRBG(SHA-256). AutoSeeded_RNG provides additional input with each output request, consisting of the current pid, a counter, and timestamp (unless the application explicitly calls randomize_with_input, in which case we just take what they provided). This is the same hedge used in HMAC_RNGs output PRF. AutoSeeded_RNG is part of the base library now and cannot be compiled out. Removes Entropy_Accumulator type (which just served to bridge between the RNG and the entropy source), instead the Entropy_Source is passed a reference to the RNG being reseeded, and it can call add_entropy on whatever it can come up with.
Diffstat (limited to 'src/lib/entropy/hres_timer/hres_timer.h')
-rw-r--r--src/lib/entropy/hres_timer/hres_timer.h30
1 files changed, 0 insertions, 30 deletions
diff --git a/src/lib/entropy/hres_timer/hres_timer.h b/src/lib/entropy/hres_timer/hres_timer.h
deleted file mode 100644
index d297a87b1..000000000
--- a/src/lib/entropy/hres_timer/hres_timer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-* High Resolution Timestamp Entropy Source
-* (C) 1999-2009 Jack Lloyd
-*
-* Botan is released under the Simplified BSD License (see license.txt)
-*/
-
-#ifndef BOTAN_ENTROPY_SRC_HRES_TIMER_H__
-#define BOTAN_ENTROPY_SRC_HRES_TIMER_H__
-
-#include <botan/entropy_src.h>
-
-namespace Botan {
-
-/**
-* Entropy source using high resolution timers
-*
-* @note Any results from timers are marked as not contributing entropy
-* to the poll, as a local attacker could observe them directly.
-*/
-class High_Resolution_Timestamp final : public Entropy_Source
- {
- public:
- std::string name() const override { return "timestamp"; }
- void poll(Entropy_Accumulator& accum) override;
- };
-
-}
-
-#endif