diff options
author | Damien Miller <djm@mindrot.org> | 2005-06-17 12:59:34 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-06-17 12:59:34 +1000 |
commit | eccb9de72aa29da5a3fad87a4287b32438689c1f (patch) | |
tree | 9b8ef20a7e454b984e0ad67b54b2bdc5577aa2fa /authfd.c | |
parent | 677257fe07dd2b9a58817e1d42fc2c25bb618a4d (diff) |
- djm@cvs.openbsd.org 2005/06/17 02:44:33
[auth-rsa.c auth.c auth1.c auth2-chall.c auth2-gss.c authfd.c authfile.c]
[bufaux.c canohost.c channels.c cipher.c clientloop.c dns.c gss-serv.c]
[kex.c kex.h key.c mac.c match.c misc.c packet.c packet.h scp.c]
[servconf.c session.c session.h sftp-client.c sftp-server.c sftp.c]
[ssh-keyscan.c ssh-rsa.c sshconnect.c sshconnect1.c sshconnect2.c sshd.c]
make this -Wsign-compare clean; ok avsm@ markus@
NB. auth1.c changes not committed yet (conflicts with uncommitted sync)
NB2. more work may be needed to make portable Wsign-compare clean
Diffstat (limited to 'authfd.c')
-rw-r--r-- | authfd.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: authfd.c,v 1.65 2005/05/24 17:32:43 avsm Exp $"); | 38 | RCSID("$OpenBSD: authfd.c,v 1.66 2005/06/17 02:44:32 djm Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -114,8 +114,7 @@ ssh_get_authentication_socket(void) | |||
114 | static int | 114 | static int |
115 | ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply) | 115 | ssh_request_reply(AuthenticationConnection *auth, Buffer *request, Buffer *reply) |
116 | { | 116 | { |
117 | int l; | 117 | u_int l, len; |
118 | u_int len; | ||
119 | char buf[1024]; | 118 | char buf[1024]; |
120 | 119 | ||
121 | /* Get the length of the message, and format it in the buffer. */ | 120 | /* Get the length of the message, and format it in the buffer. */ |
@@ -302,6 +301,7 @@ ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int versi | |||
302 | Key * | 301 | Key * |
303 | ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version) | 302 | ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version) |
304 | { | 303 | { |
304 | int keybits; | ||
305 | u_int bits; | 305 | u_int bits; |
306 | u_char *blob; | 306 | u_char *blob; |
307 | u_int blen; | 307 | u_int blen; |
@@ -322,7 +322,8 @@ ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int versio | |||
322 | buffer_get_bignum(&auth->identities, key->rsa->e); | 322 | buffer_get_bignum(&auth->identities, key->rsa->e); |
323 | buffer_get_bignum(&auth->identities, key->rsa->n); | 323 | buffer_get_bignum(&auth->identities, key->rsa->n); |
324 | *comment = buffer_get_string(&auth->identities, NULL); | 324 | *comment = buffer_get_string(&auth->identities, NULL); |
325 | if (bits != BN_num_bits(key->rsa->n)) | 325 | keybits = BN_num_bits(key->rsa->n); |
326 | if (keybits < 0 || bits != (u_int)keybits) | ||
326 | logit("Warning: identity keysize mismatch: actual %d, announced %u", | 327 | logit("Warning: identity keysize mismatch: actual %d, announced %u", |
327 | BN_num_bits(key->rsa->n), bits); | 328 | BN_num_bits(key->rsa->n), bits); |
328 | break; | 329 | break; |