summaryrefslogtreecommitdiff
path: root/authfd.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-22 21:05:50 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-22 21:05:50 +1000
commitc0815c927e177f27b1bcd6370e4c2b10caf95efe (patch)
treece3ca9f4f2a30ef0281b095dd01ef6c66454a8f1 /authfd.c
parentfb16b2411eda857cd358dc4c9c63b66edc217a51 (diff)
- miod@cvs.openbsd.org 2003/09/18 13:02:21
[authfd.c bufaux.c dh.c mac.c ssh-keygen.c] A few signedness fixes for harmless situations; markus@ ok
Diffstat (limited to 'authfd.c')
-rw-r--r--authfd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/authfd.c b/authfd.c
index c78db6d94..5fdf1ca3d 100644
--- a/authfd.c
+++ b/authfd.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: authfd.c,v 1.61 2003/06/28 16:23:06 deraadt Exp $"); 38RCSID("$OpenBSD: authfd.c,v 1.62 2003/09/18 13:02:21 miod Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -114,7 +114,8 @@ ssh_get_authentication_socket(void)
114static int 114static int
115ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply) 115ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply)
116{ 116{
117 int l, len; 117 int l;
118 u_int len;
118 char buf[1024]; 119 char buf[1024];
119 120
120 /* Get the length of the message, and format it in the buffer. */ 121 /* Get the length of the message, and format it in the buffer. */
@@ -147,7 +148,7 @@ ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply
147 /* Extract the length, and check it for sanity. */ 148 /* Extract the length, and check it for sanity. */
148 len = GET_32BIT(buf); 149 len = GET_32BIT(buf);
149 if (len > 256 * 1024) 150 if (len > 256 * 1024)
150 fatal("Authentication response too long: %d", len); 151 fatal("Authentication response too long: %u", len);
151 152
152 /* Read the rest of the response in to the buffer. */ 153 /* Read the rest of the response in to the buffer. */
153 buffer_clear(reply); 154 buffer_clear(reply);
@@ -292,7 +293,7 @@ ssh_get_num_identities(AuthenticationConnection *auth, int version)
292 293
293 /* Get the number of entries in the response and check it for sanity. */ 294 /* Get the number of entries in the response and check it for sanity. */
294 auth->howmany = buffer_get_int(&auth->identities); 295 auth->howmany = buffer_get_int(&auth->identities);
295 if (auth->howmany > 1024) 296 if ((u_int)auth->howmany > 1024)
296 fatal("Too many identities in authentication reply: %d", 297 fatal("Too many identities in authentication reply: %d",
297 auth->howmany); 298 auth->howmany);
298 299