summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2016-02-29 12:15:15 +0000
committerColin Watson <cjwatson@debian.org>2016-03-08 11:51:22 +0000
commit46961f5704f8e86cea3e99253faad55aef4d8f35 (patch)
tree0dd97fa4fb649a62b4639fe2674380872b1f3e98 /monitor_wrap.c
parentc753fe267efb1b027424fa8706cf0385fc3d14c1 (diff)
parent85e40e87a75fb80a0bf893ac05a417d6c353537d (diff)
New upstream release (7.2).
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 679991178..eaf0a1294 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor_wrap.c,v 1.85 2015/05/01 03:23:51 djm Exp $ */ 1/* $OpenBSD: monitor_wrap.c,v 1.87 2016/01/14 16:17:40 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>
@@ -80,7 +80,6 @@
80#include "channels.h" 80#include "channels.h"
81#include "session.h" 81#include "session.h"
82#include "servconf.h" 82#include "servconf.h"
83#include "roaming.h"
84 83
85#include "ssherr.h" 84#include "ssherr.h"
86 85
@@ -218,7 +217,7 @@ mm_choose_dh(int min, int nbits, int max)
218 217
219int 218int
220mm_key_sign(Key *key, u_char **sigp, u_int *lenp, 219mm_key_sign(Key *key, u_char **sigp, u_int *lenp,
221 const u_char *data, u_int datalen) 220 const u_char *data, u_int datalen, const char *hostkey_alg)
222{ 221{
223 struct kex *kex = *pmonitor->m_pkex; 222 struct kex *kex = *pmonitor->m_pkex;
224 Buffer m; 223 Buffer m;
@@ -228,6 +227,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp,
228 buffer_init(&m); 227 buffer_init(&m);
229 buffer_put_int(&m, kex->host_key_index(key, 0, active_state)); 228 buffer_put_int(&m, kex->host_key_index(key, 0, active_state));
230 buffer_put_string(&m, data, datalen); 229 buffer_put_string(&m, data, datalen);
230 buffer_put_cstring(&m, hostkey_alg);
231 231
232 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); 232 mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m);
233 233