Consolidate the non-canonical epoch timers, like cpuid and Win32's

QueryPerformanceCounter, into an entropy source hres_timer. Its
results, if any, do not count as contributing entropy to the poll.

Convert the other (monotonic/fixed epoch) timers to a single function
get_nanoseconds_clock(), living in time.h, which statically chooses
the 'best' timer type (clock_gettime, gettimeofday, std::clock, in
that order depending on what is available). Add feature test macros
for clock_gettime and gettimeofday.

Remove the Timer class and timer.h. Remove the Timer& argument to the
algorithm benchmark function.

1 files changed, 0 insertions, 4 deletions

diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index fb51db300..8f9a16edc 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -8,7 +8,6 @@
 #include <botan/randpool.h>
 #include <botan/loadstor.h>
 #include <botan/xor_buf.h>
-#include <botan/timer.h>
 #include <botan/stl_util.h>
 #include <algorithm>
 
@@ -51,12 +50,9 @@ void Randpool::randomize(byte out[], u32bit length)
 */
 void Randpool::update_buffer()
    {
-   const u64bit timestamp = system_time();
-
    for(u32bit i = 0; i != counter.size(); ++i)
       if(++counter[i])
          break;
-   store_be(timestamp, counter + 4);
 
    mac->update(static_cast<byte>(GEN_OUTPUT));
    mac->update(counter, counter.size());