diff options
author | djm@openbsd.org <djm@openbsd.org> | 2015-07-29 04:43:06 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-07-29 19:35:42 +1000 |
commit | f319912b0d0e1675b8bb051ed8213792c788bcb2 (patch) | |
tree | bbfbfae6e50b6059202c3ee1ab3be2599292e3c9 /kex.h | |
parent | b6ea0e573042eb85d84defb19227c89eb74cf05a (diff) |
upstream commit
include the peer's offer when logging a failure to
negotiate a mutual set of algorithms (kex, pubkey, ciphers, etc.) ok markus@
Upstream-ID: bbb8caabf5c01790bb845f5ce135565248d7c796
Diffstat (limited to 'kex.h')
-rw-r--r-- | kex.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: kex.h,v 1.71 2015/02/16 22:13:32 djm Exp $ */ | 1 | /* $OpenBSD: kex.h,v 1.72 2015/07/29 04:43:06 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
@@ -141,6 +141,7 @@ struct kex { | |||
141 | int ec_nid; | 141 | int ec_nid; |
142 | char *client_version_string; | 142 | char *client_version_string; |
143 | char *server_version_string; | 143 | char *server_version_string; |
144 | char *failed_choice; | ||
144 | int (*verify_host_key)(struct sshkey *, struct ssh *); | 145 | int (*verify_host_key)(struct sshkey *, struct ssh *); |
145 | struct sshkey *(*load_host_public_key)(int, int, struct ssh *); | 146 | struct sshkey *(*load_host_public_key)(int, int, struct ssh *); |
146 | struct sshkey *(*load_host_private_key)(int, int, struct ssh *); | 147 | struct sshkey *(*load_host_private_key)(int, int, struct ssh *); |