New reseed_with_sources call on RNGs

Provides an easier way for an application to configure a list of
entropy sources they'd like to use, or add a custom entropy source to
their seeding.

Exposes some toggles for the global/default entropy sources to build.h

Adds basic entropy tests which runs the polls and does sanity checking
on the results, including compression tests if available. These are
less useful for the CSPRNG outputs but a good check for the ones
producing plain ASCII like the /proc reader.

2 files changed, 6 insertions, 9 deletions

diff --git a/src/lib/entropy/unix_procs/unix_procs.cpp b/src/lib/entropy/unix_procs/unix_procs.cpp
index c6ad6a700..abfe341e0 100644
--- a/src/lib/entropy/unix_procs/unix_procs.cpp
+++ b/src/lib/entropy/unix_procs/unix_procs.cpp
@@ -43,8 +43,8 @@ size_t concurrent_processes(size_t user_request)
    const size_t DEFAULT_CONCURRENT = 2;
    const size_t MAX_CONCURRENT = 8;
 
-   if(user_request > 0 && user_request < MAX_CONCURRENT)
-      return user_request;
+   if(user_request > 0)
+      return std::min(user_request, MAX_CONCURRENT);
 
    const long online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN);
 
@@ -72,9 +72,6 @@ void UnixProcessInfo_EntropySource::poll(Entropy_Accumulator& accum)
    accum.add(::getppid(), 0.0);
    accum.add(::getuid(),  0.0);
    accum.add(::getgid(),  0.0);
-#if defined(BOTAN_TARGET_OS_HAS_GETSID)
-   accum.add(::getsid(0),  0.0);
-#endif
    accum.add(::getpgrp(), 0.0);
 
    struct ::rusage usage;
diff --git a/src/lib/entropy/unix_procs/unix_procs.h b/src/lib/entropy/unix_procs/unix_procs.h
index 808d34221..bc2fd87d1 100644
--- a/src/lib/entropy/unix_procs/unix_procs.h
+++ b/src/lib/entropy/unix_procs/unix_procs.h
@@ -20,10 +20,10 @@ namespace Botan {
 * effective against local attackers as they can sample from the same
 * distribution.
 */
-class Unix_EntropySource : public EntropySource
+class Unix_EntropySource : public Entropy_Source
    {
    public:
-      std::string name() const override { return "Unix Process Runner"; }
+      std::string name() const override { return "unix_procs"; }
 
       void poll(Entropy_Accumulator& accum) override;
 
@@ -78,10 +78,10 @@ class Unix_EntropySource : public EntropySource
       secure_vector<byte> m_buf;
    };
 
-class UnixProcessInfo_EntropySource : public EntropySource
+class UnixProcessInfo_EntropySource : public Entropy_Source
    {
    public:
-      std::string name() const override { return "Unix Process Info"; }
+      std::string name() const override { return "proc_info"; }
 
       void poll(Entropy_Accumulator& accum) override;
    };