diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 21:43:56 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-20 09:45:18 +1100 |
commit | 04c091fc199f17dacf8921df0a06634b454e2722 (patch) | |
tree | 76b75b5cf39f940bfc418fa7fe6e9ae3dc5c2569 /serverloop.c | |
parent | ec00f918b8ad90295044266c433340a8adc93452 (diff) |
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 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.211 2019/01/19 21:40:48 djm Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.212 2019/01/19 21:43:56 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
782 | (r = sshbuf_put_string(sigbuf, | 782 | (r = sshbuf_put_string(sigbuf, |
783 | ssh->kex->session_id, ssh->kex->session_id_len)) != 0 || | 783 | ssh->kex->session_id, ssh->kex->session_id_len)) != 0 || |
784 | (r = sshkey_puts(key, sigbuf)) != 0 || | 784 | (r = sshkey_puts(key, sigbuf)) != 0 || |
785 | (r = ssh->kex->sign(key_prv, key_pub, &sig, &slen, | 785 | (r = ssh->kex->sign(ssh, key_prv, key_pub, &sig, &slen, |
786 | sshbuf_ptr(sigbuf), sshbuf_len(sigbuf), | 786 | sshbuf_ptr(sigbuf), sshbuf_len(sigbuf), |
787 | use_kexsigtype ? ssh->kex->hostkey_alg : NULL, 0)) != 0 || | 787 | use_kexsigtype ? ssh->kex->hostkey_alg : NULL)) != 0 || |
788 | (r = sshbuf_put_string(resp, sig, slen)) != 0) { | 788 | (r = sshbuf_put_string(resp, sig, slen)) != 0) { |
789 | error("%s: couldn't prepare signature: %s", | 789 | error("%s: couldn't prepare signature: %s", |
790 | __func__, ssh_err(r)); | 790 | __func__, ssh_err(r)); |