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

Return to monitor.c CVS log

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

Diff for /src/usr.bin/ssh/monitor.c between version 1.184 and 1.185

version 1.184, 2018/07/10 09:13:30

version 1.185, 2018/07/11 18:53:29

Line 51

#include "atomicio.h"

#include "xmalloc.h"

#include "ssh.h"

#include "key.h"

#include "sshkey.h"

#include "sshbuf.h"

#include "hostfile.h"

#include "auth.h"

Line 551

char *alg = NULL;

size_t datlen, siglen, alglen;

int r, is_proof = 0;

u_int keyid;

u_int keyid, compat;

const char proof_req[] = "hostkeys-prove-00@openssh.com";

debug3("%s", __func__);

if ((r = sshbuf_get_u32(m, &keyid)) != 0 ||

(r = sshbuf_get_string(m, &p, &datlen)) != 0 ||

(r = sshbuf_get_cstring(m, &alg, &alglen)) != 0)

(r = sshbuf_get_cstring(m, &alg, &alglen)) != 0 ||

(r = sshbuf_get_u32(m, &compat)) != 0)

fatal("%s: buffer error: %s", __func__, ssh_err(r));

if (keyid > INT_MAX)

fatal("%s: invalid key ID", __func__);

Line 608

Line 609

if ((key = get_hostkey_by_index(keyid)) != NULL) {

if ((r = sshkey_sign(key, &signature, &siglen, p, datlen, alg,

datafellows)) != 0)

compat)) != 0)

fatal("%s: sshkey_sign failed: %s",

__func__, ssh_err(r));

} else if ((key = get_hostkey_public_by_index(keyid, ssh)) != NULL &&

auth_sock > 0) {

if ((r = ssh_agent_sign(auth_sock, key, &signature, &siglen,

p, datlen, alg, datafellows)) != 0) {

p, datlen, alg, compat)) != 0) {

fatal("%s: ssh_agent_sign failed: %s",

__func__, ssh_err(r));

}

Line 895

Line 896

if (key != NULL && authctxt->valid) {

/* These should not make it past the privsep child */

if (key_type_plain(key->type) == KEY_RSA &&

if (sshkey_type_plain(key->type) == KEY_RSA &&

(datafellows & SSH_BUG_RSASIGMD5) != 0)

fatal("%s: passed a SSH_BUG_RSASIGMD5 key", __func__);