diff options
author | Damien Miller <djm@mindrot.org> | 2001-12-21 15:00:19 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2001-12-21 15:00:19 +1100 |
commit | 278f907a2d6d00d6f52a11bf9577648aadbf0994 (patch) | |
tree | 50f885a7fd73b813754e3b675e810dc01ba78b78 /auth2.c | |
parent | e737856350287104a12f5a97c81fad1f7bcd7096 (diff) |
- djm@cvs.openbsd.org 2001/12/20 22:50:24
[auth2.c auth2-chall.c channels.c channels.h clientloop.c dispatch.c]
[dispatch.h kex.c kex.h packet.c packet.h serverloop.c ssh.c]
[sshconnect2.c]
Conformance fix: we should send failing packet sequence number when
responding with a SSH_MSG_UNIMPLEMENTED message. Spotted by
yakk@yakk.dot.net; ok markus@
Diffstat (limited to 'auth2.c')
-rw-r--r-- | auth2.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.77 2001/12/19 07:18:56 deraadt Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.78 2001/12/20 22:50:24 djm Exp $"); #include <openssl/evp.h> @@ -69,9 +69,9 @@ struct Authmethod { /* protocol */ -static void input_service_request(int, int, void *); -static void input_userauth_request(int, int, void *); -static void protocol_error(int, int, void *); +static void input_service_request(int, int, u_int32_t, void *); +static void input_userauth_request(int, int, u_int32_t, void *); +static void protocol_error(int, int, u_int32_t, void *); /* helper */ static Authmethod *authmethod_lookup(const char *); @@ -130,17 +130,17 @@ do_authentication2(void) } static void -protocol_error(int type, int plen, void *ctxt) +protocol_error(int type, int plen, u_int32_t seq, void *ctxt) { log("auth: protocol error: type %d plen %d", type, plen); packet_start(SSH2_MSG_UNIMPLEMENTED); - packet_put_int(0); + packet_put_int(seq); packet_send(); packet_write_wait(); } static void -input_service_request(int type, int plen, void *ctxt) +input_service_request(int type, int plen, u_int32_t seq, void *ctxt) { Authctxt *authctxt = ctxt; u_int len; @@ -173,7 +173,7 @@ input_service_request(int type, int plen, void *ctxt) } static void -input_userauth_request(int type, int plen, void *ctxt) +input_userauth_request(int type, int plen, u_int32_t seq, void *ctxt) { Authctxt *authctxt = ctxt; Authmethod *m = NULL; |