diff options
author | Damien Miller <djm@mindrot.org> | 2005-06-19 10:19:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-06-19 10:19:43 +1000 |
commit | 52c8afeec57cd8f04e08816e1f4563e689f70f83 (patch) | |
tree | c17e191ca4e5f8688c2ef238e43e6a2a1698cecd /ssh-rand-helper.c | |
parent | 106075314795dab5eeea6ca547dd6a7573168f7a (diff) |
- (djm) [loginrec.c ssh-rand-helper.c] Fix -Wsign-compare for portable,
tested and fixes tim@
Diffstat (limited to 'ssh-rand-helper.c')
-rw-r--r-- | ssh-rand-helper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index d7d8d0f3b..aab51fdf7 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "pathnames.h" | 39 | #include "pathnames.h" |
40 | #include "log.h" | 40 | #include "log.h" |
41 | 41 | ||
42 | RCSID("$Id: ssh-rand-helper.c,v 1.23 2005/02/16 02:32:30 dtucker Exp $"); | 42 | RCSID("$Id: ssh-rand-helper.c,v 1.24 2005/06/19 00:19:44 djm Exp $"); |
43 | 43 | ||
44 | /* Number of bytes we write out */ | 44 | /* Number of bytes we write out */ |
45 | #define OUTPUT_SEED_SIZE 48 | 45 | #define OUTPUT_SEED_SIZE 48 |
@@ -123,7 +123,7 @@ get_random_bytes_prngd(unsigned char *buf, int len, | |||
123 | unsigned short tcp_port, char *socket_path) | 123 | unsigned short tcp_port, char *socket_path) |
124 | { | 124 | { |
125 | int fd, addr_len, rval, errors; | 125 | int fd, addr_len, rval, errors; |
126 | char msg[2]; | 126 | u_char msg[2]; |
127 | struct sockaddr_storage addr; | 127 | struct sockaddr_storage addr; |
128 | struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr; | 128 | struct sockaddr_in *addr_in = (struct sockaddr_in *)&addr; |
129 | struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr; | 129 | struct sockaddr_un *addr_un = (struct sockaddr_un *)&addr; |
@@ -135,8 +135,8 @@ get_random_bytes_prngd(unsigned char *buf, int len, | |||
135 | if (socket_path != NULL && | 135 | if (socket_path != NULL && |
136 | strlen(socket_path) >= sizeof(addr_un->sun_path)) | 136 | strlen(socket_path) >= sizeof(addr_un->sun_path)) |
137 | fatal("Random pool path is too long"); | 137 | fatal("Random pool path is too long"); |
138 | if (len > 255) | 138 | if (len <= 0 || len > 255) |
139 | fatal("Too many bytes to read from PRNGD"); | 139 | fatal("Too many bytes (%d) to read from PRNGD", len); |
140 | 140 | ||
141 | memset(&addr, '\0', sizeof(addr)); | 141 | memset(&addr, '\0', sizeof(addr)); |
142 | 142 | ||
@@ -190,7 +190,7 @@ reopen: | |||
190 | goto done; | 190 | goto done; |
191 | } | 191 | } |
192 | 192 | ||
193 | if (atomicio(read, fd, buf, len) != len) { | 193 | if (atomicio(read, fd, buf, len) != (size_t)len) { |
194 | if (errno == EPIPE && errors < 10) { | 194 | if (errno == EPIPE && errors < 10) { |
195 | close(fd); | 195 | close(fd); |
196 | errors++; | 196 | errors++; |