12 files changed, 35 insertions, 13 deletions
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 31277ff0c..a289fbcd8 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -101,10 +101,43 @@
 * RNGs will automatically poll the system for additional seed material
 * after producing this many bytes of output.
 */
-#define BOTAN_RNG_MAX_OUTPUT_BEFORE_RESEED 512
+#define BOTAN_RNG_MAX_OUTPUT_BEFORE_RESEED 4096
 #define BOTAN_RNG_RESEED_POLL_BITS 128
 #define BOTAN_RNG_AUTO_RESEED_TIMEOUT std::chrono::milliseconds(10)
-#define BOTAN_RNG_RESEED_DEFAULT_TIMEOUT std::chrono::milliseconds(100)
+#define BOTAN_RNG_RESEED_DEFAULT_TIMEOUT std::chrono::milliseconds(50)
+
+/*
+* Specifies (in order) the list of entropy sources that will be used
+* to seed an in-memory RNG. The first few in the default list
+* ("timer", "proc_info", etc) do not count as contributing any entropy
+* but are included as they are fast and help protect against a
+* seriously broken system RNG.
+*/
+#define BOTAN_ENTROPY_DEFAULT_SOURCES \
+   { "timestamp", "rdrand", "proc_info", \
+   "darwin_secrandom", "dev_random", "win32_cryptoapi", "egd", \
+   "proc_walk", "system_stats", "unix_procs" }
+
+/*
+* These control the RNG used by the system RNG interface
+*/
+#define BOTAN_SYSTEM_RNG_DEVICE "/dev/urandom"
+#define BOTAN_SYSTEM_RNG_CRYPTOAPI_PROV_TYPE PROV_RSA_FULL
+
+/*
+* These paramaters control how many bytes to read from the system
+* PRNG, and how long to block if applicable.
+*
+* Timeout is ignored on Windows as CryptGenRandom doesn't block
+*/
+#define BOTAN_SYSTEM_RNG_POLL_DEVICES { "/dev/urandom", "/dev/random", "/dev/srandom" }
+
+#define BOTAN_SYSTEM_RNG_POLL_REQUEST 64
+#define BOTAN_SYSTEM_RNG_POLL_TIMEOUT_MS 20
+
+#define BOTAN_ENTROPY_EGD_PATHS { "/var/run/egd-pool", "/dev/egd-pool" }
+#define BOTAN_ENTROPY_PROC_FS_PATH "/proc"
+#define BOTAN_ENTROPY_SAFE_PATHS { "/bin", "/sbin", "/usr/bin", "/usr/sbin" }
 
 /* Should we use GCC-style inline assembler? */
 #if !defined(BOTAN_USE_GCC_INLINE_ASM) && defined(__GNUG__)
diff --git a/src/build-data/os/aix.txt b/src/build-data/os/aix.txt
index 546fbf9ad..369b720c4 100644
--- a/src/build-data/os/aix.txt
+++ b/src/build-data/os/aix.txt
@@ -2,5 +2,4 @@ os_type unix
 
 <target_features>
 gettimeofday
-getsid
 </target_features>
diff --git a/src/build-data/os/cygwin.txt b/src/build-data/os/cygwin.txt
index 7788cd3ca..ee934f787 100644
--- a/src/build-data/os/cygwin.txt
+++ b/src/build-data/os/cygwin.txt
@@ -12,6 +12,5 @@ doc_dir docs
 
 <target_features>
 gettimeofday
-getsid
 timegm
 </target_features>
diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/darwin.txt
index 56285ccf7..b1f2363dc 100644
--- a/src/build-data/os/darwin.txt
+++ b/src/build-data/os/darwin.txt
@@ -16,7 +16,6 @@ gettimeofday
 gmtime_r
 memset_s
 readdir
-getsid
 timegm
 </target_features>
 
diff --git a/src/build-data/os/freebsd.txt b/src/build-data/os/freebsd.txt
index 32767cb1f..510a7accd 100644
--- a/src/build-data/os/freebsd.txt
+++ b/src/build-data/os/freebsd.txt
@@ -7,6 +7,5 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
-getsid
 timegm
 </target_features>
diff --git a/src/build-data/os/haiku.txt b/src/build-data/os/haiku.txt
index 981ce6795..8e35e76eb 100644
--- a/src/build-data/os/haiku.txt
+++ b/src/build-data/os/haiku.txt
@@ -8,7 +8,6 @@ doc_dir system/documentation
 <target_features>
 gettimeofday
 gmtime_r
-getsid
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/hpux.txt b/src/build-data/os/hpux.txt
index 726b0b960..22d51ef0a 100644
--- a/src/build-data/os/hpux.txt
+++ b/src/build-data/os/hpux.txt
@@ -2,7 +2,6 @@ os_type unix
 
 <target_features>
 gettimeofday
-getsid
 </target_features>
 
 <aliases>
diff --git a/src/build-data/os/irix.txt b/src/build-data/os/irix.txt
index 546fbf9ad..369b720c4 100644
--- a/src/build-data/os/irix.txt
+++ b/src/build-data/os/irix.txt
@@ -2,5 +2,4 @@ os_type unix
 
 <target_features>
 gettimeofday
-getsid
 </target_features>
diff --git a/src/build-data/os/linux.txt b/src/build-data/os/linux.txt
index c83e57afa..bb65055e4 100644
--- a/src/build-data/os/linux.txt
+++ b/src/build-data/os/linux.txt
@@ -11,7 +11,6 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
-getsid
 timegm
 </target_features>
 
diff --git a/src/build-data/os/netbsd.txt b/src/build-data/os/netbsd.txt
index 32767cb1f..510a7accd 100644
--- a/src/build-data/os/netbsd.txt
+++ b/src/build-data/os/netbsd.txt
@@ -7,6 +7,5 @@ posix_mlock
 gmtime_r
 dlopen
 readdir
-getsid
 timegm
 </target_features>
diff --git a/src/build-data/os/qnx.txt b/src/build-data/os/qnx.txt
index 71c85eb3c..4c0965764 100644
--- a/src/build-data/os/qnx.txt
+++ b/src/build-data/os/qnx.txt
@@ -6,5 +6,4 @@ gettimeofday
 posix_mlock
 gmtime_r
 dlopen
-getsid
 </target_features>
diff --git a/src/build-data/os/solaris.txt b/src/build-data/os/solaris.txt
index 52749e397..0ed785036 100644
--- a/src/build-data/os/solaris.txt
+++ b/src/build-data/os/solaris.txt
@@ -6,7 +6,6 @@ install_cmd_exec '/usr/ucb/install -m 755'
 <target_features>
 posix_mlock
 gettimeofday
-getsid
 </target_features>
 
 <aliases>