summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-09-28 08:26:30 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-09-28 08:26:30 +1000
commit46e7ba5d53b13787f56402910e0b8e8f5c2248b3 (patch)
tree8d6589d07da9ee4e87979f7b41fd3d1d92397007
parentc6f8219e0d4ee1f64fb7b4da88523c951a03c68a (diff)
- (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency
-rw-r--r--ChangeLog5
-rw-r--r--entropy.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9265b7a38..2c238370a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120050928
2 - (dtucker) [entropy.c] Use u_char for receiving RNG seed for consistency.
3
120050927 420050927
2 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid 5 - (dtucker) [entropy.c] Remove unnecessary tests for getuid and geteuid
3 calls, since they can't possibly fail. ok djm@ 6 calls, since they can't possibly fail. ok djm@
@@ -3020,4 +3023,4 @@
3020 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3023 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3021 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3024 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3022 3025
3023$Id: ChangeLog,v 1.3896 2005/09/27 12:46:32 dtucker Exp $ 3026$Id: ChangeLog,v 1.3897 2005/09/27 22:26:30 dtucker Exp $
diff --git a/entropy.c b/entropy.c
index ff97415a9..e5b45b0b6 100644
--- a/entropy.c
+++ b/entropy.c
@@ -48,7 +48,7 @@
48 * XXX: we should tell the child how many bytes we need. 48 * XXX: we should tell the child how many bytes we need.
49 */ 49 */
50 50
51RCSID("$Id: entropy.c,v 1.51 2005/09/27 12:46:32 dtucker Exp $"); 51RCSID("$Id: entropy.c,v 1.52 2005/09/27 22:26:30 dtucker Exp $");
52 52
53#ifndef OPENSSL_PRNG_ONLY 53#ifndef OPENSSL_PRNG_ONLY
54#define RANDOM_SEED_SIZE 48 54#define RANDOM_SEED_SIZE 48
@@ -170,7 +170,7 @@ rexec_send_rng_seed(Buffer *m)
170void 170void
171rexec_recv_rng_seed(Buffer *m) 171rexec_recv_rng_seed(Buffer *m)
172{ 172{
173 char *buf; 173 u_char *buf;
174 u_int len; 174 u_int len;
175 175
176 buf = buffer_get_string_ret(m, &len); 176 buf = buffer_get_string_ret(m, &len);