diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 22:43:56 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-01-19 23:45:18 +0100 |
| commit | 04c091fc199f17dacf8921df0a06634b454e2722 (patch) | |
| tree | 76b75b5cf39f940bfc418fa7fe6e9ae3dc5c2569 /serverloop.c | |
| parent | upstream: convert monitor.c to new packet API (diff) | |
| download | openssh-04c091fc199f17dacf8921df0a06634b454e2722.tar.xz openssh-04c091fc199f17dacf8921df0a06634b454e2722.zip | |
upstream: remove last references to active_state
with & ok markus@
OpenBSD-Commit-ID: 78619a50ea7e4ca2f3b54d4658b3227277490ba2
Diffstat (limited to 'serverloop.c')
| -rw-r--r-- | serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c index c60758e88..afb32fd34 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: serverloop.c,v 1.211 2019/01/19 21:40:48 djm Exp $ */ +/* $OpenBSD: serverloop.c,v 1.212 2019/01/19 21:43:56 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -782,9 +782,9 @@ server_input_hostkeys_prove(struct ssh *ssh, struct sshbuf **respp) (r = sshbuf_put_string(sigbuf, ssh->kex->session_id, ssh->kex->session_id_len)) != 0 || (r = sshkey_puts(key, sigbuf)) != 0 || - (r = ssh->kex->sign(key_prv, key_pub, &sig, &slen, + (r = ssh->kex->sign(ssh, key_prv, key_pub, &sig, &slen, sshbuf_ptr(sigbuf), sshbuf_len(sigbuf), - use_kexsigtype ? ssh->kex->hostkey_alg : NULL, 0)) != 0 || + use_kexsigtype ? ssh->kex->hostkey_alg : NULL)) != 0 || (r = sshbuf_put_string(resp, sig, slen)) != 0) { error("%s: couldn't prepare signature: %s", __func__, ssh_err(r)); |