src/usr.bin/ssh/sshconnect2.c - diff

Return to sshconnect2.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.302, 2019/02/11 09:44:42

version 1.303, 2019/02/12 23:53:10

Line 298

static int userauth_none(struct ssh *);

static int userauth_pubkey(struct ssh *);

static void userauth_pubkey_cleanup(struct ssh *);

static int userauth_passwd(struct ssh *);

static int userauth_kbdint(struct ssh *);

static int userauth_hostbased(struct ssh *);

Line 314

Line 313

void userauth(struct ssh *, char *);

static void pubkey_cleanup(struct ssh *);

static int sign_and_send_pubkey(struct ssh *ssh, Identity *);

static void pubkey_prepare(Authctxt *);

static void pubkey_reset(Authctxt *);

Line 338

NULL},

{"publickey",

userauth_pubkey,

userauth_pubkey_cleanup,

NULL,

&options.pubkey_authentication,

NULL},

{"keyboard-interactive",

Line 407

ssh_dispatch_set(ssh, SSH2_MSG_EXT_INFO, &input_userauth_ext_info);

ssh_dispatch_set(ssh, SSH2_MSG_SERVICE_ACCEPT, &input_userauth_service_accept);

ssh_dispatch_run_fatal(ssh, DISPATCH_BLOCK, &authctxt.success); /* loop until success */

pubkey_cleanup(ssh);

ssh->authctxt = NULL;

ssh_dispatch_range(ssh, SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL);

Line 1630

Line 1631

}

static void

userauth_pubkey_cleanup(struct ssh *ssh)

pubkey_cleanup(struct ssh *ssh)

{

Authctxt *authctxt = (Authctxt *)ssh->authctxt;

Identity *id;

if (authctxt->agent_fd != -1) {