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

Return to monitor_wrap.c CVS log

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

version 1.105, 2018/07/10 09:36:58

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

Line 47

#include "dh.h"

#endif

#include "sshbuf.h"

#include "key.h"

#include "sshkey.h"

#include "cipher.h"

#include "kex.h"

#include "hostfile.h"

Line 214

#endif

int

mm_key_sign(struct sshkey *key, u_char **sigp, u_int *lenp,

mm_sshkey_sign(struct sshkey *key, u_char **sigp, size_t *lenp,

const u_char *data, u_int datalen, const char *hostkey_alg)

const u_char *data, size_t datalen, const char *hostkey_alg, u_int compat)

{

struct kex *kex = *pmonitor->m_pkex;

struct sshbuf *m;

size_t xxxlen;

u_int ndx = kex->host_key_index(key, 0, active_state);

int r;

Line 229

Line 228

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

if ((r = sshbuf_put_u32(m, ndx)) != 0 ||

(r = sshbuf_put_string(m, data, datalen)) != 0 ||

(r = sshbuf_put_cstring(m, hostkey_alg)) != 0)

(r = sshbuf_put_cstring(m, hostkey_alg)) != 0 ||

(r = sshbuf_put_u32(m, compat)) != 0)

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

mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, m);

debug3("%s: waiting for MONITOR_ANS_SIGN", __func__);

mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_SIGN, m);

if ((r = sshbuf_get_string(m, sigp, &xxxlen)) != 0)

if ((r = sshbuf_get_string(m, sigp, lenp)) != 0)

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

if (xxxlen > 0xffffffff)

fatal("%s: bad length %zu", __func__, xxxlen);

*lenp = xxxlen; /* XXX fix API: size_t vs u_int */

sshbuf_free(m);

return (0);