|
Lines 398-403
kex_send_ext_info(struct ssh *ssh)
Link Here
|
| 398 |
int r; |
398 |
int r; |
| 399 |
char *algs; |
399 |
char *algs; |
| 400 |
|
400 |
|
|
|
401 |
debug("Sending SSH2_MSG_EXT_INFO"); |
| 401 |
if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL) |
402 |
if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL) |
| 402 |
return SSH_ERR_ALLOC_FAIL; |
403 |
return SSH_ERR_ALLOC_FAIL; |
| 403 |
/* XXX filter algs list by allowed pubkey/hostbased types */ |
404 |
/* XXX filter algs list by allowed pubkey/hostbased types */ |
|
Lines 424-434
kex_send_newkeys(struct ssh *ssh)
Link Here
|
| 424 |
(r = sshpkt_send(ssh)) != 0) |
425 |
(r = sshpkt_send(ssh)) != 0) |
| 425 |
return r; |
426 |
return r; |
| 426 |
debug("SSH2_MSG_NEWKEYS sent"); |
427 |
debug("SSH2_MSG_NEWKEYS sent"); |
| 427 |
debug("expecting SSH2_MSG_NEWKEYS"); |
|
|
| 428 |
ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys); |
428 |
ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys); |
| 429 |
if (ssh->kex->ext_info_c) |
429 |
if (ssh->kex->ext_info_c && (ssh->kex->flags & KEX_INITIAL) != 0) |
| 430 |
if ((r = kex_send_ext_info(ssh)) != 0) |
430 |
if ((r = kex_send_ext_info(ssh)) != 0) |
| 431 |
return r; |
431 |
return r; |
|
|
432 |
debug("expecting SSH2_MSG_NEWKEYS"); |
| 432 |
return 0; |
433 |
return 0; |
| 433 |
} |
434 |
} |
| 434 |
|
435 |
|