summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-01-19 20:16:15 +0000
committerDamien Miller <djm@mindrot.org>2015-01-20 09:19:39 +1100
commit57d10cbe861a235dd269c74fb2fe248469ecee9d (patch)
treec65deed24700490bd3b20300c4829d4d5466ff6d /monitor_wrap.c
parent3fdc88a0def4f86aa88a5846ac079dc964c0546a (diff)
upstream commit
adapt kex to sshbuf and struct ssh; ok djm@
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 84df481d8..c0935dc69 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.82 2015/01/19 19:52:16 markus Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.83 2015/01/19 20:16:15 markus Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -221,13 +221,13 @@ mm_choose_dh(int min, int nbits, int max)
221int 221int
222mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) 222mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen)
223{ 223{
224 Kex *kex = *pmonitor->m_pkex; 224 struct kex *kex = *pmonitor->m_pkex;
225 Buffer m; 225 Buffer m;
226 226
227 debug3("%s entering", __func__); 227 debug3("%s entering", __func__);
228 228
229 buffer_init(&m); 229 buffer_init(&m);
230 buffer_put_int(&m, kex->host_key_index(key)); 230 buffer_put_int(&m, kex->host_key_index(key, active_state));
231 buffer_put_string(&m, data, datalen); 231 buffer_put_string(&m, data, datalen);
232 232
233 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); 233 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m);