diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-01-19 20:16:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-01-20 09:19:39 +1100 |
commit | 57d10cbe861a235dd269c74fb2fe248469ecee9d (patch) | |
tree | c65deed24700490bd3b20300c4829d4d5466ff6d /monitor.c | |
parent | 3fdc88a0def4f86aa88a5846ac079dc964c0546a (diff) |
upstream commit
adapt kex to sshbuf and struct ssh; ok djm@
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.139 2015/01/19 19:52:16 markus Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.140 2015/01/19 20:16:15 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> |
@@ -717,7 +717,7 @@ mm_answer_sign(int sock, Buffer *m) | |||
717 | datafellows)) != 0) | 717 | datafellows)) != 0) |
718 | fatal("%s: sshkey_sign failed: %s", | 718 | fatal("%s: sshkey_sign failed: %s", |
719 | __func__, ssh_err(r)); | 719 | __func__, ssh_err(r)); |
720 | } else if ((key = get_hostkey_public_by_index(keyid)) != NULL && | 720 | } else if ((key = get_hostkey_public_by_index(keyid, active_state)) != NULL && |
721 | auth_sock > 0) { | 721 | auth_sock > 0) { |
722 | if ((r = ssh_agent_sign(auth_sock, key, &signature, &siglen, | 722 | if ((r = ssh_agent_sign(auth_sock, key, &signature, &siglen, |
723 | p, datlen, datafellows)) != 0) { | 723 | p, datlen, datafellows)) != 0) { |