diff options
| author | Jack Lloyd <[email protected]> | 2017-01-06 10:30:21 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-01-06 10:30:21 -0500 |
| commit | 4fd8c78d79492855f131c0d1bc005812a557cbf0 (patch) | |
| tree | bdee1a6a41eda6e9f42a3cfe64323eb5ea8f5d0c | |
| parent | 82efe72e8fff56144f74379ec667fa97cfcb2a8a (diff) | |
| parent | 5a1d8124b43b5950e2771cb329f7951ac10d847d (diff) | |
Merge GH #813 Remove obsolete entropy source info
| -rw-r--r-- | src/lib/entropy/entropy_srcs.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/lib/entropy/entropy_srcs.cpp b/src/lib/entropy/entropy_srcs.cpp index bc99c2400..252be4fa1 100644 --- a/src/lib/entropy/entropy_srcs.cpp +++ b/src/lib/entropy/entropy_srcs.cpp @@ -8,10 +8,6 @@ #include <botan/entropy_src.h> #include <botan/rng.h> -#if defined(BOTAN_HAS_ENTROPY_SRC_HIGH_RESOLUTION_TIMER) - #include <botan/internal/hres_timer.h> -#endif - #if defined(BOTAN_HAS_ENTROPY_SRC_RDRAND) #include <botan/internal/rdrand.h> #endif @@ -44,13 +40,6 @@ namespace Botan { std::unique_ptr<Entropy_Source> Entropy_Source::create(const std::string& name) { - if(name == "timestamp") - { -#if defined(BOTAN_HAS_ENTROPY_SRC_HIGH_RESOLUTION_TIMER) - return std::unique_ptr<Entropy_Source>(new High_Resolution_Timestamp); -#endif - } - if(name == "rdrand") { #if defined(BOTAN_HAS_ENTROPY_SRC_RDRAND) @@ -65,13 +54,6 @@ std::unique_ptr<Entropy_Source> Entropy_Source::create(const std::string& name) #endif } - if(name == "proc_info") - { -#if defined(BOTAN_HAS_ENTROPY_SRC_UNIX_PROCESS_RUNNER) - return std::unique_ptr<Entropy_Source>(new UnixProcessInfo_EntropySource); -#endif - } - if(name == "darwin_secrandom") { #if defined(BOTAN_HAS_ENTROPY_SRC_DARWIN_SECRANDOM) |