packet.c (faebc97a1cb4f0a36a39f0ba9c1b266e070c5f4f) packet.c (b2af61ec69826890d075ceb3e20e206be20d6fea)
1/* $OpenBSD: packet.c,v 1.229 2016/02/17 22:20:14 djm Exp $ */
2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved
6 * This file contains code implementing the packet protocol and communication
7 * with the other side. This same code is used both on client and server side.
8 *

--- 72 unchanged lines hidden (view full) ---

81#include "log.h"
82#include "canohost.h"
83#include "misc.h"
84#include "channels.h"
85#include "ssh.h"
86#include "packet.h"
87#include "ssherr.h"
88#include "sshbuf.h"
1/* $OpenBSD: packet.c,v 1.229 2016/02/17 22:20:14 djm Exp $ */
2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved
6 * This file contains code implementing the packet protocol and communication
7 * with the other side. This same code is used both on client and server side.
8 *

--- 72 unchanged lines hidden (view full) ---

81#include "log.h"
82#include "canohost.h"
83#include "misc.h"
84#include "channels.h"
85#include "ssh.h"
86#include "packet.h"
87#include "ssherr.h"
88#include "sshbuf.h"
89#include "blacklist_client.h"
89
90#ifdef PACKET_DEBUG
91#define DBG(x) x
92#else
93#define DBG(x)
94#endif
95
96#define PACKET_MAX_SIZE (256 * 1024)

--- 1969 unchanged lines hidden (view full) ---

2066 }
2067 /* FALLTHROUGH */
2068 case SSH_ERR_NO_CIPHER_ALG_MATCH:
2069 case SSH_ERR_NO_MAC_ALG_MATCH:
2070 case SSH_ERR_NO_COMPRESS_ALG_MATCH:
2071 case SSH_ERR_NO_KEX_ALG_MATCH:
2072 case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
2073 if (ssh && ssh->kex && ssh->kex->failed_choice) {
90
91#ifdef PACKET_DEBUG
92#define DBG(x) x
93#else
94#define DBG(x)
95#endif
96
97#define PACKET_MAX_SIZE (256 * 1024)

--- 1969 unchanged lines hidden (view full) ---

2067 }
2068 /* FALLTHROUGH */
2069 case SSH_ERR_NO_CIPHER_ALG_MATCH:
2070 case SSH_ERR_NO_MAC_ALG_MATCH:
2071 case SSH_ERR_NO_COMPRESS_ALG_MATCH:
2072 case SSH_ERR_NO_KEX_ALG_MATCH:
2073 case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
2074 if (ssh && ssh->kex && ssh->kex->failed_choice) {
2075 BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL);
2074 fatal("Unable to negotiate with %.200s port %d: %s. "
2075 "Their offer: %s", ssh_remote_ipaddr(ssh),
2076 ssh_remote_port(ssh), ssh_err(r),
2077 ssh->kex->failed_choice);
2078 }
2079 /* FALLTHROUGH */
2080 default:
2081 fatal("%s%sConnection %s %.200s port %d: %s",

--- 894 unchanged lines hidden --- 		2076 fatal("Unable to negotiate with %.200s port %d: %s. "
2077 "Their offer: %s", ssh_remote_ipaddr(ssh),
2078 ssh_remote_port(ssh), ssh_err(r),
2079 ssh->kex->failed_choice);
2080 }
2081 /* FALLTHROUGH */
2082 default:
2083 fatal("%s%sConnection %s %.200s port %d: %s",

--- 894 unchanged lines hidden ---