summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-03-13 07:33:34 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-03-13 07:33:34 +1100
commitd19f416144cc503de167756f565846816f3e6d5d (patch)
tree073211b0e2aacf0f5546ac31e0531b2d9e18845d
parent4ee72c71e31226c81743439fe1ed2b521b5ddb7e (diff)
downloadopenssh-git-d19f416144cc503de167756f565846816f3e6d5d.tar.gz
- (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
string.h to prevent warnings, from vapier at gentoo.org.
-rw-r--r--ChangeLog6
-rw-r--r--entropy.c3
-rw-r--r--scard-opensc.c1
-rw-r--r--ssh-rand-helper.c1
4 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f2b96c37..8a68f70e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20070313
+ - (dtucker) [entropy.c scard-opensc.c ssh-rand-helper.c] Bug #1294: include
+ string.h to prevent warnings, from vapier at gentoo.org.
+
20070306
- (djm) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2007/03/01 16:19:33
@@ -2816,4 +2820,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4635.2.1 2007/03/06 10:27:55 djm Exp $
+$Id: ChangeLog,v 1.4635.2.2 2007/03/12 20:33:34 dtucker Exp $
diff --git a/entropy.c b/entropy.c
index ccabb136..8b705397 100644
--- a/entropy.c
+++ b/entropy.c
@@ -35,8 +35,9 @@
# include <fcntl.h>
#endif
#include <stdarg.h>
-#include <unistd.h>
+#include <string.h>
#include <signal.h>
+#include <unistd.h>
#include <openssl/rand.h>
#include <openssl/crypto.h>
diff --git a/scard-opensc.c b/scard-opensc.c
index 4751ea29..36dae05f 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -32,6 +32,7 @@
#include <openssl/x509.h>
#include <stdarg.h>
+#include <string.h>
#include <opensc/opensc.h>
#include <opensc/pkcs15.h>
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 8520c3a6..8b1c4b4f 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -32,6 +32,7 @@
#include <stdarg.h>
#include <stddef.h>
+#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>