1999-10-27 03:42:43 +00:00
|
|
|
/*
|
1999-11-24 13:26:21 +00:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
* All rights reserved
|
|
|
|
* This file contains code implementing the packet protocol and communication
|
|
|
|
* with the other side. This same code is used both on client and server side.
|
2000-04-04 04:38:59 +00:00
|
|
|
*
|
2000-09-16 02:29:08 +00:00
|
|
|
* As far as I am concerned, the code I have written for this software
|
|
|
|
* can be used freely for any purpose. Any derived versions of this
|
|
|
|
* software must be clearly marked as such, and if the derived work is
|
|
|
|
* incompatible with the protocol description in the RFC file, it must be
|
|
|
|
* called by a name other than "ssh" or "Secure Shell".
|
|
|
|
*
|
|
|
|
*
|
2000-04-04 04:38:59 +00:00
|
|
|
* SSH2 packet format added by Markus Friedl.
|
2001-07-04 03:32:30 +00:00
|
|
|
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
|
2000-09-16 02:29:08 +00:00
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
2000-04-04 04:38:59 +00:00
|
|
|
*
|
2000-09-16 02:29:08 +00:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
1999-11-24 13:26:21 +00:00
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "includes.h"
|
2002-03-26 02:09:41 +00:00
|
|
|
RCSID("$OpenBSD: packet.c,v 1.93 2002/03/24 16:01:13 markus Exp $");
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#include "xmalloc.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "bufaux.h"
|
|
|
|
#include "crc32.h"
|
|
|
|
#include "getput.h"
|
|
|
|
|
|
|
|
#include "compress.h"
|
|
|
|
#include "deattack.h"
|
2001-06-09 00:36:26 +00:00
|
|
|
#include "channels.h"
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
#include "compat.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "ssh1.h"
|
2000-04-04 04:38:59 +00:00
|
|
|
#include "ssh2.h"
|
|
|
|
|
2000-10-14 05:23:11 +00:00
|
|
|
#include "cipher.h"
|
2000-04-04 04:38:59 +00:00
|
|
|
#include "kex.h"
|
2001-02-15 03:01:59 +00:00
|
|
|
#include "mac.h"
|
2001-01-22 05:34:40 +00:00
|
|
|
#include "log.h"
|
|
|
|
#include "canohost.h"
|
2002-02-05 00:52:54 +00:00
|
|
|
#include "misc.h"
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
#define DBG(x) x
|
|
|
|
#else
|
|
|
|
#define DBG(x)
|
|
|
|
#endif
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* This variable contains the file descriptors used for communicating with
|
|
|
|
* the other side. connection_in is used for reading; connection_out for
|
|
|
|
* writing. These can be the same descriptor, in which case it is assumed to
|
|
|
|
* be a socket.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
static int connection_in = -1;
|
|
|
|
static int connection_out = -1;
|
|
|
|
|
|
|
|
/* Protocol flags for the remote side. */
|
2000-12-22 01:43:59 +00:00
|
|
|
static u_int remote_protocol_flags = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* Encryption context for receiving data. This is only used for decryption. */
|
|
|
|
static CipherContext receive_context;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Encryption context for sending data. This is only used for encryption. */
|
1999-10-27 03:42:43 +00:00
|
|
|
static CipherContext send_context;
|
|
|
|
|
|
|
|
/* Buffer for raw input data from the socket. */
|
2002-03-22 01:42:04 +00:00
|
|
|
Buffer input;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* Buffer for raw output data going to the socket. */
|
2002-03-22 01:42:04 +00:00
|
|
|
Buffer output;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* Buffer for the partial outgoing packet being constructed. */
|
|
|
|
static Buffer outgoing_packet;
|
|
|
|
|
|
|
|
/* Buffer for the incoming packet currently being processed. */
|
|
|
|
static Buffer incoming_packet;
|
|
|
|
|
|
|
|
/* Scratch buffer for packet compression/decompression. */
|
|
|
|
static Buffer compression_buffer;
|
2001-04-05 23:20:46 +00:00
|
|
|
static int compression_buffer_ready = 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
/* Flag indicating whether packet compression/decompression is enabled. */
|
|
|
|
static int packet_compression = 0;
|
|
|
|
|
1999-11-21 02:23:52 +00:00
|
|
|
/* default maximum packet size */
|
|
|
|
int max_packet_size = 32768;
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
/* Flag indicating whether this module has been initialized. */
|
|
|
|
static int initialized = 0;
|
|
|
|
|
|
|
|
/* Set to true if the connection is interactive. */
|
|
|
|
static int interactive_mode = 0;
|
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
/* Session key information for Encryption and MAC */
|
2001-04-04 02:00:54 +00:00
|
|
|
Newkeys *newkeys[MODE_MAX];
|
2002-03-22 01:42:04 +00:00
|
|
|
static u_int32_t read_seqnr = 0;
|
|
|
|
static u_int32_t send_seqnr = 0;
|
2000-04-04 04:38:59 +00:00
|
|
|
|
2001-11-12 00:02:52 +00:00
|
|
|
/* roundup current message to extra_pad bytes */
|
|
|
|
static u_char extra_pad = 0;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Sets the descriptors used for communication. Disables encryption until
|
|
|
|
* packet_set_encryption_key is called.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
|
|
|
packet_set_connection(int fd_in, int fd_out)
|
|
|
|
{
|
2000-10-14 05:23:11 +00:00
|
|
|
Cipher *none = cipher_by_name("none");
|
|
|
|
if (none == NULL)
|
|
|
|
fatal("packet_set_connection: cannot load cipher 'none'");
|
1999-11-24 13:26:21 +00:00
|
|
|
connection_in = fd_in;
|
|
|
|
connection_out = fd_out;
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_init(&send_context, none, "", 0, NULL, 0, CIPHER_ENCRYPT);
|
|
|
|
cipher_init(&receive_context, none, "", 0, NULL, 0, CIPHER_DECRYPT);
|
2001-06-05 21:09:18 +00:00
|
|
|
newkeys[MODE_IN] = newkeys[MODE_OUT] = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
if (!initialized) {
|
|
|
|
initialized = 1;
|
|
|
|
buffer_init(&input);
|
|
|
|
buffer_init(&output);
|
|
|
|
buffer_init(&outgoing_packet);
|
|
|
|
buffer_init(&incoming_packet);
|
|
|
|
}
|
|
|
|
/* Kludge: arrange the close function to be called from fatal(). */
|
|
|
|
fatal_add_cleanup((void (*) (void *)) packet_close, NULL);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2000-01-14 04:45:46 +00:00
|
|
|
/* Returns 1 if remote host is connected via socket, 0 if not. */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_connection_is_on_socket(void)
|
2000-01-14 04:45:46 +00:00
|
|
|
{
|
|
|
|
struct sockaddr_storage from, to;
|
|
|
|
socklen_t fromlen, tolen;
|
|
|
|
|
|
|
|
/* filedescriptors in and out are the same, so it's a socket */
|
|
|
|
if (connection_in == connection_out)
|
|
|
|
return 1;
|
|
|
|
fromlen = sizeof(from);
|
|
|
|
memset(&from, 0, sizeof(from));
|
2000-01-22 08:47:21 +00:00
|
|
|
if (getpeername(connection_in, (struct sockaddr *)&from, &fromlen) < 0)
|
2000-01-14 04:45:46 +00:00
|
|
|
return 0;
|
|
|
|
tolen = sizeof(to);
|
|
|
|
memset(&to, 0, sizeof(to));
|
2000-01-22 08:47:21 +00:00
|
|
|
if (getpeername(connection_out, (struct sockaddr *)&to, &tolen) < 0)
|
2000-01-14 04:45:46 +00:00
|
|
|
return 0;
|
|
|
|
if (fromlen != tolen || memcmp(&from, &to, fromlen) != 0)
|
|
|
|
return 0;
|
|
|
|
if (from.ss_family != AF_INET && from.ss_family != AF_INET6)
|
|
|
|
return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2002-03-22 02:54:23 +00:00
|
|
|
/*
|
2002-03-22 01:42:04 +00:00
|
|
|
* Exports an IV from the CipherContext required to export the key
|
|
|
|
* state back from the unprivileged child to the privileged parent
|
|
|
|
* process.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void
|
|
|
|
packet_get_keyiv(int mode, u_char *iv, u_int len)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
|
|
|
|
|
|
|
if (mode == MODE_OUT)
|
|
|
|
cc = &send_context;
|
|
|
|
else
|
|
|
|
cc = &receive_context;
|
|
|
|
|
|
|
|
cipher_get_keyiv(cc, iv, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
packet_get_keycontext(int mode, u_char *dat)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
2002-03-22 02:54:23 +00:00
|
|
|
|
2002-03-22 01:42:04 +00:00
|
|
|
if (mode == MODE_OUT)
|
|
|
|
cc = &send_context;
|
|
|
|
else
|
|
|
|
cc = &receive_context;
|
|
|
|
|
|
|
|
return (cipher_get_keycontext(cc, dat));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
packet_set_keycontext(int mode, u_char *dat)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
2002-03-22 02:54:23 +00:00
|
|
|
|
2002-03-22 01:42:04 +00:00
|
|
|
if (mode == MODE_OUT)
|
|
|
|
cc = &send_context;
|
|
|
|
else
|
|
|
|
cc = &receive_context;
|
|
|
|
|
|
|
|
cipher_set_keycontext(cc, dat);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
packet_get_keyiv_len(int mode)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
|
|
|
|
|
|
|
if (mode == MODE_OUT)
|
|
|
|
cc = &send_context;
|
|
|
|
else
|
|
|
|
cc = &receive_context;
|
|
|
|
|
|
|
|
return (cipher_get_keyiv_len(cc));
|
|
|
|
}
|
|
|
|
void
|
|
|
|
packet_set_iv(int mode, u_char *dat)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
|
|
|
|
|
|
|
if (mode == MODE_OUT)
|
|
|
|
cc = &send_context;
|
|
|
|
else
|
|
|
|
cc = &receive_context;
|
|
|
|
|
|
|
|
cipher_set_keyiv(cc, dat);
|
|
|
|
}
|
|
|
|
int
|
|
|
|
packet_get_ssh1_cipher()
|
|
|
|
{
|
|
|
|
return (cipher_get_number(receive_context.cipher));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
u_int32_t
|
|
|
|
packet_get_seqnr(int mode)
|
|
|
|
{
|
|
|
|
return (mode == MODE_IN ? read_seqnr : send_seqnr);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
packet_set_seqnr(int mode, u_int32_t seqnr)
|
|
|
|
{
|
|
|
|
if (mode == MODE_IN)
|
|
|
|
read_seqnr = seqnr;
|
|
|
|
else if (mode == MODE_OUT)
|
|
|
|
send_seqnr = seqnr;
|
|
|
|
else
|
|
|
|
fatal("%s: bad mode %d", __FUNCTION__, mode);
|
|
|
|
}
|
|
|
|
|
2000-01-14 04:45:46 +00:00
|
|
|
/* returns 1 if connection is via ipv4 */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_connection_is_ipv4(void)
|
2000-01-14 04:45:46 +00:00
|
|
|
{
|
|
|
|
struct sockaddr_storage to;
|
2000-01-22 22:38:00 +00:00
|
|
|
socklen_t tolen = sizeof(to);
|
2000-01-14 04:45:46 +00:00
|
|
|
|
|
|
|
memset(&to, 0, sizeof(to));
|
|
|
|
if (getsockname(connection_out, (struct sockaddr *)&to, &tolen) < 0)
|
|
|
|
return 0;
|
2002-04-26 06:54:34 +00:00
|
|
|
if (to.ss_family == AF_INET)
|
|
|
|
return 1;
|
|
|
|
#ifdef IPV4_IN_IPV6
|
|
|
|
if (to.ss_family == AF_INET6 &&
|
|
|
|
IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr))
|
|
|
|
return 1;
|
|
|
|
#endif
|
|
|
|
return 0;
|
2000-01-14 04:45:46 +00:00
|
|
|
}
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
/* Sets the connection into non-blocking mode. */
|
|
|
|
|
|
|
|
void
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_set_nonblocking(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Set the socket into non-blocking mode. */
|
|
|
|
if (fcntl(connection_in, F_SETFL, O_NONBLOCK) < 0)
|
|
|
|
error("fcntl O_NONBLOCK: %.100s", strerror(errno));
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
if (connection_out != connection_in) {
|
|
|
|
if (fcntl(connection_out, F_SETFL, O_NONBLOCK) < 0)
|
|
|
|
error("fcntl O_NONBLOCK: %.100s", strerror(errno));
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the socket used for reading. */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_get_connection_in(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return connection_in;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the descriptor used for writing. */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_get_connection_out(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return connection_out;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Closes the connection and clears and frees internal data structures. */
|
|
|
|
|
|
|
|
void
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_close(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
if (!initialized)
|
|
|
|
return;
|
|
|
|
initialized = 0;
|
|
|
|
if (connection_in == connection_out) {
|
|
|
|
shutdown(connection_out, SHUT_RDWR);
|
|
|
|
close(connection_out);
|
|
|
|
} else {
|
|
|
|
close(connection_in);
|
|
|
|
close(connection_out);
|
|
|
|
}
|
|
|
|
buffer_free(&input);
|
|
|
|
buffer_free(&output);
|
|
|
|
buffer_free(&outgoing_packet);
|
|
|
|
buffer_free(&incoming_packet);
|
2001-04-05 23:20:46 +00:00
|
|
|
if (compression_buffer_ready) {
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_free(&compression_buffer);
|
|
|
|
buffer_compress_uninit();
|
|
|
|
}
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_cleanup(&send_context);
|
|
|
|
cipher_cleanup(&receive_context);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Sets remote side protocol flags. */
|
|
|
|
|
|
|
|
void
|
2000-12-22 01:43:59 +00:00
|
|
|
packet_set_protocol_flags(u_int protocol_flags)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
remote_protocol_flags = protocol_flags;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns the remote protocol flags set earlier by the above function. */
|
|
|
|
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_get_protocol_flags(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return remote_protocol_flags;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Starts packet compression from the next packet on in both directions.
|
|
|
|
* Level is compression level 1 (fastest) - 9 (slow, best) as in gzip.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
|
|
|
packet_init_compression(void)
|
2001-04-05 23:20:46 +00:00
|
|
|
{
|
|
|
|
if (compression_buffer_ready == 1)
|
|
|
|
return;
|
|
|
|
compression_buffer_ready = 1;
|
|
|
|
buffer_init(&compression_buffer);
|
|
|
|
}
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
|
|
|
packet_start_compression(int level)
|
|
|
|
{
|
2001-06-05 21:09:18 +00:00
|
|
|
if (packet_compression && !compat20)
|
1999-11-24 13:26:21 +00:00
|
|
|
fatal("Compression already enabled.");
|
|
|
|
packet_compression = 1;
|
2001-04-05 23:20:46 +00:00
|
|
|
packet_init_compression();
|
|
|
|
buffer_compress_init_send(level);
|
|
|
|
buffer_compress_init_recv();
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Causes any further packets to be encrypted using the given key. The same
|
|
|
|
* key is used for both sending and reception. However, both directions are
|
|
|
|
* encrypted independently of each other.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
2000-12-22 01:43:59 +00:00
|
|
|
packet_set_encryption_key(const u_char *key, u_int keylen,
|
2000-10-14 05:23:11 +00:00
|
|
|
int number)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-10-14 05:23:11 +00:00
|
|
|
Cipher *cipher = cipher_by_number(number);
|
|
|
|
if (cipher == NULL)
|
|
|
|
fatal("packet_set_encryption_key: unknown cipher number %d", number);
|
2000-04-04 04:38:59 +00:00
|
|
|
if (keylen < 20)
|
2000-10-14 05:23:11 +00:00
|
|
|
fatal("packet_set_encryption_key: keylen too small: %d", keylen);
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_init(&send_context, cipher, key, keylen, NULL, 0, CIPHER_ENCRYPT);
|
|
|
|
cipher_init(&receive_context, cipher, key, keylen, NULL, 0, CIPHER_DECRYPT);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-06-05 21:09:18 +00:00
|
|
|
/* Start constructing a packet to send. */
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
2001-06-05 21:09:18 +00:00
|
|
|
packet_start(u_char type)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2001-06-05 21:09:18 +00:00
|
|
|
u_char buf[9];
|
|
|
|
int len;
|
2000-04-04 04:38:59 +00:00
|
|
|
|
2001-03-05 06:47:00 +00:00
|
|
|
DBG(debug("packet_start[%d]", type));
|
2001-06-05 21:09:18 +00:00
|
|
|
len = compat20 ? 6 : 9;
|
|
|
|
memset(buf, 0, len - 1);
|
|
|
|
buf[len - 1] = type;
|
|
|
|
buffer_clear(&outgoing_packet);
|
|
|
|
buffer_append(&outgoing_packet, buf, len);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
2001-06-05 21:09:18 +00:00
|
|
|
/* Append payload. */
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
|
|
|
packet_put_char(int value)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char ch = value;
|
|
|
|
buffer_append(&outgoing_packet, &ch, 1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
void
|
2000-12-22 01:43:59 +00:00
|
|
|
packet_put_int(u_int value)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_put_int(&outgoing_packet, value);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
void
|
2001-12-21 03:56:54 +00:00
|
|
|
packet_put_string(const void *buf, u_int len)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_put_string(&outgoing_packet, buf, len);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
void
|
|
|
|
packet_put_cstring(const char *str)
|
|
|
|
{
|
2001-06-09 01:42:01 +00:00
|
|
|
buffer_put_cstring(&outgoing_packet, str);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
void
|
2001-12-21 03:56:54 +00:00
|
|
|
packet_put_raw(const void *buf, u_int len)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
|
|
|
buffer_append(&outgoing_packet, buf, len);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_put_bignum(BIGNUM * value)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_put_bignum(&outgoing_packet, value);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
void
|
|
|
|
packet_put_bignum2(BIGNUM * value)
|
|
|
|
{
|
|
|
|
buffer_put_bignum2(&outgoing_packet, value);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Finalizes and sends the packet. If the encryption key has been set,
|
|
|
|
* encrypts the packet before sending.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-02-09 02:11:24 +00:00
|
|
|
packet_send1(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2002-02-26 18:04:38 +00:00
|
|
|
u_char buf[8], *cp;
|
1999-11-24 13:26:21 +00:00
|
|
|
int i, padding, len;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int checksum;
|
1999-11-24 13:26:21 +00:00
|
|
|
u_int32_t rand = 0;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* If using packet compression, compress the payload of the outgoing
|
|
|
|
* packet.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
if (packet_compression) {
|
|
|
|
buffer_clear(&compression_buffer);
|
|
|
|
/* Skip padding. */
|
|
|
|
buffer_consume(&outgoing_packet, 8);
|
|
|
|
/* padding */
|
|
|
|
buffer_append(&compression_buffer, "\0\0\0\0\0\0\0\0", 8);
|
|
|
|
buffer_compress(&outgoing_packet, &compression_buffer);
|
|
|
|
buffer_clear(&outgoing_packet);
|
|
|
|
buffer_append(&outgoing_packet, buffer_ptr(&compression_buffer),
|
2001-12-21 03:45:46 +00:00
|
|
|
buffer_len(&compression_buffer));
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
/* Compute packet length without padding (add checksum, remove padding). */
|
|
|
|
len = buffer_len(&outgoing_packet) + 4 - 8;
|
|
|
|
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
/* Insert padding. Initialized to zero in packet_start1() */
|
1999-11-24 13:26:21 +00:00
|
|
|
padding = 8 - len % 8;
|
2002-02-19 04:21:23 +00:00
|
|
|
if (!send_context.plaintext) {
|
1999-11-24 13:26:21 +00:00
|
|
|
cp = buffer_ptr(&outgoing_packet);
|
|
|
|
for (i = 0; i < padding; i++) {
|
|
|
|
if (i % 4 == 0)
|
|
|
|
rand = arc4random();
|
|
|
|
cp[7 - i] = rand & 0xff;
|
|
|
|
rand >>= 8;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
buffer_consume(&outgoing_packet, 8 - padding);
|
|
|
|
|
|
|
|
/* Add check bytes. */
|
2002-01-22 12:18:15 +00:00
|
|
|
checksum = ssh_crc32(buffer_ptr(&outgoing_packet),
|
2000-08-23 00:46:23 +00:00
|
|
|
buffer_len(&outgoing_packet));
|
1999-11-24 13:26:21 +00:00
|
|
|
PUT_32BIT(buf, checksum);
|
|
|
|
buffer_append(&outgoing_packet, buf, 4);
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#ifdef PACKET_DEBUG
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "packet_send plain: ");
|
|
|
|
buffer_dump(&outgoing_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Append to output. */
|
|
|
|
PUT_32BIT(buf, len);
|
|
|
|
buffer_append(&output, buf, 4);
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_append_space(&output, buffer_len(&outgoing_packet));
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_crypt(&send_context, cp, buffer_ptr(&outgoing_packet),
|
2001-12-21 03:45:46 +00:00
|
|
|
buffer_len(&outgoing_packet));
|
1999-11-24 13:26:21 +00:00
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
#ifdef PACKET_DEBUG
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "encrypted: ");
|
|
|
|
buffer_dump(&output);
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_clear(&outgoing_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Note that the packet is now only buffered in output. It won\'t be
|
|
|
|
* actually sent until packet_write_wait or packet_write_poll is
|
|
|
|
* called.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2002-03-22 01:42:04 +00:00
|
|
|
void
|
2001-04-04 02:00:54 +00:00
|
|
|
set_newkeys(int mode)
|
|
|
|
{
|
|
|
|
Enc *enc;
|
|
|
|
Mac *mac;
|
|
|
|
Comp *comp;
|
|
|
|
CipherContext *cc;
|
2002-02-19 04:21:23 +00:00
|
|
|
int encrypt;
|
2001-04-04 02:00:54 +00:00
|
|
|
|
|
|
|
debug("newkeys: mode %d", mode);
|
|
|
|
|
2002-02-19 04:21:23 +00:00
|
|
|
if (mode == MODE_OUT) {
|
|
|
|
cc = &send_context;
|
|
|
|
encrypt = CIPHER_ENCRYPT;
|
|
|
|
} else {
|
|
|
|
cc = &receive_context;
|
|
|
|
encrypt = CIPHER_DECRYPT;
|
|
|
|
}
|
2001-04-04 02:00:54 +00:00
|
|
|
if (newkeys[mode] != NULL) {
|
|
|
|
debug("newkeys: rekeying");
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_cleanup(cc);
|
2001-04-05 02:05:21 +00:00
|
|
|
enc = &newkeys[mode]->enc;
|
|
|
|
mac = &newkeys[mode]->mac;
|
|
|
|
comp = &newkeys[mode]->comp;
|
2001-04-05 23:26:32 +00:00
|
|
|
memset(mac->key, 0, mac->key_len);
|
2001-04-05 02:05:21 +00:00
|
|
|
xfree(enc->name);
|
|
|
|
xfree(enc->iv);
|
|
|
|
xfree(enc->key);
|
|
|
|
xfree(mac->name);
|
|
|
|
xfree(mac->key);
|
|
|
|
xfree(comp->name);
|
2001-04-04 17:52:53 +00:00
|
|
|
xfree(newkeys[mode]);
|
2001-04-04 02:00:54 +00:00
|
|
|
}
|
|
|
|
newkeys[mode] = kex_get_newkeys(mode);
|
|
|
|
if (newkeys[mode] == NULL)
|
|
|
|
fatal("newkeys: no keys for mode %d", mode);
|
|
|
|
enc = &newkeys[mode]->enc;
|
|
|
|
mac = &newkeys[mode]->mac;
|
|
|
|
comp = &newkeys[mode]->comp;
|
|
|
|
if (mac->md != NULL)
|
|
|
|
mac->enabled = 1;
|
|
|
|
DBG(debug("cipher_init_context: %d", mode));
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_init(cc, enc->cipher, enc->key, enc->key_len,
|
|
|
|
enc->iv, enc->block_size, encrypt);
|
2002-03-22 01:42:04 +00:00
|
|
|
/* Deleting the keys does not gain extra security */
|
|
|
|
/* memset(enc->iv, 0, enc->block_size);
|
|
|
|
memset(enc->key, 0, enc->key_len); */
|
2001-04-04 02:00:54 +00:00
|
|
|
if (comp->type != 0 && comp->enabled == 0) {
|
2001-04-05 23:20:46 +00:00
|
|
|
packet_init_compression();
|
|
|
|
if (mode == MODE_OUT)
|
|
|
|
buffer_compress_init_send(6);
|
|
|
|
else
|
|
|
|
buffer_compress_init_recv();
|
2001-04-04 02:00:54 +00:00
|
|
|
comp->enabled = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
/*
|
|
|
|
* Finalize packet in SSH2 format (compress, mac, encrypt, enqueue)
|
|
|
|
*/
|
2001-06-25 05:01:22 +00:00
|
|
|
static void
|
2001-02-09 02:11:24 +00:00
|
|
|
packet_send2(void)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
2002-02-26 18:04:38 +00:00
|
|
|
u_char type, *cp, *macbuf = NULL;
|
2001-11-12 00:02:52 +00:00
|
|
|
u_char padlen, pad;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int packet_length = 0;
|
2001-11-12 00:02:52 +00:00
|
|
|
u_int i, len;
|
2000-04-04 04:38:59 +00:00
|
|
|
u_int32_t rand = 0;
|
|
|
|
Enc *enc = NULL;
|
|
|
|
Mac *mac = NULL;
|
|
|
|
Comp *comp = NULL;
|
|
|
|
int block_size;
|
|
|
|
|
2001-04-04 02:00:54 +00:00
|
|
|
if (newkeys[MODE_OUT] != NULL) {
|
|
|
|
enc = &newkeys[MODE_OUT]->enc;
|
|
|
|
mac = &newkeys[MODE_OUT]->mac;
|
|
|
|
comp = &newkeys[MODE_OUT]->comp;
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
2002-02-19 04:21:23 +00:00
|
|
|
block_size = enc ? enc->block_size : 8;
|
2000-04-04 04:38:59 +00:00
|
|
|
|
2002-02-26 18:04:38 +00:00
|
|
|
cp = buffer_ptr(&outgoing_packet);
|
|
|
|
type = cp[5];
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
fprintf(stderr, "plain: ");
|
|
|
|
buffer_dump(&outgoing_packet);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (comp && comp->enabled) {
|
|
|
|
len = buffer_len(&outgoing_packet);
|
|
|
|
/* skip header, compress only payload */
|
|
|
|
buffer_consume(&outgoing_packet, 5);
|
|
|
|
buffer_clear(&compression_buffer);
|
|
|
|
buffer_compress(&outgoing_packet, &compression_buffer);
|
|
|
|
buffer_clear(&outgoing_packet);
|
|
|
|
buffer_append(&outgoing_packet, "\0\0\0\0\0", 5);
|
|
|
|
buffer_append(&outgoing_packet, buffer_ptr(&compression_buffer),
|
|
|
|
buffer_len(&compression_buffer));
|
|
|
|
DBG(debug("compression: raw %d compressed %d", len,
|
|
|
|
buffer_len(&outgoing_packet)));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* sizeof (packet_len + pad_len + payload) */
|
|
|
|
len = buffer_len(&outgoing_packet);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* calc size of padding, alloc space, get random data,
|
|
|
|
* minimum padding is 4 bytes
|
|
|
|
*/
|
|
|
|
padlen = block_size - (len % block_size);
|
|
|
|
if (padlen < 4)
|
|
|
|
padlen += block_size;
|
2001-11-12 00:02:52 +00:00
|
|
|
if (extra_pad) {
|
|
|
|
/* will wrap if extra_pad+padlen > 255 */
|
|
|
|
extra_pad = roundup(extra_pad, block_size);
|
|
|
|
pad = extra_pad - ((len + padlen) % extra_pad);
|
2002-03-26 02:09:41 +00:00
|
|
|
debug3("packet_send2: adding %d (len %d padlen %d extra_pad %d)",
|
2001-11-12 00:02:52 +00:00
|
|
|
pad, len, padlen, extra_pad);
|
|
|
|
padlen += pad;
|
|
|
|
extra_pad = 0;
|
|
|
|
}
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_append_space(&outgoing_packet, padlen);
|
2002-02-19 04:21:23 +00:00
|
|
|
if (enc && !send_context.plaintext) {
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
/* random padding */
|
2000-04-04 04:38:59 +00:00
|
|
|
for (i = 0; i < padlen; i++) {
|
|
|
|
if (i % 4 == 0)
|
|
|
|
rand = arc4random();
|
|
|
|
cp[i] = rand & 0xff;
|
2001-03-05 06:07:00 +00:00
|
|
|
rand >>= 8;
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
} else {
|
|
|
|
/* clear padding */
|
|
|
|
memset(cp, 0, padlen);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
/* packet_length includes payload, padding and padding length field */
|
|
|
|
packet_length = buffer_len(&outgoing_packet) - 4;
|
2002-02-26 18:04:38 +00:00
|
|
|
cp = buffer_ptr(&outgoing_packet);
|
|
|
|
PUT_32BIT(cp, packet_length);
|
|
|
|
cp[4] = padlen;
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("send: len %d (includes padlen %d)", packet_length+4, padlen));
|
|
|
|
|
|
|
|
/* compute MAC over seqnr and packet(length fields, payload, padding) */
|
|
|
|
if (mac && mac->enabled) {
|
2002-03-22 01:42:04 +00:00
|
|
|
macbuf = mac_compute(mac, send_seqnr,
|
2002-01-22 12:18:15 +00:00
|
|
|
buffer_ptr(&outgoing_packet),
|
2001-02-15 03:01:59 +00:00
|
|
|
buffer_len(&outgoing_packet));
|
2002-03-22 01:42:04 +00:00
|
|
|
DBG(debug("done calc MAC out #%d", send_seqnr));
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
/* encrypt packet and append to output buffer. */
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_append_space(&output, buffer_len(&outgoing_packet));
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_crypt(&send_context, cp, buffer_ptr(&outgoing_packet),
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_len(&outgoing_packet));
|
|
|
|
/* append unencrypted MAC */
|
|
|
|
if (mac && mac->enabled)
|
|
|
|
buffer_append(&output, (char *)macbuf, mac->mac_len);
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
fprintf(stderr, "encrypted: ");
|
|
|
|
buffer_dump(&output);
|
|
|
|
#endif
|
2000-04-16 01:18:38 +00:00
|
|
|
/* increment sequence number for outgoing packets */
|
2002-03-22 01:42:04 +00:00
|
|
|
if (++send_seqnr == 0)
|
2000-04-16 01:18:38 +00:00
|
|
|
log("outgoing seqnr wraps around");
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_clear(&outgoing_packet);
|
|
|
|
|
2001-04-04 02:00:54 +00:00
|
|
|
if (type == SSH2_MSG_NEWKEYS)
|
|
|
|
set_newkeys(MODE_OUT);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_send(void)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
2001-06-05 21:09:18 +00:00
|
|
|
if (compat20)
|
2000-04-04 04:38:59 +00:00
|
|
|
packet_send2();
|
|
|
|
else
|
|
|
|
packet_send1();
|
|
|
|
DBG(debug("packet_send done"));
|
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Waits until a packet has been received, and returns its type. Note that
|
|
|
|
* no other data is processed until this returns, so this function should not
|
|
|
|
* be used during the interactive session.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
int
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read_seqnr(u_int32_t *seqnr_p)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
int type, len;
|
2001-03-05 07:07:49 +00:00
|
|
|
fd_set *setp;
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[8192];
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("packet_read()"));
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2001-03-05 07:07:49 +00:00
|
|
|
setp = (fd_set *)xmalloc(howmany(connection_in+1, NFDBITS) *
|
|
|
|
sizeof(fd_mask));
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Since we are blocking, ensure that all written packets have been sent. */
|
|
|
|
packet_write_wait();
|
|
|
|
|
|
|
|
/* Stay in the loop until we have received a complete packet. */
|
|
|
|
for (;;) {
|
|
|
|
/* Try to read a packet from the buffer. */
|
2002-01-22 12:16:32 +00:00
|
|
|
type = packet_read_poll_seqnr(seqnr_p);
|
2001-06-05 21:09:18 +00:00
|
|
|
if (!compat20 && (
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
type == SSH_SMSG_SUCCESS
|
1999-11-24 13:26:21 +00:00
|
|
|
|| type == SSH_SMSG_FAILURE
|
|
|
|
|| type == SSH_CMSG_EOF
|
- Remove references to SSLeay.
- Big OpenBSD CVS update
- markus@cvs.openbsd.org
[clientloop.c]
- typo
[session.c]
- update proctitle on pty alloc/dealloc, e.g. w/ windows client
[session.c]
- update proctitle for proto 1, too
[channels.h nchan.c serverloop.c session.c sshd.c]
- use c-style comments
- deraadt@cvs.openbsd.org
[scp.c]
- more atomicio
- markus@cvs.openbsd.org
[channels.c]
- set O_NONBLOCK
[ssh.1]
- update AUTHOR
[readconf.c ssh-keygen.c ssh.h]
- default DSA key file ~/.ssh/id_dsa
[clientloop.c]
- typo, rm verbose debug
- deraadt@cvs.openbsd.org
[ssh-keygen.1]
- document DSA use of ssh-keygen
[sshd.8]
- a start at describing what i understand of the DSA side
[ssh-keygen.1]
- document -X and -x
[ssh-keygen.c]
- simplify usage
- markus@cvs.openbsd.org
[sshd.8]
- there is no rhosts_dsa
[ssh-keygen.1]
- document -y, update -X,-x
[nchan.c]
- fix close for non-open ssh1 channels
[servconf.c servconf.h ssh.h sshd.8 sshd.c ]
- s/DsaKey/HostDSAKey/, document option
[sshconnect2.c]
- respect number_of_password_prompts
[channels.c channels.h servconf.c servconf.h session.c sshd.8]
- GatewayPorts for sshd, ok deraadt@
[ssh-add.1 ssh-agent.1 ssh.1]
- more doc on: DSA, id_dsa, known_hosts2, authorized_keys2
[ssh.1]
- more info on proto 2
[sshd.8]
- sync AUTHOR w/ ssh.1
[key.c key.h sshconnect.c]
- print key type when talking about host keys
[packet.c]
- clear padding in ssh2
[dsa.c key.c radix.c ssh.h sshconnect1.c uuencode.c uuencode.h]
- replace broken uuencode w/ libc b64_ntop
[auth2.c]
- log failure before sending the reply
[key.c radix.c uuencode.c]
- remote trailing comments before calling __b64_pton
[auth2.c readconf.c readconf.h servconf.c servconf.h ssh.1]
[sshconnect2.c sshd.8]
- add DSAAuthetication option to ssh/sshd, document SSH2 in sshd.8
- Bring in b64_ntop and b64_pton from OpenBSD libc (bsd-base64.[ch])
2000-05-07 02:03:14 +00:00
|
|
|
|| type == SSH_CMSG_EXIT_CONFIRMATION))
|
2002-01-22 12:11:40 +00:00
|
|
|
packet_check_eom();
|
1999-11-24 13:26:21 +00:00
|
|
|
/* If we got a packet, return it. */
|
2001-03-05 07:07:49 +00:00
|
|
|
if (type != SSH_MSG_NONE) {
|
|
|
|
xfree(setp);
|
1999-11-24 13:26:21 +00:00
|
|
|
return type;
|
2001-03-05 07:07:49 +00:00
|
|
|
}
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Otherwise, wait for some data to arrive, add it to the
|
|
|
|
* buffer, and try again.
|
|
|
|
*/
|
2001-03-05 07:07:49 +00:00
|
|
|
memset(setp, 0, howmany(connection_in + 1, NFDBITS) *
|
|
|
|
sizeof(fd_mask));
|
|
|
|
FD_SET(connection_in, setp);
|
1999-11-25 00:54:57 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Wait for some data to arrive. */
|
2001-03-05 07:07:49 +00:00
|
|
|
while (select(connection_in + 1, setp, NULL, NULL, NULL) == -1 &&
|
2001-02-15 03:12:08 +00:00
|
|
|
(errno == EAGAIN || errno == EINTR))
|
|
|
|
;
|
1999-11-25 00:54:57 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Read data from the socket. */
|
|
|
|
len = read(connection_in, buf, sizeof(buf));
|
1999-12-16 02:18:04 +00:00
|
|
|
if (len == 0) {
|
|
|
|
log("Connection closed by %.200s", get_remote_ipaddr());
|
|
|
|
fatal_cleanup();
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
if (len < 0)
|
|
|
|
fatal("Read from socket failed: %.100s", strerror(errno));
|
|
|
|
/* Append it to the buffer. */
|
|
|
|
packet_process_incoming(buf, len);
|
|
|
|
}
|
|
|
|
/* NOTREACHED */
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2001-12-21 04:00:19 +00:00
|
|
|
int
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read(void)
|
2001-12-21 04:00:19 +00:00
|
|
|
{
|
2002-01-22 12:16:32 +00:00
|
|
|
return packet_read_seqnr(NULL);
|
2001-12-21 04:00:19 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Waits until a packet has been received, verifies that its type matches
|
|
|
|
* that given, and gives a fatal error and exits if there is a mismatch.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read_expect(int expected_type)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
int type;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2002-01-22 12:16:32 +00:00
|
|
|
type = packet_read();
|
1999-11-24 13:26:21 +00:00
|
|
|
if (type != expected_type)
|
|
|
|
packet_disconnect("Protocol error: expected packet type %d, got %d",
|
2000-04-04 04:38:59 +00:00
|
|
|
expected_type, type);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Checks if a full packet is available in the data received so far via
|
1999-11-24 13:26:21 +00:00
|
|
|
* packet_process_incoming. If so, reads the packet; otherwise returns
|
|
|
|
* SSH_MSG_NONE. This does not wait for data from the connection.
|
|
|
|
*
|
|
|
|
* SSH_MSG_DISCONNECT is handled specially here. Also,
|
|
|
|
* SSH_MSG_IGNORE messages are skipped by this function and are never returned
|
|
|
|
* to higher levels.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static int
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read_poll1(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int len, padded_len;
|
2002-02-26 18:04:38 +00:00
|
|
|
u_char *cp, type;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int checksum, stored_checksum;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Check if input size is less than minimum packet size. */
|
|
|
|
if (buffer_len(&input) < 4 + 8)
|
|
|
|
return SSH_MSG_NONE;
|
|
|
|
/* Get length of incoming packet. */
|
2002-02-26 18:04:38 +00:00
|
|
|
cp = buffer_ptr(&input);
|
|
|
|
len = GET_32BIT(cp);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (len < 1 + 2 + 2 || len > 256 * 1024)
|
|
|
|
packet_disconnect("Bad packet length %d.", len);
|
|
|
|
padded_len = (len + 8) & ~7;
|
|
|
|
|
|
|
|
/* Check if the packet has been entirely received. */
|
|
|
|
if (buffer_len(&input) < 4 + padded_len)
|
|
|
|
return SSH_MSG_NONE;
|
|
|
|
|
|
|
|
/* The entire packet is in buffer. */
|
|
|
|
|
|
|
|
/* Consume packet length. */
|
|
|
|
buffer_consume(&input, 4);
|
|
|
|
|
2001-06-05 21:09:18 +00:00
|
|
|
/*
|
|
|
|
* Cryptographic attack detector for ssh
|
|
|
|
* (C)1998 CORE-SDI, Buenos Aires Argentina
|
|
|
|
* Ariel Futoransky(futo@core-sdi.com)
|
|
|
|
*/
|
2002-02-19 04:21:23 +00:00
|
|
|
if (!receive_context.plaintext &&
|
2001-06-05 21:09:18 +00:00
|
|
|
detect_attack(buffer_ptr(&input), padded_len, NULL) == DEATTACK_DETECTED)
|
|
|
|
packet_disconnect("crc32 compensation attack: network attack detected");
|
|
|
|
|
|
|
|
/* Decrypt data to incoming_packet. */
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_clear(&incoming_packet);
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_append_space(&incoming_packet, padded_len);
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_crypt(&receive_context, cp, buffer_ptr(&input), padded_len);
|
2001-06-05 21:09:18 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_consume(&input, padded_len);
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
#ifdef PACKET_DEBUG
|
1999-11-24 13:26:21 +00:00
|
|
|
fprintf(stderr, "read_poll plain: ");
|
|
|
|
buffer_dump(&incoming_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Compute packet checksum. */
|
2002-01-22 12:18:15 +00:00
|
|
|
checksum = ssh_crc32(buffer_ptr(&incoming_packet),
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_len(&incoming_packet) - 4);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Skip padding. */
|
|
|
|
buffer_consume(&incoming_packet, 8 - len % 8);
|
|
|
|
|
|
|
|
/* Test check bytes. */
|
|
|
|
if (len != buffer_len(&incoming_packet))
|
2001-12-21 04:00:19 +00:00
|
|
|
packet_disconnect("packet_read_poll1: len %d != buffer_len %d.",
|
2000-04-04 04:38:59 +00:00
|
|
|
len, buffer_len(&incoming_packet));
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2002-02-26 18:04:38 +00:00
|
|
|
cp = (u_char *)buffer_ptr(&incoming_packet) + len - 4;
|
|
|
|
stored_checksum = GET_32BIT(cp);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (checksum != stored_checksum)
|
|
|
|
packet_disconnect("Corrupted check bytes on input.");
|
|
|
|
buffer_consume_end(&incoming_packet, 4);
|
|
|
|
|
|
|
|
if (packet_compression) {
|
|
|
|
buffer_clear(&compression_buffer);
|
|
|
|
buffer_uncompress(&incoming_packet, &compression_buffer);
|
|
|
|
buffer_clear(&incoming_packet);
|
|
|
|
buffer_append(&incoming_packet, buffer_ptr(&compression_buffer),
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_len(&compression_buffer));
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2001-06-05 21:09:18 +00:00
|
|
|
type = buffer_get_char(&incoming_packet);
|
|
|
|
return type;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
|
2001-06-25 05:01:22 +00:00
|
|
|
static int
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read_poll2(u_int32_t *seqnr_p)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
2001-02-15 03:01:59 +00:00
|
|
|
static u_int packet_length = 0;
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int padlen, need;
|
2002-02-26 18:04:38 +00:00
|
|
|
u_char *macbuf, *cp, type;
|
2000-04-04 04:38:59 +00:00
|
|
|
int maclen, block_size;
|
|
|
|
Enc *enc = NULL;
|
|
|
|
Mac *mac = NULL;
|
|
|
|
Comp *comp = NULL;
|
|
|
|
|
2001-04-04 02:00:54 +00:00
|
|
|
if (newkeys[MODE_IN] != NULL) {
|
|
|
|
enc = &newkeys[MODE_IN]->enc;
|
|
|
|
mac = &newkeys[MODE_IN]->mac;
|
|
|
|
comp = &newkeys[MODE_IN]->comp;
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
maclen = mac && mac->enabled ? mac->mac_len : 0;
|
2002-02-19 04:21:23 +00:00
|
|
|
block_size = enc ? enc->block_size : 8;
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
if (packet_length == 0) {
|
|
|
|
/*
|
|
|
|
* check if input size is less than the cipher block size,
|
|
|
|
* decrypt first block and extract length of incoming packet
|
|
|
|
*/
|
|
|
|
if (buffer_len(&input) < block_size)
|
|
|
|
return SSH_MSG_NONE;
|
|
|
|
buffer_clear(&incoming_packet);
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_append_space(&incoming_packet, block_size);
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_crypt(&receive_context, cp, buffer_ptr(&input),
|
2000-04-04 04:38:59 +00:00
|
|
|
block_size);
|
2002-02-26 18:04:38 +00:00
|
|
|
cp = buffer_ptr(&incoming_packet);
|
|
|
|
packet_length = GET_32BIT(cp);
|
2000-04-04 04:38:59 +00:00
|
|
|
if (packet_length < 1 + 4 || packet_length > 256 * 1024) {
|
|
|
|
buffer_dump(&incoming_packet);
|
|
|
|
packet_disconnect("Bad packet length %d.", packet_length);
|
|
|
|
}
|
|
|
|
DBG(debug("input: packet len %d", packet_length+4));
|
|
|
|
buffer_consume(&input, block_size);
|
|
|
|
}
|
|
|
|
/* we have a partial packet of block_size bytes */
|
|
|
|
need = 4 + packet_length - block_size;
|
|
|
|
DBG(debug("partial packet %d, need %d, maclen %d", block_size,
|
|
|
|
need, maclen));
|
|
|
|
if (need % block_size != 0)
|
|
|
|
fatal("padding error: need %d block %d mod %d",
|
|
|
|
need, block_size, need % block_size);
|
|
|
|
/*
|
|
|
|
* check if the entire packet has been received and
|
|
|
|
* decrypt into incoming_packet
|
|
|
|
*/
|
|
|
|
if (buffer_len(&input) < need + maclen)
|
|
|
|
return SSH_MSG_NONE;
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
fprintf(stderr, "read_poll enc/full: ");
|
|
|
|
buffer_dump(&input);
|
|
|
|
#endif
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_append_space(&incoming_packet, need);
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_crypt(&receive_context, cp, buffer_ptr(&input), need);
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_consume(&input, need);
|
|
|
|
/*
|
|
|
|
* compute MAC over seqnr and packet,
|
|
|
|
* increment sequence number for incoming packet
|
|
|
|
*/
|
2000-04-16 01:18:38 +00:00
|
|
|
if (mac && mac->enabled) {
|
2002-03-22 01:42:04 +00:00
|
|
|
macbuf = mac_compute(mac, read_seqnr,
|
2002-01-22 12:18:15 +00:00
|
|
|
buffer_ptr(&incoming_packet),
|
2001-02-15 03:01:59 +00:00
|
|
|
buffer_len(&incoming_packet));
|
2000-04-04 04:38:59 +00:00
|
|
|
if (memcmp(macbuf, buffer_ptr(&input), mac->mac_len) != 0)
|
2000-10-14 05:23:11 +00:00
|
|
|
packet_disconnect("Corrupted MAC on input.");
|
2002-03-22 01:42:04 +00:00
|
|
|
DBG(debug("MAC #%d ok", read_seqnr));
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_consume(&input, mac->mac_len);
|
|
|
|
}
|
2001-12-21 04:00:19 +00:00
|
|
|
if (seqnr_p != NULL)
|
2002-03-22 01:42:04 +00:00
|
|
|
*seqnr_p = read_seqnr;
|
|
|
|
if (++read_seqnr == 0)
|
2000-04-16 01:18:38 +00:00
|
|
|
log("incoming seqnr wraps around");
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
/* get padlen */
|
2001-12-21 03:56:54 +00:00
|
|
|
cp = buffer_ptr(&incoming_packet);
|
2002-02-26 18:04:38 +00:00
|
|
|
padlen = cp[4];
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("input: padlen %d", padlen));
|
|
|
|
if (padlen < 4)
|
|
|
|
packet_disconnect("Corrupted padlen %d on input.", padlen);
|
|
|
|
|
|
|
|
/* skip packet size + padlen, discard padding */
|
|
|
|
buffer_consume(&incoming_packet, 4 + 1);
|
|
|
|
buffer_consume_end(&incoming_packet, padlen);
|
|
|
|
|
|
|
|
DBG(debug("input: len before de-compress %d", buffer_len(&incoming_packet)));
|
|
|
|
if (comp && comp->enabled) {
|
|
|
|
buffer_clear(&compression_buffer);
|
|
|
|
buffer_uncompress(&incoming_packet, &compression_buffer);
|
|
|
|
buffer_clear(&incoming_packet);
|
|
|
|
buffer_append(&incoming_packet, buffer_ptr(&compression_buffer),
|
|
|
|
buffer_len(&compression_buffer));
|
|
|
|
DBG(debug("input: len after de-compress %d", buffer_len(&incoming_packet)));
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* get packet type, implies consume.
|
|
|
|
* return length of payload (without type field)
|
|
|
|
*/
|
2001-06-05 21:09:18 +00:00
|
|
|
type = buffer_get_char(&incoming_packet);
|
2001-04-04 02:00:54 +00:00
|
|
|
if (type == SSH2_MSG_NEWKEYS)
|
|
|
|
set_newkeys(MODE_IN);
|
2000-04-04 04:38:59 +00:00
|
|
|
#ifdef PACKET_DEBUG
|
2001-03-05 06:47:00 +00:00
|
|
|
fprintf(stderr, "read/plain[%d]:\r\n", type);
|
2000-04-04 04:38:59 +00:00
|
|
|
buffer_dump(&incoming_packet);
|
|
|
|
#endif
|
2001-06-05 21:09:18 +00:00
|
|
|
/* reset for next packet */
|
|
|
|
packet_length = 0;
|
|
|
|
return type;
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read_poll_seqnr(u_int32_t *seqnr_p)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
2002-01-22 12:23:11 +00:00
|
|
|
int reason, seqnr;
|
2001-06-05 21:09:18 +00:00
|
|
|
u_char type;
|
2000-04-04 04:38:59 +00:00
|
|
|
char *msg;
|
|
|
|
|
2001-06-05 21:09:18 +00:00
|
|
|
for (;;) {
|
|
|
|
if (compat20) {
|
2002-01-22 12:16:32 +00:00
|
|
|
type = packet_read_poll2(seqnr_p);
|
2001-06-05 21:09:18 +00:00
|
|
|
if (type)
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("received packet type %d", type));
|
2001-12-06 18:00:18 +00:00
|
|
|
switch (type) {
|
2000-04-04 04:38:59 +00:00
|
|
|
case SSH2_MSG_IGNORE:
|
|
|
|
break;
|
|
|
|
case SSH2_MSG_DEBUG:
|
|
|
|
packet_get_char();
|
|
|
|
msg = packet_get_string(NULL);
|
|
|
|
debug("Remote: %.900s", msg);
|
|
|
|
xfree(msg);
|
|
|
|
msg = packet_get_string(NULL);
|
|
|
|
xfree(msg);
|
|
|
|
break;
|
|
|
|
case SSH2_MSG_DISCONNECT:
|
|
|
|
reason = packet_get_int();
|
|
|
|
msg = packet_get_string(NULL);
|
2001-01-03 03:51:15 +00:00
|
|
|
log("Received disconnect from %s: %d: %.400s", get_remote_ipaddr(),
|
|
|
|
reason, msg);
|
2000-04-04 04:38:59 +00:00
|
|
|
xfree(msg);
|
|
|
|
fatal_cleanup();
|
|
|
|
break;
|
2002-01-22 12:23:11 +00:00
|
|
|
case SSH2_MSG_UNIMPLEMENTED:
|
|
|
|
seqnr = packet_get_int();
|
|
|
|
debug("Received SSH2_MSG_UNIMPLEMENTED for %d", seqnr);
|
|
|
|
break;
|
2000-04-04 04:38:59 +00:00
|
|
|
default:
|
|
|
|
return type;
|
|
|
|
break;
|
2001-02-05 12:42:17 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
} else {
|
2002-01-22 12:16:32 +00:00
|
|
|
type = packet_read_poll1();
|
2001-12-06 18:00:18 +00:00
|
|
|
switch (type) {
|
2000-04-04 04:38:59 +00:00
|
|
|
case SSH_MSG_IGNORE:
|
|
|
|
break;
|
|
|
|
case SSH_MSG_DEBUG:
|
|
|
|
msg = packet_get_string(NULL);
|
|
|
|
debug("Remote: %.900s", msg);
|
|
|
|
xfree(msg);
|
|
|
|
break;
|
|
|
|
case SSH_MSG_DISCONNECT:
|
|
|
|
msg = packet_get_string(NULL);
|
2001-01-03 03:51:15 +00:00
|
|
|
log("Received disconnect from %s: %.400s", get_remote_ipaddr(),
|
|
|
|
msg);
|
2000-04-04 04:38:59 +00:00
|
|
|
fatal_cleanup();
|
|
|
|
xfree(msg);
|
|
|
|
break;
|
|
|
|
default:
|
2001-06-05 21:09:18 +00:00
|
|
|
if (type)
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("received packet type %d", type));
|
|
|
|
return type;
|
|
|
|
break;
|
2001-02-05 12:42:17 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-12-21 04:00:19 +00:00
|
|
|
int
|
2002-01-22 12:16:32 +00:00
|
|
|
packet_read_poll(void)
|
2001-12-21 04:00:19 +00:00
|
|
|
{
|
2002-01-22 12:16:32 +00:00
|
|
|
return packet_read_poll_seqnr(NULL);
|
2001-12-21 04:00:19 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Buffers the given amount of input characters. This is intended to be used
|
|
|
|
* together with packet_read_poll.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
2000-12-22 01:43:59 +00:00
|
|
|
packet_process_incoming(const char *buf, u_int len)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_append(&input, buf, len);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns a character from the packet. */
|
|
|
|
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_get_char(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char ch;
|
|
|
|
buffer_get(&incoming_packet, &ch, 1);
|
2000-12-22 01:43:59 +00:00
|
|
|
return (u_char) ch;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns an integer from the packet data. */
|
|
|
|
|
2000-12-22 01:43:59 +00:00
|
|
|
u_int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_get_int(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return buffer_get_int(&incoming_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Returns an arbitrary precision integer from the packet data. The integer
|
|
|
|
* must have been initialized before this call.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
2002-01-22 12:14:44 +00:00
|
|
|
packet_get_bignum(BIGNUM * value)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2002-01-22 12:15:57 +00:00
|
|
|
buffer_get_bignum(&incoming_packet, value);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
void
|
2002-01-22 12:14:44 +00:00
|
|
|
packet_get_bignum2(BIGNUM * value)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
2002-01-22 12:15:57 +00:00
|
|
|
buffer_get_bignum2(&incoming_packet, value);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
2001-12-21 03:56:54 +00:00
|
|
|
void *
|
2000-04-04 04:38:59 +00:00
|
|
|
packet_get_raw(int *length_ptr)
|
|
|
|
{
|
|
|
|
int bytes = buffer_len(&incoming_packet);
|
|
|
|
if (length_ptr != NULL)
|
|
|
|
*length_ptr = bytes;
|
|
|
|
return buffer_ptr(&incoming_packet);
|
|
|
|
}
|
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
int
|
|
|
|
packet_remaining(void)
|
|
|
|
{
|
|
|
|
return buffer_len(&incoming_packet);
|
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Returns a string from the packet data. The string is allocated using
|
|
|
|
* xmalloc; it is the responsibility of the calling program to free it when
|
|
|
|
* no longer needed. The length_ptr argument may be NULL, or point to an
|
|
|
|
* integer into which the length of the string is stored.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2001-12-21 03:56:54 +00:00
|
|
|
void *
|
2000-12-22 01:43:59 +00:00
|
|
|
packet_get_string(u_int *length_ptr)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return buffer_get_string(&incoming_packet, length_ptr);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Sends a diagnostic message from the server to the client. This message
|
|
|
|
* can be sent at any time (but not while constructing another message). The
|
|
|
|
* message is printed immediately, but only if the client is being executed
|
|
|
|
* in verbose mode. These messages are primarily intended to ease debugging
|
|
|
|
* authentication problems. The length of the formatted message must not
|
|
|
|
* exceed 1024 bytes. This will automatically call packet_write_wait.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_send_debug(const char *fmt,...)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[1024];
|
|
|
|
va_list args;
|
|
|
|
|
2000-12-07 01:24:58 +00:00
|
|
|
if (compat20 && (datafellows & SSH_BUG_DEBUG))
|
|
|
|
return;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
va_start(args, fmt);
|
|
|
|
vsnprintf(buf, sizeof(buf), fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
|
2000-04-30 22:24:07 +00:00
|
|
|
if (compat20) {
|
|
|
|
packet_start(SSH2_MSG_DEBUG);
|
|
|
|
packet_put_char(0); /* bool: always display */
|
|
|
|
packet_put_cstring(buf);
|
|
|
|
packet_put_cstring("");
|
|
|
|
} else {
|
|
|
|
packet_start(SSH_MSG_DEBUG);
|
|
|
|
packet_put_cstring(buf);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_send();
|
|
|
|
packet_write_wait();
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Logs the error plus constructs and sends a disconnect packet, closes the
|
|
|
|
* connection, and exits. This function never returns. The error message
|
|
|
|
* should not contain a newline. The length of the formatted message must
|
|
|
|
* not exceed 1024 bytes.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_disconnect(const char *fmt,...)
|
|
|
|
{
|
|
|
|
char buf[1024];
|
|
|
|
va_list args;
|
|
|
|
static int disconnecting = 0;
|
|
|
|
if (disconnecting) /* Guard against recursive invocations. */
|
|
|
|
fatal("packet_disconnect called recursively.");
|
|
|
|
disconnecting = 1;
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Format the message. Note that the caller must make sure the
|
|
|
|
* message is of limited size.
|
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
va_start(args, fmt);
|
|
|
|
vsnprintf(buf, sizeof(buf), fmt, args);
|
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
/* Send the disconnect message to the other side, and wait for it to get sent. */
|
2000-04-04 04:38:59 +00:00
|
|
|
if (compat20) {
|
|
|
|
packet_start(SSH2_MSG_DISCONNECT);
|
|
|
|
packet_put_int(SSH2_DISCONNECT_PROTOCOL_ERROR);
|
|
|
|
packet_put_cstring(buf);
|
|
|
|
packet_put_cstring("");
|
|
|
|
} else {
|
|
|
|
packet_start(SSH_MSG_DISCONNECT);
|
2001-06-09 01:42:01 +00:00
|
|
|
packet_put_cstring(buf);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_send();
|
|
|
|
packet_write_wait();
|
|
|
|
|
|
|
|
/* Stop listening for connections. */
|
2001-06-21 03:19:23 +00:00
|
|
|
channel_close_all();
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Close the connection. */
|
|
|
|
packet_close();
|
|
|
|
|
|
|
|
/* Display the error locally and exit. */
|
1999-12-06 00:47:28 +00:00
|
|
|
log("Disconnecting: %.100s", buf);
|
|
|
|
fatal_cleanup();
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/* Checks if there is any buffered output, and tries to write some of the output. */
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_write_poll(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
int len = buffer_len(&output);
|
|
|
|
if (len > 0) {
|
|
|
|
len = write(connection_out, buffer_ptr(&output), len);
|
|
|
|
if (len <= 0) {
|
|
|
|
if (errno == EAGAIN)
|
|
|
|
return;
|
|
|
|
else
|
|
|
|
fatal("Write failed: %.100s", strerror(errno));
|
|
|
|
}
|
|
|
|
buffer_consume(&output, len);
|
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Calls packet_write_poll repeatedly until all pending output data has been
|
|
|
|
* written.
|
|
|
|
*/
|
1999-10-27 03:42:43 +00:00
|
|
|
|
|
|
|
void
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_write_wait(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2001-03-05 07:07:49 +00:00
|
|
|
fd_set *setp;
|
|
|
|
|
|
|
|
setp = (fd_set *)xmalloc(howmany(connection_out + 1, NFDBITS) *
|
|
|
|
sizeof(fd_mask));
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_write_poll();
|
|
|
|
while (packet_have_data_to_write()) {
|
2001-03-05 07:07:49 +00:00
|
|
|
memset(setp, 0, howmany(connection_out + 1, NFDBITS) *
|
|
|
|
sizeof(fd_mask));
|
|
|
|
FD_SET(connection_out, setp);
|
|
|
|
while (select(connection_out + 1, NULL, setp, NULL, NULL) == -1 &&
|
2001-02-15 03:12:08 +00:00
|
|
|
(errno == EAGAIN || errno == EINTR))
|
|
|
|
;
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_write_poll();
|
|
|
|
}
|
2001-03-05 07:07:49 +00:00
|
|
|
xfree(setp);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns true if there is buffered data to write to the connection. */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_have_data_to_write(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return buffer_len(&output) != 0;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns true if there is not too much data to write to the connection. */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_not_very_much_data_to_write(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
if (interactive_mode)
|
|
|
|
return buffer_len(&output) < 16384;
|
|
|
|
else
|
|
|
|
return buffer_len(&output) < 128 * 1024;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Informs that the current session is interactive. Sets IP flags for that. */
|
|
|
|
|
|
|
|
void
|
2001-01-18 02:04:35 +00:00
|
|
|
packet_set_interactive(int interactive)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
2001-01-18 02:04:35 +00:00
|
|
|
static int called = 0;
|
2001-02-27 03:03:30 +00:00
|
|
|
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
|
2001-01-18 02:04:35 +00:00
|
|
|
int lowdelay = IPTOS_LOWDELAY;
|
|
|
|
int throughput = IPTOS_THROUGHPUT;
|
2001-02-27 03:03:30 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2001-01-18 02:04:35 +00:00
|
|
|
if (called)
|
|
|
|
return;
|
|
|
|
called = 1;
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Record that we are in interactive mode. */
|
|
|
|
interactive_mode = interactive;
|
|
|
|
|
2000-01-14 04:45:46 +00:00
|
|
|
/* Only set socket options if using a socket. */
|
|
|
|
if (!packet_connection_is_on_socket())
|
1999-11-24 13:26:21 +00:00
|
|
|
return;
|
2000-01-14 04:45:46 +00:00
|
|
|
/*
|
2001-01-11 06:20:23 +00:00
|
|
|
* IPTOS_LOWDELAY and IPTOS_THROUGHPUT are IPv4 only
|
2000-01-14 04:45:46 +00:00
|
|
|
*/
|
1999-11-24 13:26:21 +00:00
|
|
|
if (interactive) {
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Set IP options for an interactive connection. Use
|
|
|
|
* IPTOS_LOWDELAY and TCP_NODELAY.
|
|
|
|
*/
|
2000-07-10 23:29:50 +00:00
|
|
|
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
|
2001-01-11 06:20:23 +00:00
|
|
|
if (packet_connection_is_ipv4()) {
|
2001-01-24 13:47:43 +00:00
|
|
|
if (setsockopt(connection_in, IPPROTO_IP, IP_TOS,
|
2002-03-05 01:31:28 +00:00
|
|
|
&lowdelay, sizeof(lowdelay)) < 0)
|
2001-01-24 13:47:43 +00:00
|
|
|
error("setsockopt IPTOS_LOWDELAY: %.100s",
|
2001-01-11 06:20:23 +00:00
|
|
|
strerror(errno));
|
|
|
|
}
|
2000-05-17 12:53:33 +00:00
|
|
|
#endif
|
2002-02-05 00:52:13 +00:00
|
|
|
set_nodelay(connection_in);
|
2001-01-11 06:20:23 +00:00
|
|
|
} else if (packet_connection_is_ipv4()) {
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* Set IP options for a non-interactive connection. Use
|
|
|
|
* IPTOS_THROUGHPUT.
|
|
|
|
*/
|
2000-07-10 23:29:50 +00:00
|
|
|
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
|
2002-03-05 01:31:28 +00:00
|
|
|
if (setsockopt(connection_in, IPPROTO_IP, IP_TOS, &throughput,
|
2000-01-14 04:45:46 +00:00
|
|
|
sizeof(throughput)) < 0)
|
1999-11-24 13:26:21 +00:00
|
|
|
error("setsockopt IPTOS_THROUGHPUT: %.100s", strerror(errno));
|
2000-05-17 12:53:33 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns true if the current connection is interactive. */
|
|
|
|
|
|
|
|
int
|
2001-12-06 17:55:26 +00:00
|
|
|
packet_is_interactive(void)
|
1999-10-27 03:42:43 +00:00
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
return interactive_mode;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-21 02:23:52 +00:00
|
|
|
|
|
|
|
int
|
|
|
|
packet_set_maxsize(int s)
|
|
|
|
{
|
1999-11-24 13:26:21 +00:00
|
|
|
static int called = 0;
|
|
|
|
if (called) {
|
2000-04-04 04:38:59 +00:00
|
|
|
log("packet_set_maxsize: called twice: old %d new %d",
|
|
|
|
max_packet_size, s);
|
1999-11-24 13:26:21 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (s < 4 * 1024 || s > 1024 * 1024) {
|
|
|
|
log("packet_set_maxsize: bad size %d", s);
|
|
|
|
return -1;
|
|
|
|
}
|
2001-10-03 17:10:17 +00:00
|
|
|
called = 1;
|
2001-06-13 04:39:18 +00:00
|
|
|
debug("packet_set_maxsize: setting to %d", s);
|
1999-11-24 13:26:21 +00:00
|
|
|
max_packet_size = s;
|
|
|
|
return s;
|
1999-11-21 02:23:52 +00:00
|
|
|
}
|
2001-03-05 06:17:49 +00:00
|
|
|
|
2001-11-12 00:02:52 +00:00
|
|
|
/* roundup current message to pad bytes */
|
|
|
|
void
|
|
|
|
packet_add_padding(u_char pad)
|
|
|
|
{
|
|
|
|
extra_pad = pad;
|
|
|
|
}
|
|
|
|
|
2001-03-05 06:17:49 +00:00
|
|
|
/*
|
|
|
|
* 9.2. Ignored Data Message
|
2001-04-05 23:26:32 +00:00
|
|
|
*
|
2001-03-05 06:17:49 +00:00
|
|
|
* byte SSH_MSG_IGNORE
|
|
|
|
* string data
|
2001-04-05 23:26:32 +00:00
|
|
|
*
|
2001-03-05 06:17:49 +00:00
|
|
|
* All implementations MUST understand (and ignore) this message at any
|
|
|
|
* time (after receiving the protocol version). No implementation is
|
|
|
|
* required to send them. This message can be used as an additional
|
|
|
|
* protection measure against advanced traffic analysis techniques.
|
|
|
|
*/
|
2001-03-05 06:28:06 +00:00
|
|
|
void
|
|
|
|
packet_send_ignore(int nbytes)
|
|
|
|
{
|
|
|
|
u_int32_t rand = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
packet_start(compat20 ? SSH2_MSG_IGNORE : SSH_MSG_IGNORE);
|
2001-03-05 06:17:49 +00:00
|
|
|
packet_put_int(nbytes);
|
2001-12-21 03:45:46 +00:00
|
|
|
for (i = 0; i < nbytes; i++) {
|
2001-03-05 06:17:49 +00:00
|
|
|
if (i % 4 == 0)
|
|
|
|
rand = arc4random();
|
|
|
|
packet_put_char(rand & 0xff);
|
|
|
|
rand >>= 8;
|
|
|
|
}
|
|
|
|
}
|