diff options
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r-- | monitor_wrap.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index 4bdfd518e..5a0964b69 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.110 2019/01/19 21:43:07 djm Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.111 2019/01/19 21:43:56 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> |
@@ -76,8 +76,6 @@ | |||
76 | 76 | ||
77 | #include "ssherr.h" | 77 | #include "ssherr.h" |
78 | 78 | ||
79 | extern struct ssh *active_state; /* XXX */ | ||
80 | |||
81 | /* Imports */ | 79 | /* Imports */ |
82 | extern struct monitor *pmonitor; | 80 | extern struct monitor *pmonitor; |
83 | extern struct sshbuf *loginmsg; | 81 | extern struct sshbuf *loginmsg; |
@@ -220,12 +218,12 @@ mm_choose_dh(int min, int nbits, int max) | |||
220 | #endif | 218 | #endif |
221 | 219 | ||
222 | int | 220 | int |
223 | mm_sshkey_sign(struct sshkey *key, u_char **sigp, size_t *lenp, | 221 | mm_sshkey_sign(struct ssh *ssh, struct sshkey *key, u_char **sigp, size_t *lenp, |
224 | const u_char *data, size_t datalen, const char *hostkey_alg, u_int compat) | 222 | const u_char *data, size_t datalen, const char *hostkey_alg, u_int compat) |
225 | { | 223 | { |
226 | struct kex *kex = *pmonitor->m_pkex; | 224 | struct kex *kex = *pmonitor->m_pkex; |
227 | struct sshbuf *m; | 225 | struct sshbuf *m; |
228 | u_int ndx = kex->host_key_index(key, 0, active_state); | 226 | u_int ndx = kex->host_key_index(key, 0, ssh); |
229 | int r; | 227 | int r; |
230 | 228 | ||
231 | debug3("%s entering", __func__); | 229 | debug3("%s entering", __func__); |
@@ -439,8 +437,8 @@ mm_user_key_allowed(struct ssh *ssh, struct passwd *pw, struct sshkey *key, | |||
439 | } | 437 | } |
440 | 438 | ||
441 | int | 439 | int |
442 | mm_hostbased_key_allowed(struct passwd *pw, const char *user, const char *host, | 440 | mm_hostbased_key_allowed(struct ssh *ssh, struct passwd *pw, |
443 | struct sshkey *key) | 441 | const char *user, const char *host, struct sshkey *key) |
444 | { | 442 | { |
445 | return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0, NULL)); | 443 | return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0, NULL)); |
446 | } | 444 | } |
@@ -533,9 +531,8 @@ mm_sshkey_verify(const struct sshkey *key, const u_char *sig, size_t siglen, | |||
533 | } | 531 | } |
534 | 532 | ||
535 | void | 533 | void |
536 | mm_send_keystate(struct monitor *monitor) | 534 | mm_send_keystate(struct ssh *ssh, struct monitor *monitor) |
537 | { | 535 | { |
538 | struct ssh *ssh = active_state; /* XXX */ | ||
539 | struct sshbuf *m; | 536 | struct sshbuf *m; |
540 | int r; | 537 | int r; |
541 | 538 | ||