summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-03-16 07:21:35 +1100
committerDarren Tucker <dtucker@zip.com.au>2006-03-16 07:21:35 +1100
commitd82cbcb9da3c2a908bd7704b1d9e5686f936ced3 (patch)
treee1feea2d233c0068b122252c3c83b9120cbcee3c
parent8bb9e2c9000d5cfe8d5503d67d48a8a4e153ec39 (diff)
- (dtucker) [entropy.c] Add headers for WIFEXITED and friends.
-rw-r--r--ChangeLog5
-rw-r--r--entropy.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cdbf5d737..308f9d1ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120060316
2 - (dtucker) [entropy.c] Add headers for WIFEXITED and friends.
3
120060315 420060315
2 - (djm) OpenBSD CVS Sync: 5 - (djm) OpenBSD CVS Sync:
3 - msf@cvs.openbsd.org 2006/02/06 15:54:07 6 - msf@cvs.openbsd.org 2006/02/06 15:54:07
@@ -4173,4 +4176,4 @@
4173 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4176 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4174 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4177 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4175 4178
4176$Id: ChangeLog,v 1.4224 2006/03/15 11:28:17 dtucker Exp $ 4179$Id: ChangeLog,v 1.4225 2006/03/15 20:21:35 dtucker Exp $
diff --git a/entropy.c b/entropy.c
index e5b45b0b6..91724273e 100644
--- a/entropy.c
+++ b/entropy.c
@@ -24,6 +24,9 @@
24 24
25#include "includes.h" 25#include "includes.h"
26 26
27#include <sys/types.h>
28#include <sys/wait.h>
29
27#include <openssl/rand.h> 30#include <openssl/rand.h>
28#include <openssl/crypto.h> 31#include <openssl/crypto.h>
29#include <openssl/err.h> 32#include <openssl/err.h>
@@ -48,7 +51,7 @@
48 * XXX: we should tell the child how many bytes we need. 51 * XXX: we should tell the child how many bytes we need.
49 */ 52 */
50 53
51RCSID("$Id: entropy.c,v 1.52 2005/09/27 22:26:30 dtucker Exp $"); 54RCSID("$Id: entropy.c,v 1.53 2006/03/15 20:21:35 dtucker Exp $");
52 55
53#ifndef OPENSSL_PRNG_ONLY 56#ifndef OPENSSL_PRNG_ONLY
54#define RANDOM_SEED_SIZE 48 57#define RANDOM_SEED_SIZE 48