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

Return to sshconnect2.c CVS log

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

Diff for /src/usr.bin/ssh/sshconnect2.c between version 1.337 and 1.338

version 1.337, 2020/12/20 23:36:51

version 1.338, 2020/12/20 23:40:19

Line 87

u_char *session_id2 = NULL;

u_int session_id2_len = 0;

char *xxx_host;

static char *xxx_host;

struct sockaddr *xxx_hostaddr;

static struct sockaddr *xxx_hostaddr;

static const struct ssh_conn_info *xxx_conn_info;

static int

verify_host_key_callback(struct sshkey *hostkey, struct ssh *ssh)

{

if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1)

if (verify_host_key(xxx_host, xxx_hostaddr, hostkey,

xxx_conn_info) == -1)

fatal("Host key verification failed.");

return 0;

}

Line 111

Line 113

}

static char *

order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port)

order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port,

const struct ssh_conn_info *cinfo)

{

char *oavail = NULL, *avail = NULL, *first = NULL, *last = NULL;

char *alg = NULL, *hostname = NULL, *ret = NULL, *best = NULL;

Line 203

Line 206

}

void

ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port)

ssh_kex2(struct ssh *ssh, char *host, struct sockaddr *hostaddr, u_short port,

const struct ssh_conn_info *cinfo)

{

char *myproposal[PROPOSAL_MAX] = { KEX_CLIENT };

char *s, *all_key;

Line 211

Line 215

xxx_host = host;

xxx_hostaddr = hostaddr;

xxx_conn_info = cinfo;

* If the user has not specified HostkeyAlgorithms, or has only

Line 245

Line 250

/* Query known_hosts and prefer algorithms that appear there */

myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =

compat_pkalg_proposal(

order_hostkeyalgs(host, hostaddr, port));

order_hostkeyalgs(host, hostaddr, port, cinfo));

} else {

/* Use specified HostkeyAlgorithms exactly */

myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =