diff options
| author | lloyd <[email protected]> | 2009-12-01 12:00:48 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-01 12:00:48 +0000 |
| commit | 874dbb8323dd4d7eff3ff16cff0cfafc16ddbfa7 (patch) | |
| tree | bc3a84c43c5924119972f24da3af89317694f0cb /src/asn1 | |
| parent | 78f5726220b637cd8ae117bbcf8ff8d6c8dfeaed (diff) | |
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.
Diffstat (limited to 'src/asn1')
| -rw-r--r-- | src/asn1/asn1_tm.cpp | 2 | ||||
| -rw-r--r-- | src/asn1/info.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/asn1/asn1_tm.cpp b/src/asn1/asn1_tm.cpp index 09bc4d347..c57d1bc73 100644 --- a/src/asn1/asn1_tm.cpp +++ b/src/asn1/asn1_tm.cpp @@ -10,7 +10,7 @@ #include <botan/ber_dec.h> #include <botan/charset.h> #include <botan/parsing.h> -#include <botan/timer.h> +#include <botan/time.h> namespace Botan { diff --git a/src/asn1/info.txt b/src/asn1/info.txt index 621b8b628..d836b4c0b 100644 --- a/src/asn1/info.txt +++ b/src/asn1/info.txt @@ -26,5 +26,4 @@ alloc bigint filters oid_lookup -timer </requires> |