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.183 and 1.184

version 1.183, 2018/07/09 21:53:45

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

Line 1454

gss_OID_desc goid;

OM_uint32 major;

size_t len;

u_char *p;

int r;

if (!options.gss_authentication)

fatal("%s: GSSAPI authentication not enabled", __func__);

if ((r = sshbuf_get_string(m, &goid.elements, &len)) != 0)

if ((r = sshbuf_get_string(m, &p, &len)) != 0)

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

goid.elements = p;

goid.length = len;

major = ssh_gssapi_server_ctx(&gsscontext, &goid);

Line 1491

Line 1493

if (!options.gss_authentication)

fatal("%s: GSSAPI authentication not enabled", __func__);

if ((r = sshbuf_get_string(m, &in.value, &in.length)) != 0)

if ((r = ssh_gssapi_get_buffer_desc(m, &in)) != 0)

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

major = ssh_gssapi_accept_ctx(gsscontext, &in, &out, &flags);

free(in.value);

Line 1518

Line 1520

{

gss_buffer_desc gssbuf, mic;

OM_uint32 ret;

int r;

if (!options.gss_authentication)

fatal("%s: GSSAPI authentication not enabled", __func__);

if ((r = sshbuf_get_string(m, &gssbuf.value, &gssbuf.length)) != 0 ||

if ((r = ssh_gssapi_get_buffer_desc(m, &gssbuf)) != 0 ||

(r = sshbuf_get_string(m, &mic.value, &mic.length)) != 0)

(r = ssh_gssapi_get_buffer_desc(m, &mic)) != 0)

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

ret = ssh_gssapi_checkmic(gsscontext, &gssbuf, &mic);

Line 1546

Line 1549

int

mm_answer_gss_userok(int sock, struct sshbuf *m)

{

int authenticated;

int r, authenticated;

const char *displayname;

if (!options.gss_authentication)