aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <[email protected]>2011-05-24 11:39:58 +0000
committerlloyd <[email protected]>2011-05-24 11:39:58 +0000
commit6bf99bb01aac7266ec6f3c5556fc5177e0f881ad (patch)
tree77276c85cda417cd1c58cc3f7156ee69b55dad88
parent8bb2bba80af0e39848c769c2ea408b831ca7391e (diff)
FD_ZERO on Solaris uses memset, and assumes we included string.h
already. Reported by Jeremy C. Reed <[email protected]>
-rw-r--r--doc/log.txt5
-rw-r--r--src/entropy/dev_random/dev_random.cpp1
-rw-r--r--src/entropy/unix_procs/unix_cmd.cpp1
3 files changed, 7 insertions, 0 deletions
diff --git a/doc/log.txt b/doc/log.txt
index 77033f10b..a86c28e59 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -64,6 +64,11 @@ Version 1.9.18, Not Yet Released
* The function ``BigInt::get_substring`` did not work correctly with a
*length* argument of 32.
+* The implementation of ``FD_ZERO`` on Solaris uses ``memset`` and
+ assumes the caller included ``string.h`` on its behalf. Do so to
+ fix compilation in the ``dev_random`` and ``unix_procs`` entropy
+ sources. Patch from Jeremy C. Reed.
+
* Add two different configuration targets for Atom, since some are
32-bit and some are 64-bit. The 'atom' target now refers to the
64-bit implementations, use 'atom32' to target the 32-bit
diff --git a/src/entropy/dev_random/dev_random.cpp b/src/entropy/dev_random/dev_random.cpp
index b15240aba..d14ae43ae 100644
--- a/src/entropy/dev_random/dev_random.cpp
+++ b/src/entropy/dev_random/dev_random.cpp
@@ -12,6 +12,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
+#include <string.h>
namespace Botan {
diff --git a/src/entropy/unix_procs/unix_cmd.cpp b/src/entropy/unix_procs/unix_cmd.cpp
index f4ae5054c..930444075 100644
--- a/src/entropy/unix_procs/unix_cmd.cpp
+++ b/src/entropy/unix_procs/unix_cmd.cpp
@@ -12,6 +12,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
+#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <signal.h>