src/usr.bin/ssh/gss-genr.c - diff

Return to gss-genr.c CVS log

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

Diff for /src/usr.bin/ssh/gss-genr.c between version 1.24 and 1.25

version 1.24, 2016/09/12 01:22:38

version 1.25, 2018/07/09 21:37:55

Line 32

#include <limits.h>

#include "xmalloc.h"

#include "buffer.h"

#include "ssherr.h"

#include "sshbuf.h"

#include "log.h"

#include "ssh2.h"

Line 89

Line 90

OM_uint32 lmin;

gss_buffer_desc msg = GSS_C_EMPTY_BUFFER;

OM_uint32 ctx;

Buffer b;

struct sshbuf *b;

char *ret;

int r;

buffer_init(&b);

if ((b = sshbuf_new()) == NULL)

fatal("%s: sshbuf_new failed", __func__);

if (major_status != NULL)

*major_status = ctxt->major;

Line 105

Line 108

gss_display_status(&lmin, ctxt->major,

GSS_C_GSS_CODE, ctxt->oid, &ctx, &msg);

buffer_append(&b, msg.value, msg.length);

if ((r = sshbuf_put(b, msg.value, msg.length)) != 0 ||

buffer_put_char(&b, '\n');

(r = sshbuf_put_u8(b, '\n')) != 0)

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

gss_release_buffer(&lmin, &msg);

} while (ctx != 0);

Line 116

Line 120

gss_display_status(&lmin, ctxt->minor,

GSS_C_MECH_CODE, ctxt->oid, &ctx, &msg);

buffer_append(&b, msg.value, msg.length);

if ((r = sshbuf_put(b, msg.value, msg.length)) != 0 ||

buffer_put_char(&b, '\n');

(r = sshbuf_put_u8(b, '\n')) != 0)

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

gss_release_buffer(&lmin, &msg);

} while (ctx != 0);

buffer_put_char(&b, '\0');

if ((r = sshbuf_put_u8(b, '\n')) != 0)

ret = xmalloc(buffer_len(&b));

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

buffer_get(&b, ret, buffer_len(&b));

ret = xstrdup((const char *)sshbuf_ptr(b));

buffer_free(&b);

sshbuf_free(b);

return (ret);

}

Line 233

Line 238

}

void

ssh_gssapi_buildmic(Buffer *b, const char *user, const char *service,

ssh_gssapi_buildmic(struct sshbuf *b, const char *user, const char *service,

const char *context)

{

buffer_init(b);

int r;

buffer_put_string(b, session_id2, session_id2_len);

buffer_put_char(b, SSH2_MSG_USERAUTH_REQUEST);

sshbuf_reset(b);

buffer_put_cstring(b, user);

if ((r = sshbuf_put_string(b, session_id2, session_id2_len)) != 0 ||

buffer_put_cstring(b, service);

(r = sshbuf_put_u8(b, SSH2_MSG_USERAUTH_REQUEST)) != 0 ||

buffer_put_cstring(b, context);

(r = sshbuf_put_cstring(b, user)) != 0 ||

(r = sshbuf_put_cstring(b, service)) != 0 ||

(r = sshbuf_put_cstring(b, context)) != 0)

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

}

int