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 /packet.c | |
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 'packet.c')
-rw-r--r-- | packet.c | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.213 2015/07/29 04:43:06 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 |
@@ -1933,6 +1933,17 @@ sshpkt_fatal(struct ssh *ssh, const char *tag, int r) | |||
1933 | cleanup_exit(255); | 1933 | cleanup_exit(255); |
1934 | } | 1934 | } |
1935 | /* FALLTHROUGH */ | 1935 | /* FALLTHROUGH */ |
1936 | case SSH_ERR_NO_CIPHER_ALG_MATCH: | ||
1937 | case SSH_ERR_NO_MAC_ALG_MATCH: | ||
1938 | case SSH_ERR_NO_COMPRESS_ALG_MATCH: | ||
1939 | case SSH_ERR_NO_KEX_ALG_MATCH: | ||
1940 | case SSH_ERR_NO_HOSTKEY_ALG_MATCH: | ||
1941 | if (ssh && ssh->kex && ssh->kex->failed_choice) { | ||
1942 | fatal("Unable to negotiate with %.200s: %s. " | ||
1943 | "Their offer: %s", ssh_remote_ipaddr(ssh), | ||
1944 | ssh_err(r), ssh->kex->failed_choice); | ||
1945 | } | ||
1946 | /* FALLTHROUGH */ | ||
1936 | default: | 1947 | default: |
1937 | fatal("%s%sConnection to %.200s: %s", | 1948 | fatal("%s%sConnection to %.200s: %s", |
1938 | tag != NULL ? tag : "", tag != NULL ? ": " : "", | 1949 | tag != NULL ? tag : "", tag != NULL ? ": " : "", |