diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-07-29 06:43:06 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-07-29 11:35:42 +0200 |
| commit | f319912b0d0e1675b8bb051ed8213792c788bcb2 (patch) | |
| tree | bbfbfae6e50b6059202c3ee1ab3be2599292e3c9 /packet.c | |
| parent | upstream commit (diff) | |
| download | openssh-f319912b0d0e1675b8bb051ed8213792c788bcb2.tar.xz openssh-f319912b0d0e1675b8bb051ed8213792c788bcb2.zip | |
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 @@ -/* $OpenBSD: packet.c,v 1.212 2015/05/01 07:10:01 djm Exp $ */ +/* $OpenBSD: packet.c,v 1.213 2015/07/29 04:43:06 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * 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) cleanup_exit(255); } /* FALLTHROUGH */ + case SSH_ERR_NO_CIPHER_ALG_MATCH: + case SSH_ERR_NO_MAC_ALG_MATCH: + case SSH_ERR_NO_COMPRESS_ALG_MATCH: + case SSH_ERR_NO_KEX_ALG_MATCH: + case SSH_ERR_NO_HOSTKEY_ALG_MATCH: + if (ssh && ssh->kex && ssh->kex->failed_choice) { + fatal("Unable to negotiate with %.200s: %s. " + "Their offer: %s", ssh_remote_ipaddr(ssh), + ssh_err(r), ssh->kex->failed_choice); + } + /* FALLTHROUGH */ default: fatal("%s%sConnection to %.200s: %s", tag != NULL ? tag : "", tag != NULL ? ": " : "", |