diff options
| author | des <des@FreeBSD.org> | 2002-10-29 09:43:00 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 09:43:00 +0000 |
| commit | 099d1a58f7bc088a9f71af6d32542ca3949468a3 (patch) | |
| tree | 49cef8938d7beb10016662d15546fa090865073d /crypto/openssh/ssh-rand-helper.c | |
| parent | 1ba793a7c09e24d920de3983a3223770cb37ebff (diff) | |
| download | FreeBSD-src-099d1a58f7bc088a9f71af6d32542ca3949468a3.zip FreeBSD-src-099d1a58f7bc088a9f71af6d32542ca3949468a3.tar.gz | |
Vendor import of OpenSSH-portable 3.5p1.
Diffstat (limited to 'crypto/openssh/ssh-rand-helper.c')
| -rw-r--r-- | crypto/openssh/ssh-rand-helper.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/crypto/openssh/ssh-rand-helper.c b/crypto/openssh/ssh-rand-helper.c index 364d5d2..e6c52b5 100644 --- a/crypto/openssh/ssh-rand-helper.c +++ b/crypto/openssh/ssh-rand-helper.c @@ -39,7 +39,7 @@ #include "pathnames.h" #include "log.h" -RCSID("$Id: ssh-rand-helper.c,v 1.7 2002/06/09 19:41:49 mouring Exp $"); +RCSID("$Id: ssh-rand-helper.c,v 1.8 2002/07/28 20:42:24 stevesk Exp $"); /* Number of bytes we write out */ #define OUTPUT_SEED_SIZE 48 @@ -63,7 +63,6 @@ RCSID("$Id: ssh-rand-helper.c,v 1.7 2002/06/09 19:41:49 mouring Exp $"); # define SSH_PRNG_COMMAND_FILE SSHDIR "/ssh_prng_cmds" #endif - #ifdef HAVE___PROGNAME extern char *__progname; #else @@ -115,7 +114,7 @@ double stir_from_programs(void); double stir_gettimeofday(double entropy_estimate); double stir_clock(double entropy_estimate); double stir_rusage(int who, double entropy_estimate); -double hash_command_output(entropy_cmd_t *src, char *hash); +double hash_command_output(entropy_cmd_t *src, unsigned char *hash); int get_random_bytes_prngd(unsigned char *buf, int len, unsigned short tcp_port, char *socket_path); @@ -274,7 +273,7 @@ timeval_diff(struct timeval *t1, struct timeval *t2) } double -hash_command_output(entropy_cmd_t *src, char *hash) +hash_command_output(entropy_cmd_t *src, unsigned char *hash) { char buf[8192]; fd_set rdset; @@ -460,7 +459,7 @@ stir_from_programs(void) { int c; double entropy, total_entropy; - char hash[SHA_DIGEST_LENGTH]; + unsigned char hash[SHA_DIGEST_LENGTH]; total_entropy = 0; for(c = 0; entropy_cmds[c].path != NULL; c++) { @@ -543,7 +542,8 @@ void prng_write_seedfile(void) { int fd; - char seed[SEED_FILE_SIZE], filename[MAXPATHLEN]; + unsigned char seed[SEED_FILE_SIZE]; + char filename[MAXPATHLEN]; struct passwd *pw; pw = getpwuid(getuid()); @@ -862,4 +862,3 @@ main(int argc, char **argv) return ret == bytes ? 0 : 1; } - |
