diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-02-16 22:13:32 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-02-17 09:32:32 +1100 |
commit | 523463a3a2a9bfc6cfc5afa01bae9147f76a37cc (patch) | |
tree | 772be92cee9553c19d51b4570113c3d4de0c2d8b /monitor_wrap.c | |
parent | 6c5c949782d86a6e7d58006599c7685bfcd01685 (diff) |
upstream commit
Revise hostkeys@openssh.com hostkey learning extension.
The client will not ask the server to prove ownership of the private
halves of any hitherto-unseen hostkeys it offers to the client.
Allow UpdateHostKeys option to take an 'ask' argument to let the
user manually review keys offered.
ok markus@
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index c0935dc69..b379f0555 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.83 2015/01/19 20:16:15 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.84 2015/02/16 22:13:32 djm 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> |
@@ -219,7 +219,8 @@ mm_choose_dh(int min, int nbits, int max) | |||
219 | #endif | 219 | #endif |
220 | 220 | ||
221 | int | 221 | int |
222 | mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) | 222 | mm_key_sign(Key *key, u_char **sigp, u_int *lenp, |
223 | const u_char *data, u_int datalen) | ||
223 | { | 224 | { |
224 | struct kex *kex = *pmonitor->m_pkex; | 225 | struct kex *kex = *pmonitor->m_pkex; |
225 | Buffer m; | 226 | Buffer m; |
@@ -227,7 +228,7 @@ mm_key_sign(Key *key, u_char **sigp, u_int *lenp, u_char *data, u_int datalen) | |||
227 | debug3("%s entering", __func__); | 228 | debug3("%s entering", __func__); |
228 | 229 | ||
229 | buffer_init(&m); | 230 | buffer_init(&m); |
230 | buffer_put_int(&m, kex->host_key_index(key, active_state)); | 231 | buffer_put_int(&m, kex->host_key_index(key, 0, active_state)); |
231 | buffer_put_string(&m, data, datalen); | 232 | buffer_put_string(&m, data, datalen); |
232 | 233 | ||
233 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); | 234 | mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_SIGN, &m); |