commit 278f907a2d6d00d6f52a11bf9577648aadbf0994
author Damien Miller <djm@mindrot.org> Fri Dec 21 15:00:19 2001 +1100
committer Damien Miller <djm@mindrot.org> Fri Dec 21 15:00:19 2001 +1100
tree 50f885a7fd73b813754e3b675e810dc01ba78b78
parent e737856350287104a12f5a97c81fad1f7bcd7096

   - 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@

sshconnect2.c

diff --git a/sshconnect2.c b/sshconnect2.c
index 8689da0..d7143cd 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.88 2001/12/19 07:18:56 deraadt Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.89 2001/12/20 22:50:24 djm Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -174,12 +174,12 @@
 	int	*batch_flag;	/* flag in option struct that disables method */
 };
 
-void	input_userauth_success(int, int, void *);
-void	input_userauth_failure(int, int, void *);
-void	input_userauth_banner(int, int, void *);
-void	input_userauth_error(int, int, void *);
-void	input_userauth_info_req(int, int, void *);
-void	input_userauth_pk_ok(int, int, void *);
+void	input_userauth_success(int, int, u_int32_t, void *);
+void	input_userauth_failure(int, int, u_int32_t, void *);
+void	input_userauth_banner(int, int, u_int32_t, void *);
+void	input_userauth_error(int, int, u_int32_t, void *);
+void	input_userauth_info_req(int, int, u_int32_t, void *);
+void	input_userauth_pk_ok(int, int, u_int32_t, void *);
 
 int	userauth_none(Authctxt *);
 int	userauth_pubkey(Authctxt *);
@@ -308,13 +308,13 @@
 	}
 }
 void
-input_userauth_error(int type, int plen, void *ctxt)
+input_userauth_error(int type, int plen, u_int32_t seq, void *ctxt)
 {
 	fatal("input_userauth_error: bad message during authentication: "
 	   "type %d", type);
 }
 void
-input_userauth_banner(int type, int plen, void *ctxt)
+input_userauth_banner(int type, int plen, u_int32_t seq, void *ctxt)
 {
 	char *msg, *lang;
 	debug3("input_userauth_banner");
@@ -325,7 +325,7 @@
 	xfree(lang);
 }
 void
-input_userauth_success(int type, int plen, void *ctxt)
+input_userauth_success(int type, int plen, u_int32_t seq, void *ctxt)
 {
 	Authctxt *authctxt = ctxt;
 	if (authctxt == NULL)
@@ -336,7 +336,7 @@
 	authctxt->success = 1;			/* break out */
 }
 void
-input_userauth_failure(int type, int plen, void *ctxt)
+input_userauth_failure(int type, int plen, u_int32_t seq, void *ctxt)
 {
 	Authctxt *authctxt = ctxt;
 	char *authlist = NULL;
@@ -357,7 +357,7 @@
 	userauth(authctxt, authlist);
 }
 void
-input_userauth_pk_ok(int type, int plen, void *ctxt)
+input_userauth_pk_ok(int type, int plen, u_int32_t seq, void *ctxt)
 {
 	Authctxt *authctxt = ctxt;
 	Key *key = NULL;
@@ -768,7 +768,7 @@
  * parse INFO_REQUEST, prompt user and send INFO_RESPONSE
  */
 void
-input_userauth_info_req(int type, int plen, void *ctxt)
+input_userauth_info_req(int type, int plen, u_int32_t seq, void *ctxt)
 {
 	Authctxt *authctxt = ctxt;
 	char *name, *inst, *lang, *prompt, *response;