summaryrefslogtreecommitdiff
path: root/sshconnect2.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshconnect2.c')
-rw-r--r--sshconnect2.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/sshconnect2.c b/sshconnect2.c
index 7f28ab51e..215f76ca2 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.104 2002/06/19 00:27:55 deraadt Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.105 2002/06/23 03:30:17 deraadt Exp $");
27 27
28#include "ssh.h" 28#include "ssh.h"
29#include "ssh2.h" 29#include "ssh2.h"
@@ -299,12 +299,14 @@ userauth(Authctxt *authctxt, char *authlist)
299 } 299 }
300 } 300 }
301} 301}
302
302void 303void
303input_userauth_error(int type, u_int32_t seq, void *ctxt) 304input_userauth_error(int type, u_int32_t seq, void *ctxt)
304{ 305{
305 fatal("input_userauth_error: bad message during authentication: " 306 fatal("input_userauth_error: bad message during authentication: "
306 "type %d", type); 307 "type %d", type);
307} 308}
309
308void 310void
309input_userauth_banner(int type, u_int32_t seq, void *ctxt) 311input_userauth_banner(int type, u_int32_t seq, void *ctxt)
310{ 312{
@@ -316,6 +318,7 @@ input_userauth_banner(int type, u_int32_t seq, void *ctxt)
316 xfree(msg); 318 xfree(msg);
317 xfree(lang); 319 xfree(lang);
318} 320}
321
319void 322void
320input_userauth_success(int type, u_int32_t seq, void *ctxt) 323input_userauth_success(int type, u_int32_t seq, void *ctxt)
321{ 324{
@@ -327,6 +330,7 @@ input_userauth_success(int type, u_int32_t seq, void *ctxt)
327 clear_auth_state(authctxt); 330 clear_auth_state(authctxt);
328 authctxt->success = 1; /* break out */ 331 authctxt->success = 1; /* break out */
329} 332}
333
330void 334void
331input_userauth_failure(int type, u_int32_t seq, void *ctxt) 335input_userauth_failure(int type, u_int32_t seq, void *ctxt)
332{ 336{
@@ -375,7 +379,7 @@ input_userauth_pk_ok(int type, u_int32_t seq, void *ctxt)
375 } 379 }
376 packet_check_eom(); 380 packet_check_eom();
377 381
378 debug("input_userauth_pk_ok: pkalg %s blen %d lastkey %p hint %d", 382 debug("input_userauth_pk_ok: pkalg %s blen %u lastkey %p hint %d",
379 pkalg, blen, authctxt->last_key, authctxt->last_key_hint); 383 pkalg, blen, authctxt->last_key, authctxt->last_key_hint);
380 384
381 do { 385 do {
@@ -894,9 +898,7 @@ input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
894} 898}
895 899
896static int 900static int
897ssh_keysign( 901ssh_keysign(Key *key, u_char **sigp, u_int *lenp,
898 Key *key,
899 u_char **sigp, u_int *lenp,
900 u_char *data, u_int datalen) 902 u_char *data, u_int datalen)
901{ 903{
902 Buffer b; 904 Buffer b;
@@ -1098,6 +1100,7 @@ authmethod_lookup(const char *name)
1098static Authmethod *current = NULL; 1100static Authmethod *current = NULL;
1099static char *supported = NULL; 1101static char *supported = NULL;
1100static char *preferred = NULL; 1102static char *preferred = NULL;
1103
1101/* 1104/*
1102 * Given the authentication method list sent by the server, return the 1105 * Given the authentication method list sent by the server, return the
1103 * next method we should try. If the server initially sends a nil list, 1106 * next method we should try. If the server initially sends a nil list,