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.158 and 1.159

version 1.158, 2016/03/07 19:02:43

version 1.159, 2016/05/02 08:49:03

Line 37

#include <errno.h>

#include <fcntl.h>

#include <limits.h>

#include <paths.h>

#include <poll.h>

#include <pwd.h>

Line 592

Line 593

u_char *p = NULL, *signature = NULL;

char *alg = NULL;

size_t datlen, siglen, alglen;

int r, keyid, is_proof = 0;

int r, is_proof = 0;

u_int keyid;

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

debug3("%s", __func__);

Line 601

Line 603

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

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

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

if (keyid > INT_MAX)

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

* Supported KEX types use SHA1 (20 bytes), SHA256 (32 bytes),

Line 1000

Line 1004

monitor_valid_userblob(u_char *data, u_int datalen)

{

Buffer b;

char *p, *userstyle;

u_char *p;

char *userstyle, *cp;

u_int len;

int fail = 0;

Line 1025

Line 1030

}

if (buffer_get_char(&b) != SSH2_MSG_USERAUTH_REQUEST)

fail++;

p = buffer_get_cstring(&b, NULL);

cp = buffer_get_cstring(&b, NULL);

xasprintf(&userstyle, "%s%s%s", authctxt->user,

authctxt->style ? ":" : "",

authctxt->style ? authctxt->style : "");

if (strcmp(userstyle, p) != 0) {

if (strcmp(userstyle, cp) != 0) {

logit("wrong user name passed to monitor: expected %s != %.100s",

logit("wrong user name passed to monitor: "

userstyle, p);

"expected %s != %.100s", userstyle, cp);

fail++;

}

free(userstyle);

free(p);

free(cp);

buffer_skip_string(&b);

if (datafellows & SSH_BUG_PKAUTH) {

if (!buffer_get_char(&b))

fail++;

} else {

p = buffer_get_cstring(&b, NULL);

cp = buffer_get_cstring(&b, NULL);

if (strcmp("publickey", p) != 0)

if (strcmp("publickey", cp) != 0)

fail++;

free(p);

free(cp);

if (!buffer_get_char(&b))

fail++;

buffer_skip_string(&b);