1 files changed, 12 insertions, 1 deletions

diff --git a/packet.c b/packet.c
index a7727ef65..6008c2d94 100644
--- a/packet.c
+++ b/packet.c
@@ -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 ? ": " : "",