2010-08-31 12:41:14 +00:00
|
|
|
/* $OpenBSD: packet.c,v 1.170 2010/08/31 11:54:45 djm Exp $ */
|
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"
|
2006-03-15 00:24:12 +00:00
|
|
|
|
2006-07-10 11:08:03 +00:00
|
|
|
#include <sys/types.h>
|
2003-04-09 11:05:52 +00:00
|
|
|
#include "openbsd-compat/sys-queue.h"
|
2006-08-05 01:02:17 +00:00
|
|
|
#include <sys/param.h>
|
2006-07-10 10:35:38 +00:00
|
|
|
#include <sys/socket.h>
|
2006-08-05 00:57:45 +00:00
|
|
|
#ifdef HAVE_SYS_TIME_H
|
|
|
|
# include <sys/time.h>
|
|
|
|
#endif
|
2006-07-10 10:35:38 +00:00
|
|
|
|
|
|
|
#include <netinet/in.h>
|
2006-03-15 00:24:12 +00:00
|
|
|
#include <netinet/ip.h>
|
2006-09-22 09:22:17 +00:00
|
|
|
#include <arpa/inet.h>
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2006-07-12 12:22:46 +00:00
|
|
|
#include <errno.h>
|
2006-07-12 12:15:16 +00:00
|
|
|
#include <stdarg.h>
|
2006-08-05 01:37:59 +00:00
|
|
|
#include <stdio.h>
|
2006-08-05 01:34:19 +00:00
|
|
|
#include <stdlib.h>
|
2006-07-24 04:13:33 +00:00
|
|
|
#include <string.h>
|
2006-07-24 04:01:23 +00:00
|
|
|
#include <unistd.h>
|
2006-08-05 02:39:39 +00:00
|
|
|
#include <signal.h>
|
2006-07-12 12:15:16 +00:00
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
#include "xmalloc.h"
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "packet.h"
|
|
|
|
#include "crc32.h"
|
|
|
|
#include "compress.h"
|
|
|
|
#include "deattack.h"
|
2001-06-09 00:36:26 +00:00
|
|
|
#include "channels.h"
|
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"
|
2006-08-05 02:39:39 +00:00
|
|
|
#include "key.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"
|
2002-06-21 00:43:42 +00:00
|
|
|
#include "ssh.h"
|
2009-06-21 08:53:53 +00:00
|
|
|
#include "roaming.h"
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
#define DBG(x) x
|
|
|
|
#else
|
|
|
|
#define DBG(x)
|
|
|
|
#endif
|
|
|
|
|
2009-01-28 05:38:41 +00:00
|
|
|
#define PACKET_MAX_SIZE (256 * 1024)
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
struct packet_state {
|
|
|
|
u_int32_t seqnr;
|
|
|
|
u_int32_t packets;
|
|
|
|
u_int64_t blocks;
|
|
|
|
u_int64_t bytes;
|
|
|
|
};
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
struct packet {
|
|
|
|
TAILQ_ENTRY(packet) next;
|
|
|
|
u_char type;
|
|
|
|
Buffer payload;
|
|
|
|
};
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
struct session_state {
|
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*/
|
|
|
|
int connection_in;
|
|
|
|
int connection_out;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Protocol flags for the remote side. */
|
|
|
|
u_int remote_protocol_flags;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Encryption context for receiving data. Only used for decryption. */
|
|
|
|
CipherContext receive_context;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Encryption context for sending data. Only used for encryption. */
|
|
|
|
CipherContext send_context;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Buffer for raw input data from the socket. */
|
|
|
|
Buffer input;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Buffer for raw output data going to the socket. */
|
|
|
|
Buffer output;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Buffer for the partial outgoing packet being constructed. */
|
|
|
|
Buffer outgoing_packet;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Buffer for the incoming packet currently being processed. */
|
|
|
|
Buffer incoming_packet;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Scratch buffer for packet compression/decompression. */
|
|
|
|
Buffer compression_buffer;
|
|
|
|
int compression_buffer_ready;
|
1999-11-21 02:23:52 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/*
|
|
|
|
* Flag indicating whether packet compression/decompression is
|
|
|
|
* enabled.
|
|
|
|
*/
|
|
|
|
int packet_compression;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* default maximum packet size */
|
|
|
|
u_int max_packet_size;
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Flag indicating whether this module has been initialized. */
|
|
|
|
int initialized;
|
2005-07-26 11:54:56 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Set to true if the connection is interactive. */
|
|
|
|
int interactive_mode;
|
2005-07-26 11:54:56 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Set to true if we are the server side. */
|
|
|
|
int server_side;
|
2008-03-07 07:33:30 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Set to true if we are authenticated. */
|
|
|
|
int after_authentication;
|
2008-06-12 20:42:45 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
int keep_alive_timeouts;
|
2003-04-09 10:50:06 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* The maximum time that we will wait to send or receive a packet */
|
|
|
|
int packet_timeout_ms;
|
2000-04-04 04:38:59 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Session key information for Encryption and MAC */
|
|
|
|
Newkeys *newkeys[MODE_MAX];
|
|
|
|
struct packet_state p_read, p_send;
|
2002-06-21 00:43:42 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
u_int64_t max_blocks_in, max_blocks_out;
|
|
|
|
u_int32_t rekey_limit;
|
2001-11-12 00:02:52 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* Session key for protocol v1 */
|
|
|
|
u_char ssh1_key[SSH_SESSION_KEY_LENGTH];
|
|
|
|
u_int ssh1_keylen;
|
2009-01-28 05:38:41 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
/* roundup current message to extra_pad bytes */
|
|
|
|
u_char extra_pad;
|
|
|
|
|
|
|
|
/* XXX discard incoming data after MAC error */
|
|
|
|
u_int packet_discard;
|
|
|
|
Mac *packet_discard_mac;
|
|
|
|
|
|
|
|
/* Used in packet_read_poll2() */
|
|
|
|
u_int packlen;
|
|
|
|
|
2009-06-21 08:59:36 +00:00
|
|
|
/* Used in packet_send2 */
|
|
|
|
int rekeying;
|
|
|
|
|
|
|
|
/* Used in packet_set_interactive */
|
|
|
|
int set_interactive_called;
|
|
|
|
|
|
|
|
/* Used in packet_set_maxsize */
|
|
|
|
int set_maxsize_called;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
TAILQ_HEAD(, packet) outgoing;
|
2003-04-09 10:50:06 +00:00
|
|
|
};
|
2009-06-21 08:12:20 +00:00
|
|
|
|
2009-07-05 21:11:13 +00:00
|
|
|
static struct session_state *active_state, *backup_state;
|
2009-06-21 08:12:20 +00:00
|
|
|
|
|
|
|
static struct session_state *
|
2009-06-21 08:58:46 +00:00
|
|
|
alloc_session_state(void)
|
2009-06-21 08:12:20 +00:00
|
|
|
{
|
|
|
|
struct session_state *s = xcalloc(1, sizeof(*s));
|
|
|
|
|
|
|
|
s->connection_in = -1;
|
|
|
|
s->connection_out = -1;
|
|
|
|
s->max_packet_size = 32768;
|
|
|
|
s->packet_timeout_ms = -1;
|
|
|
|
return s;
|
|
|
|
}
|
2003-04-09 10:50:06 +00:00
|
|
|
|
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");
|
2002-07-07 22:11:51 +00:00
|
|
|
|
2000-10-14 05:23:11 +00:00
|
|
|
if (none == NULL)
|
|
|
|
fatal("packet_set_connection: cannot load cipher 'none'");
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state == NULL)
|
|
|
|
active_state = alloc_session_state();
|
|
|
|
active_state->connection_in = fd_in;
|
|
|
|
active_state->connection_out = fd_out;
|
|
|
|
cipher_init(&active_state->send_context, none, (const u_char *)"",
|
2004-05-13 06:39:33 +00:00
|
|
|
0, NULL, 0, CIPHER_ENCRYPT);
|
2009-06-21 08:12:20 +00:00
|
|
|
cipher_init(&active_state->receive_context, none, (const u_char *)"",
|
2004-05-13 06:39:33 +00:00
|
|
|
0, NULL, 0, CIPHER_DECRYPT);
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->newkeys[MODE_IN] = active_state->newkeys[MODE_OUT] = NULL;
|
|
|
|
if (!active_state->initialized) {
|
|
|
|
active_state->initialized = 1;
|
|
|
|
buffer_init(&active_state->input);
|
|
|
|
buffer_init(&active_state->output);
|
|
|
|
buffer_init(&active_state->outgoing_packet);
|
|
|
|
buffer_init(&active_state->incoming_packet);
|
|
|
|
TAILQ_INIT(&active_state->outgoing);
|
|
|
|
active_state->p_send.packets = active_state->p_read.packets = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2008-06-12 20:42:45 +00:00
|
|
|
void
|
|
|
|
packet_set_timeout(int timeout, int count)
|
|
|
|
{
|
|
|
|
if (timeout == 0 || count == 0) {
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packet_timeout_ms = -1;
|
2008-06-12 20:42:45 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if ((INT_MAX / 1000) / count < timeout)
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packet_timeout_ms = INT_MAX;
|
2008-06-12 20:42:45 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packet_timeout_ms = timeout * count * 1000;
|
2008-06-12 20:42:45 +00:00
|
|
|
}
|
|
|
|
|
2009-01-28 05:38:41 +00:00
|
|
|
static void
|
|
|
|
packet_stop_discard(void)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_discard_mac) {
|
2009-01-28 05:38:41 +00:00
|
|
|
char buf[1024];
|
|
|
|
|
|
|
|
memset(buf, 'a', sizeof(buf));
|
2009-06-21 08:12:20 +00:00
|
|
|
while (buffer_len(&active_state->incoming_packet) <
|
|
|
|
PACKET_MAX_SIZE)
|
|
|
|
buffer_append(&active_state->incoming_packet, buf,
|
|
|
|
sizeof(buf));
|
|
|
|
(void) mac_compute(active_state->packet_discard_mac,
|
|
|
|
active_state->p_read.seqnr,
|
|
|
|
buffer_ptr(&active_state->incoming_packet),
|
2009-01-28 05:38:41 +00:00
|
|
|
PACKET_MAX_SIZE);
|
|
|
|
}
|
|
|
|
logit("Finished discarding for %.200s", get_remote_ipaddr());
|
|
|
|
cleanup_exit(255);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
packet_start_discard(Enc *enc, Mac *mac, u_int packet_length, u_int discard)
|
|
|
|
{
|
2009-02-14 05:35:01 +00:00
|
|
|
if (enc == NULL || !cipher_is_cbc(enc->cipher))
|
2009-01-28 05:38:41 +00:00
|
|
|
packet_disconnect("Packet corrupt");
|
|
|
|
if (packet_length != PACKET_MAX_SIZE && mac && mac->enabled)
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packet_discard_mac = mac;
|
|
|
|
if (buffer_len(&active_state->input) >= discard)
|
2009-01-28 05:38:41 +00:00
|
|
|
packet_stop_discard();
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packet_discard = discard -
|
|
|
|
buffer_len(&active_state->input);
|
2009-01-28 05:38:41 +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 */
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->connection_in == active_state->connection_out)
|
2000-01-14 04:45:46 +00:00
|
|
|
return 1;
|
|
|
|
fromlen = sizeof(from);
|
|
|
|
memset(&from, 0, sizeof(from));
|
2009-06-21 08:12:20 +00:00
|
|
|
if (getpeername(active_state->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));
|
2009-06-21 08:12:20 +00:00
|
|
|
if (getpeername(active_state->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)
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->send_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->receive_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
|
|
|
|
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)
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->send_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->receive_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
|
|
|
|
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)
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->send_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->receive_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
|
|
|
|
cipher_set_keycontext(cc, dat);
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
packet_get_keyiv_len(int mode)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
|
|
|
|
|
|
|
if (mode == MODE_OUT)
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->send_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->receive_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
|
|
|
|
return (cipher_get_keyiv_len(cc));
|
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
2002-03-22 01:42:04 +00:00
|
|
|
void
|
|
|
|
packet_set_iv(int mode, u_char *dat)
|
|
|
|
{
|
|
|
|
CipherContext *cc;
|
|
|
|
|
|
|
|
if (mode == MODE_OUT)
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->send_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->receive_context;
|
2002-03-22 01:42:04 +00:00
|
|
|
|
|
|
|
cipher_set_keyiv(cc, dat);
|
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
2002-03-22 01:42:04 +00:00
|
|
|
int
|
2003-06-11 12:05:06 +00:00
|
|
|
packet_get_ssh1_cipher(void)
|
2002-03-22 01:42:04 +00:00
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return (cipher_get_number(active_state->receive_context.cipher));
|
2002-03-22 01:42:04 +00:00
|
|
|
}
|
|
|
|
|
2003-04-09 10:50:06 +00:00
|
|
|
void
|
2008-07-11 07:36:48 +00:00
|
|
|
packet_get_state(int mode, u_int32_t *seqnr, u_int64_t *blocks, u_int32_t *packets,
|
|
|
|
u_int64_t *bytes)
|
2002-03-22 01:42:04 +00:00
|
|
|
{
|
2003-04-09 10:50:06 +00:00
|
|
|
struct packet_state *state;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
state = (mode == MODE_IN) ?
|
|
|
|
&active_state->p_read : &active_state->p_send;
|
2008-07-11 07:36:48 +00:00
|
|
|
if (seqnr)
|
|
|
|
*seqnr = state->seqnr;
|
|
|
|
if (blocks)
|
|
|
|
*blocks = state->blocks;
|
|
|
|
if (packets)
|
|
|
|
*packets = state->packets;
|
|
|
|
if (bytes)
|
|
|
|
*bytes = state->bytes;
|
2002-03-22 01:42:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2008-07-11 07:36:48 +00:00
|
|
|
packet_set_state(int mode, u_int32_t seqnr, u_int64_t blocks, u_int32_t packets,
|
|
|
|
u_int64_t bytes)
|
2002-03-22 01:42:04 +00:00
|
|
|
{
|
2003-04-09 10:50:06 +00:00
|
|
|
struct packet_state *state;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
state = (mode == MODE_IN) ?
|
|
|
|
&active_state->p_read : &active_state->p_send;
|
2003-04-09 10:50:06 +00:00
|
|
|
state->seqnr = seqnr;
|
|
|
|
state->blocks = blocks;
|
|
|
|
state->packets = packets;
|
2008-07-11 07:36:48 +00:00
|
|
|
state->bytes = bytes;
|
2002-03-22 01:42:04 +00:00
|
|
|
}
|
|
|
|
|
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));
|
2009-06-21 08:12:20 +00:00
|
|
|
if (getsockname(active_state->connection_out, (struct sockaddr *)&to,
|
|
|
|
&tolen) < 0)
|
2000-01-14 04:45:46 +00:00
|
|
|
return 0;
|
2002-04-26 06:54:34 +00:00
|
|
|
if (to.ss_family == AF_INET)
|
|
|
|
return 1;
|
|
|
|
#ifdef IPV4_IN_IPV6
|
2003-11-21 12:48:55 +00:00
|
|
|
if (to.ss_family == AF_INET6 &&
|
2002-04-26 06:54:34 +00:00
|
|
|
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. */
|
2009-06-21 08:12:20 +00:00
|
|
|
set_nonblock(active_state->connection_in);
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->connection_out != active_state->connection_in)
|
|
|
|
set_nonblock(active_state->connection_out);
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
if (!active_state->initialized)
|
1999-11-24 13:26:21 +00:00
|
|
|
return;
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->initialized = 0;
|
|
|
|
if (active_state->connection_in == active_state->connection_out) {
|
|
|
|
shutdown(active_state->connection_out, SHUT_RDWR);
|
|
|
|
close(active_state->connection_out);
|
1999-11-24 13:26:21 +00:00
|
|
|
} else {
|
2009-06-21 08:12:20 +00:00
|
|
|
close(active_state->connection_in);
|
|
|
|
close(active_state->connection_out);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_free(&active_state->input);
|
|
|
|
buffer_free(&active_state->output);
|
|
|
|
buffer_free(&active_state->outgoing_packet);
|
|
|
|
buffer_free(&active_state->incoming_packet);
|
|
|
|
if (active_state->compression_buffer_ready) {
|
|
|
|
buffer_free(&active_state->compression_buffer);
|
1999-11-24 13:26:21 +00:00
|
|
|
buffer_compress_uninit();
|
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
cipher_cleanup(&active_state->send_context);
|
|
|
|
cipher_cleanup(&active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->compression_buffer_ready == 1)
|
2001-04-05 23:20:46 +00:00
|
|
|
return;
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->compression_buffer_ready = 1;
|
|
|
|
buffer_init(&active_state->compression_buffer);
|
2001-04-05 23:20:46 +00:00
|
|
|
}
|
|
|
|
|
1999-10-27 03:42:43 +00:00
|
|
|
void
|
|
|
|
packet_start_compression(int level)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_compression && !compat20)
|
1999-11-24 13:26:21 +00:00
|
|
|
fatal("Compression already enabled.");
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->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.
|
|
|
|
*/
|
2002-06-21 00:43:42 +00:00
|
|
|
|
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);
|
2002-07-07 22:11:51 +00:00
|
|
|
|
2000-10-14 05:23:11 +00:00
|
|
|
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-06-21 00:43:42 +00:00
|
|
|
if (keylen > SSH_SESSION_KEY_LENGTH)
|
|
|
|
fatal("packet_set_encryption_key: keylen too big: %d", keylen);
|
2009-06-21 08:12:20 +00:00
|
|
|
memcpy(active_state->ssh1_key, key, keylen);
|
|
|
|
active_state->ssh1_keylen = keylen;
|
|
|
|
cipher_init(&active_state->send_context, cipher, key, keylen, NULL,
|
|
|
|
0, CIPHER_ENCRYPT);
|
|
|
|
cipher_init(&active_state->receive_context, cipher, key, keylen, NULL,
|
|
|
|
0, CIPHER_DECRYPT);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2002-06-21 00:43:42 +00:00
|
|
|
u_int
|
|
|
|
packet_get_encryption_key(u_char *key)
|
|
|
|
{
|
|
|
|
if (key == NULL)
|
2009-06-21 08:12:20 +00:00
|
|
|
return (active_state->ssh1_keylen);
|
|
|
|
memcpy(key, active_state->ssh1_key, active_state->ssh1_keylen);
|
|
|
|
return (active_state->ssh1_keylen);
|
2002-06-21 00:43:42 +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;
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_clear(&active_state->outgoing_packet);
|
|
|
|
buffer_append(&active_state->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;
|
2002-07-07 22:11:51 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->outgoing_packet, &ch, 1);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_put_int(&active_state->outgoing_packet, value);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
2009-06-21 08:16:26 +00:00
|
|
|
void
|
|
|
|
packet_put_int64(u_int64_t value)
|
|
|
|
{
|
|
|
|
buffer_put_int64(&active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_put_string(&active_state->outgoing_packet, buf, len);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
void
|
|
|
|
packet_put_cstring(const char *str)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_put_cstring(&active_state->outgoing_packet, str);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->outgoing_packet, buf, len);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_put_bignum(&active_state->outgoing_packet, value);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
2006-03-26 03:10:14 +00:00
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
void
|
|
|
|
packet_put_bignum2(BIGNUM * value)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_put_bignum2(&active_state->outgoing_packet, value);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
1999-10-27 03:42:43 +00:00
|
|
|
|
2010-09-10 01:39:26 +00:00
|
|
|
#ifdef OPENSSL_HAS_ECC
|
2010-08-31 12:41:14 +00:00
|
|
|
void
|
|
|
|
packet_put_ecpoint(const EC_GROUP *curve, const EC_POINT *point)
|
|
|
|
{
|
|
|
|
buffer_put_ecpoint(&active_state->outgoing_packet, curve, point);
|
|
|
|
}
|
2010-09-10 01:39:26 +00:00
|
|
|
#endif
|
2010-08-31 12:41:14 +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;
|
2004-06-22 02:56:01 +00:00
|
|
|
u_int32_t rnd = 0;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
|
|
|
* If using packet compression, compress the payload of the outgoing
|
|
|
|
* packet.
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_compression) {
|
|
|
|
buffer_clear(&active_state->compression_buffer);
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Skip padding. */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->outgoing_packet, 8);
|
1999-11-24 13:26:21 +00:00
|
|
|
/* padding */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->compression_buffer,
|
|
|
|
"\0\0\0\0\0\0\0\0", 8);
|
|
|
|
buffer_compress(&active_state->outgoing_packet,
|
|
|
|
&active_state->compression_buffer);
|
|
|
|
buffer_clear(&active_state->outgoing_packet);
|
|
|
|
buffer_append(&active_state->outgoing_packet,
|
|
|
|
buffer_ptr(&active_state->compression_buffer),
|
|
|
|
buffer_len(&active_state->compression_buffer));
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
/* Compute packet length without padding (add checksum, remove padding). */
|
2009-06-21 08:12:20 +00:00
|
|
|
len = buffer_len(&active_state->outgoing_packet) + 4 - 8;
|
1999-11-24 13:26:21 +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
|
|
|
/* Insert padding. Initialized to zero in packet_start1() */
|
1999-11-24 13:26:21 +00:00
|
|
|
padding = 8 - len % 8;
|
2009-06-21 08:12:20 +00:00
|
|
|
if (!active_state->send_context.plaintext) {
|
|
|
|
cp = buffer_ptr(&active_state->outgoing_packet);
|
1999-11-24 13:26:21 +00:00
|
|
|
for (i = 0; i < padding; i++) {
|
|
|
|
if (i % 4 == 0)
|
2004-06-22 02:56:01 +00:00
|
|
|
rnd = arc4random();
|
|
|
|
cp[7 - i] = rnd & 0xff;
|
|
|
|
rnd >>= 8;
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->outgoing_packet, 8 - padding);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Add check bytes. */
|
2009-06-21 08:12:20 +00:00
|
|
|
checksum = ssh_crc32(buffer_ptr(&active_state->outgoing_packet),
|
|
|
|
buffer_len(&active_state->outgoing_packet));
|
2006-03-31 12:13:02 +00:00
|
|
|
put_u32(buf, checksum);
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->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: ");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->outgoing_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Append to output. */
|
2006-03-31 12:13:02 +00:00
|
|
|
put_u32(buf, len);
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->output, buf, 4);
|
|
|
|
cp = buffer_append_space(&active_state->output,
|
|
|
|
buffer_len(&active_state->outgoing_packet));
|
|
|
|
cipher_crypt(&active_state->send_context, cp,
|
|
|
|
buffer_ptr(&active_state->outgoing_packet),
|
|
|
|
buffer_len(&active_state->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: ");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->output);
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->p_send.packets++;
|
|
|
|
active_state->p_send.bytes += len +
|
|
|
|
buffer_len(&active_state->outgoing_packet);
|
|
|
|
buffer_clear(&active_state->outgoing_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
|
1999-11-25 00:54:57 +00:00
|
|
|
/*
|
2005-11-05 04:14:59 +00:00
|
|
|
* Note that the packet is now only buffered in output. It won't be
|
1999-11-25 00:54:57 +00:00
|
|
|
* 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;
|
2003-04-09 10:50:06 +00:00
|
|
|
u_int64_t *max_blocks;
|
2004-06-22 02:56:01 +00:00
|
|
|
int crypt_type;
|
2001-04-04 02:00:54 +00:00
|
|
|
|
2002-12-23 02:04:22 +00:00
|
|
|
debug2("set_newkeys: mode %d", mode);
|
2001-04-04 02:00:54 +00:00
|
|
|
|
2002-02-19 04:21:23 +00:00
|
|
|
if (mode == MODE_OUT) {
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->send_context;
|
2004-06-22 02:56:01 +00:00
|
|
|
crypt_type = CIPHER_ENCRYPT;
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->p_send.packets = active_state->p_send.blocks = 0;
|
|
|
|
max_blocks = &active_state->max_blocks_out;
|
2002-02-19 04:21:23 +00:00
|
|
|
} else {
|
2009-06-21 08:12:20 +00:00
|
|
|
cc = &active_state->receive_context;
|
2004-06-22 02:56:01 +00:00
|
|
|
crypt_type = CIPHER_DECRYPT;
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->p_read.packets = active_state->p_read.blocks = 0;
|
|
|
|
max_blocks = &active_state->max_blocks_in;
|
2002-02-19 04:21:23 +00:00
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->newkeys[mode] != NULL) {
|
2002-12-23 02:04:22 +00:00
|
|
|
debug("set_newkeys: rekeying");
|
2002-02-19 04:21:23 +00:00
|
|
|
cipher_cleanup(cc);
|
2009-06-21 08:12:20 +00:00
|
|
|
enc = &active_state->newkeys[mode]->enc;
|
|
|
|
mac = &active_state->newkeys[mode]->mac;
|
|
|
|
comp = &active_state->newkeys[mode]->comp;
|
2007-06-11 04:01:42 +00:00
|
|
|
mac_clear(mac);
|
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);
|
2009-06-21 08:12:20 +00:00
|
|
|
xfree(active_state->newkeys[mode]);
|
2001-04-04 02:00:54 +00:00
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->newkeys[mode] = kex_get_newkeys(mode);
|
|
|
|
if (active_state->newkeys[mode] == NULL)
|
2001-04-04 02:00:54 +00:00
|
|
|
fatal("newkeys: no keys for mode %d", mode);
|
2009-06-21 08:12:20 +00:00
|
|
|
enc = &active_state->newkeys[mode]->enc;
|
|
|
|
mac = &active_state->newkeys[mode]->mac;
|
|
|
|
comp = &active_state->newkeys[mode]->comp;
|
2007-06-11 04:01:42 +00:00
|
|
|
if (mac_init(mac) == 0)
|
2001-04-04 02:00:54 +00:00
|
|
|
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,
|
2004-06-22 02:56:01 +00:00
|
|
|
enc->iv, enc->block_size, crypt_type);
|
2002-03-22 01:42:04 +00:00
|
|
|
/* Deleting the keys does not gain extra security */
|
|
|
|
/* memset(enc->iv, 0, enc->block_size);
|
2007-06-05 08:30:18 +00:00
|
|
|
memset(enc->key, 0, enc->key_len);
|
|
|
|
memset(mac->key, 0, mac->key_len); */
|
2005-07-26 11:54:56 +00:00
|
|
|
if ((comp->type == COMP_ZLIB ||
|
2009-06-21 08:12:20 +00:00
|
|
|
(comp->type == COMP_DELAYED &&
|
|
|
|
active_state->after_authentication)) && 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;
|
|
|
|
}
|
2003-07-14 07:31:06 +00:00
|
|
|
/*
|
|
|
|
* The 2^(blocksize*2) limit is too expensive for 3DES,
|
|
|
|
* blowfish, etc, so enforce a 1GB limit for small blocksizes.
|
|
|
|
*/
|
|
|
|
if (enc->block_size >= 16)
|
|
|
|
*max_blocks = (u_int64_t)1 << (enc->block_size*2);
|
|
|
|
else
|
|
|
|
*max_blocks = ((u_int64_t)1 << 30) / enc->block_size;
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->rekey_limit)
|
|
|
|
*max_blocks = MIN(*max_blocks,
|
|
|
|
active_state->rekey_limit / enc->block_size);
|
2001-04-04 02:00:54 +00:00
|
|
|
}
|
|
|
|
|
2005-07-26 11:54:56 +00:00
|
|
|
/*
|
|
|
|
* Delayed compression for SSH2 is enabled after authentication:
|
2006-08-05 08:51:08 +00:00
|
|
|
* This happens on the server side after a SSH2_MSG_USERAUTH_SUCCESS is sent,
|
2005-07-26 11:54:56 +00:00
|
|
|
* and on the client side after a SSH2_MSG_USERAUTH_SUCCESS is received.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
packet_enable_delayed_compress(void)
|
|
|
|
{
|
|
|
|
Comp *comp = NULL;
|
|
|
|
int mode;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Remember that we are past the authentication step, so rekeying
|
|
|
|
* with COMP_DELAYED will turn on compression immediately.
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->after_authentication = 1;
|
2005-07-26 11:54:56 +00:00
|
|
|
for (mode = 0; mode < MODE_MAX; mode++) {
|
2006-09-21 03:00:25 +00:00
|
|
|
/* protocol error: USERAUTH_SUCCESS received before NEWKEYS */
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->newkeys[mode] == NULL)
|
2006-09-21 03:00:25 +00:00
|
|
|
continue;
|
2009-06-21 08:12:20 +00:00
|
|
|
comp = &active_state->newkeys[mode]->comp;
|
2005-07-26 11:54:56 +00:00
|
|
|
if (comp && !comp->enabled && comp->type == COMP_DELAYED) {
|
2005-08-12 12:10:28 +00:00
|
|
|
packet_init_compression();
|
2005-07-26 11:54:56 +00:00
|
|
|
if (mode == MODE_OUT)
|
|
|
|
buffer_compress_init_send(6);
|
|
|
|
else
|
|
|
|
buffer_compress_init_recv();
|
|
|
|
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
|
2003-04-09 10:50:06 +00:00
|
|
|
packet_send2_wrapped(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;
|
2004-06-22 02:56:01 +00:00
|
|
|
u_int32_t rnd = 0;
|
2000-04-04 04:38:59 +00:00
|
|
|
Enc *enc = NULL;
|
|
|
|
Mac *mac = NULL;
|
|
|
|
Comp *comp = NULL;
|
|
|
|
int block_size;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->newkeys[MODE_OUT] != NULL) {
|
|
|
|
enc = &active_state->newkeys[MODE_OUT]->enc;
|
|
|
|
mac = &active_state->newkeys[MODE_OUT]->mac;
|
|
|
|
comp = &active_state->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
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_ptr(&active_state->outgoing_packet);
|
2002-02-26 18:04:38 +00:00
|
|
|
type = cp[5];
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
fprintf(stderr, "plain: ");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->outgoing_packet);
|
2000-04-04 04:38:59 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
if (comp && comp->enabled) {
|
2009-06-21 08:12:20 +00:00
|
|
|
len = buffer_len(&active_state->outgoing_packet);
|
2000-04-04 04:38:59 +00:00
|
|
|
/* skip header, compress only payload */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->outgoing_packet, 5);
|
|
|
|
buffer_clear(&active_state->compression_buffer);
|
|
|
|
buffer_compress(&active_state->outgoing_packet,
|
|
|
|
&active_state->compression_buffer);
|
|
|
|
buffer_clear(&active_state->outgoing_packet);
|
|
|
|
buffer_append(&active_state->outgoing_packet, "\0\0\0\0\0", 5);
|
|
|
|
buffer_append(&active_state->outgoing_packet,
|
|
|
|
buffer_ptr(&active_state->compression_buffer),
|
|
|
|
buffer_len(&active_state->compression_buffer));
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("compression: raw %d compressed %d", len,
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_len(&active_state->outgoing_packet)));
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* sizeof (packet_len + pad_len + payload) */
|
2009-06-21 08:12:20 +00:00
|
|
|
len = buffer_len(&active_state->outgoing_packet);
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 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;
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->extra_pad) {
|
2001-11-12 00:02:52 +00:00
|
|
|
/* will wrap if extra_pad+padlen > 255 */
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->extra_pad =
|
|
|
|
roundup(active_state->extra_pad, block_size);
|
|
|
|
pad = active_state->extra_pad -
|
|
|
|
((len + padlen) % active_state->extra_pad);
|
2002-03-26 02:09:41 +00:00
|
|
|
debug3("packet_send2: adding %d (len %d padlen %d extra_pad %d)",
|
2009-06-21 08:12:20 +00:00
|
|
|
pad, len, padlen, active_state->extra_pad);
|
2001-11-12 00:02:52 +00:00
|
|
|
padlen += pad;
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->extra_pad = 0;
|
2001-11-12 00:02:52 +00:00
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_append_space(&active_state->outgoing_packet, padlen);
|
|
|
|
if (enc && !active_state->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)
|
2004-06-22 02:56:01 +00:00
|
|
|
rnd = arc4random();
|
|
|
|
cp[i] = rnd & 0xff;
|
|
|
|
rnd >>= 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 */
|
2009-06-21 08:12:20 +00:00
|
|
|
packet_length = buffer_len(&active_state->outgoing_packet) - 4;
|
|
|
|
cp = buffer_ptr(&active_state->outgoing_packet);
|
2006-03-31 12:13:02 +00:00
|
|
|
put_u32(cp, packet_length);
|
2002-02-26 18:04:38 +00:00
|
|
|
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) {
|
2009-06-21 08:12:20 +00:00
|
|
|
macbuf = mac_compute(mac, active_state->p_send.seqnr,
|
|
|
|
buffer_ptr(&active_state->outgoing_packet),
|
|
|
|
buffer_len(&active_state->outgoing_packet));
|
|
|
|
DBG(debug("done calc MAC out #%d", active_state->p_send.seqnr));
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
/* encrypt packet and append to output buffer. */
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_append_space(&active_state->output,
|
|
|
|
buffer_len(&active_state->outgoing_packet));
|
|
|
|
cipher_crypt(&active_state->send_context, cp,
|
|
|
|
buffer_ptr(&active_state->outgoing_packet),
|
|
|
|
buffer_len(&active_state->outgoing_packet));
|
2000-04-04 04:38:59 +00:00
|
|
|
/* append unencrypted MAC */
|
|
|
|
if (mac && mac->enabled)
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->output, macbuf, mac->mac_len);
|
2000-04-04 04:38:59 +00:00
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
fprintf(stderr, "encrypted: ");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->output);
|
2000-04-04 04:38:59 +00:00
|
|
|
#endif
|
2000-04-16 01:18:38 +00:00
|
|
|
/* increment sequence number for outgoing packets */
|
2009-06-21 08:12:20 +00:00
|
|
|
if (++active_state->p_send.seqnr == 0)
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("outgoing seqnr wraps around");
|
2009-06-21 08:12:20 +00:00
|
|
|
if (++active_state->p_send.packets == 0)
|
2003-04-09 10:50:06 +00:00
|
|
|
if (!(datafellows & SSH_BUG_NOREKEY))
|
|
|
|
fatal("XXX too many packets with same key");
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->p_send.blocks += (packet_length + 4) / block_size;
|
|
|
|
active_state->p_send.bytes += packet_length + 4;
|
|
|
|
buffer_clear(&active_state->outgoing_packet);
|
2000-04-04 04:38:59 +00:00
|
|
|
|
2001-04-04 02:00:54 +00:00
|
|
|
if (type == SSH2_MSG_NEWKEYS)
|
|
|
|
set_newkeys(MODE_OUT);
|
2009-06-21 08:12:20 +00:00
|
|
|
else if (type == SSH2_MSG_USERAUTH_SUCCESS && active_state->server_side)
|
2005-07-26 11:54:56 +00:00
|
|
|
packet_enable_delayed_compress();
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
2003-04-09 10:50:06 +00:00
|
|
|
static void
|
|
|
|
packet_send2(void)
|
|
|
|
{
|
|
|
|
struct packet *p;
|
|
|
|
u_char type, *cp;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_ptr(&active_state->outgoing_packet);
|
2003-04-09 10:50:06 +00:00
|
|
|
type = cp[5];
|
|
|
|
|
|
|
|
/* during rekeying we can only send key exchange messages */
|
2009-06-21 08:59:36 +00:00
|
|
|
if (active_state->rekeying) {
|
2003-04-09 10:50:06 +00:00
|
|
|
if (!((type >= SSH2_MSG_TRANSPORT_MIN) &&
|
|
|
|
(type <= SSH2_MSG_TRANSPORT_MAX))) {
|
|
|
|
debug("enqueue packet: %u", type);
|
|
|
|
p = xmalloc(sizeof(*p));
|
|
|
|
p->type = type;
|
2009-06-21 08:12:20 +00:00
|
|
|
memcpy(&p->payload, &active_state->outgoing_packet,
|
|
|
|
sizeof(Buffer));
|
|
|
|
buffer_init(&active_state->outgoing_packet);
|
|
|
|
TAILQ_INSERT_TAIL(&active_state->outgoing, p, next);
|
2003-04-09 10:50:06 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* rekeying starts with sending KEXINIT */
|
|
|
|
if (type == SSH2_MSG_KEXINIT)
|
2009-06-21 08:59:36 +00:00
|
|
|
active_state->rekeying = 1;
|
2003-04-09 10:50:06 +00:00
|
|
|
|
|
|
|
packet_send2_wrapped();
|
|
|
|
|
|
|
|
/* after a NEWKEYS message we can send the complete queue */
|
|
|
|
if (type == SSH2_MSG_NEWKEYS) {
|
2009-06-21 08:59:36 +00:00
|
|
|
active_state->rekeying = 0;
|
2009-06-21 08:12:20 +00:00
|
|
|
while ((p = TAILQ_FIRST(&active_state->outgoing))) {
|
2003-04-09 10:50:06 +00:00
|
|
|
type = p->type;
|
|
|
|
debug("dequeue packet: %u", type);
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_free(&active_state->outgoing_packet);
|
|
|
|
memcpy(&active_state->outgoing_packet, &p->payload,
|
2003-04-09 10:50:06 +00:00
|
|
|
sizeof(Buffer));
|
2009-06-21 08:12:20 +00:00
|
|
|
TAILQ_REMOVE(&active_state->outgoing, p, next);
|
2003-04-09 10:50:06 +00:00
|
|
|
xfree(p);
|
|
|
|
packet_send2_wrapped();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:53:53 +00:00
|
|
|
int type, len, ret, ms_remain, cont;
|
2001-03-05 07:07:49 +00:00
|
|
|
fd_set *setp;
|
1999-11-24 13:26:21 +00:00
|
|
|
char buf[8192];
|
2008-06-12 20:42:45 +00:00
|
|
|
struct timeval timeout, start, *timeoutp = NULL;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2008-06-13 12:02:50 +00:00
|
|
|
DBG(debug("packet_read()"));
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
setp = (fd_set *)xcalloc(howmany(active_state->connection_in + 1,
|
|
|
|
NFDBITS), sizeof(fd_mask));
|
2001-03-05 07:07:49 +00:00
|
|
|
|
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.
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
memset(setp, 0, howmany(active_state->connection_in + 1,
|
|
|
|
NFDBITS) * sizeof(fd_mask));
|
|
|
|
FD_SET(active_state->connection_in, setp);
|
1999-11-25 00:54:57 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_timeout_ms > 0) {
|
|
|
|
ms_remain = active_state->packet_timeout_ms;
|
2008-06-12 20:42:45 +00:00
|
|
|
timeoutp = &timeout;
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Wait for some data to arrive. */
|
2008-06-12 20:42:45 +00:00
|
|
|
for (;;) {
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_timeout_ms != -1) {
|
2008-06-12 20:42:45 +00:00
|
|
|
ms_to_timeval(&timeout, ms_remain);
|
|
|
|
gettimeofday(&start, NULL);
|
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
if ((ret = select(active_state->connection_in + 1, setp,
|
|
|
|
NULL, NULL, timeoutp)) >= 0)
|
2008-06-12 20:42:45 +00:00
|
|
|
break;
|
2009-10-02 01:49:03 +00:00
|
|
|
if (errno != EAGAIN && errno != EINTR &&
|
|
|
|
errno != EWOULDBLOCK)
|
2008-06-12 20:42:45 +00:00
|
|
|
break;
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_timeout_ms == -1)
|
2008-06-12 20:42:45 +00:00
|
|
|
continue;
|
|
|
|
ms_subtract_diff(&start, &ms_remain);
|
|
|
|
if (ms_remain <= 0) {
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ret == 0) {
|
|
|
|
logit("Connection to %.200s timed out while "
|
|
|
|
"waiting to read", get_remote_ipaddr());
|
|
|
|
cleanup_exit(255);
|
|
|
|
}
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Read data from the socket. */
|
2009-06-21 08:53:53 +00:00
|
|
|
do {
|
|
|
|
cont = 0;
|
|
|
|
len = roaming_read(active_state->connection_in, buf,
|
|
|
|
sizeof(buf), &cont);
|
|
|
|
} while (len == 0 && cont);
|
1999-12-16 02:18:04 +00:00
|
|
|
if (len == 0) {
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("Connection closed by %.200s", get_remote_ipaddr());
|
2003-10-02 06:12:36 +00:00
|
|
|
cleanup_exit(255);
|
1999-12-16 02:18:04 +00:00
|
|
|
}
|
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.
|
|
|
|
*
|
2008-02-10 11:27:47 +00:00
|
|
|
* 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-11-24 13:26:21 +00:00
|
|
|
*/
|
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. */
|
2009-06-21 08:12:20 +00:00
|
|
|
if (buffer_len(&active_state->input) < 4 + 8)
|
1999-11-24 13:26:21 +00:00
|
|
|
return SSH_MSG_NONE;
|
|
|
|
/* Get length of incoming packet. */
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_ptr(&active_state->input);
|
2006-03-31 12:13:02 +00:00
|
|
|
len = get_u32(cp);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (len < 1 + 2 + 2 || len > 256 * 1024)
|
2002-11-09 15:41:39 +00:00
|
|
|
packet_disconnect("Bad packet length %u.", len);
|
1999-11-24 13:26:21 +00:00
|
|
|
padded_len = (len + 8) & ~7;
|
|
|
|
|
|
|
|
/* Check if the packet has been entirely received. */
|
2009-06-21 08:12:20 +00:00
|
|
|
if (buffer_len(&active_state->input) < 4 + padded_len)
|
1999-11-24 13:26:21 +00:00
|
|
|
return SSH_MSG_NONE;
|
|
|
|
|
|
|
|
/* The entire packet is in buffer. */
|
|
|
|
|
|
|
|
/* Consume packet length. */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->input, 4);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
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)
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
if (!active_state->receive_context.plaintext) {
|
|
|
|
switch (detect_attack(buffer_ptr(&active_state->input),
|
|
|
|
padded_len)) {
|
2006-09-16 20:08:53 +00:00
|
|
|
case DEATTACK_DETECTED:
|
|
|
|
packet_disconnect("crc32 compensation attack: "
|
|
|
|
"network attack detected");
|
|
|
|
case DEATTACK_DOS_DETECTED:
|
|
|
|
packet_disconnect("deattack denial of "
|
|
|
|
"service detected");
|
|
|
|
}
|
|
|
|
}
|
2001-06-05 21:09:18 +00:00
|
|
|
|
|
|
|
/* Decrypt data to incoming_packet. */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_clear(&active_state->incoming_packet);
|
|
|
|
cp = buffer_append_space(&active_state->incoming_packet, padded_len);
|
|
|
|
cipher_crypt(&active_state->receive_context, cp,
|
|
|
|
buffer_ptr(&active_state->input), padded_len);
|
2001-06-05 21:09:18 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->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: ");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->incoming_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
#endif
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Compute packet checksum. */
|
2009-06-21 08:12:20 +00:00
|
|
|
checksum = ssh_crc32(buffer_ptr(&active_state->incoming_packet),
|
|
|
|
buffer_len(&active_state->incoming_packet) - 4);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Skip padding. */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->incoming_packet, 8 - len % 8);
|
1999-11-24 13:26:21 +00:00
|
|
|
|
|
|
|
/* Test check bytes. */
|
2009-06-21 08:12:20 +00:00
|
|
|
if (len != buffer_len(&active_state->incoming_packet))
|
2001-12-21 04:00:19 +00:00
|
|
|
packet_disconnect("packet_read_poll1: len %d != buffer_len %d.",
|
2009-06-21 08:12:20 +00:00
|
|
|
len, buffer_len(&active_state->incoming_packet));
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = (u_char *)buffer_ptr(&active_state->incoming_packet) + len - 4;
|
2006-03-31 12:13:02 +00:00
|
|
|
stored_checksum = get_u32(cp);
|
1999-11-24 13:26:21 +00:00
|
|
|
if (checksum != stored_checksum)
|
|
|
|
packet_disconnect("Corrupted check bytes on input.");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume_end(&active_state->incoming_packet, 4);
|
|
|
|
|
|
|
|
if (active_state->packet_compression) {
|
|
|
|
buffer_clear(&active_state->compression_buffer);
|
|
|
|
buffer_uncompress(&active_state->incoming_packet,
|
|
|
|
&active_state->compression_buffer);
|
|
|
|
buffer_clear(&active_state->incoming_packet);
|
|
|
|
buffer_append(&active_state->incoming_packet,
|
|
|
|
buffer_ptr(&active_state->compression_buffer),
|
|
|
|
buffer_len(&active_state->compression_buffer));
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->p_read.packets++;
|
|
|
|
active_state->p_read.bytes += padded_len + 4;
|
|
|
|
type = buffer_get_char(&active_state->incoming_packet);
|
2004-11-05 09:27:54 +00:00
|
|
|
if (type < SSH_MSG_MIN || type > SSH_MSG_MAX)
|
|
|
|
packet_disconnect("Invalid ssh1 packet type: %d", type);
|
2001-06-05 21:09:18 +00:00
|
|
|
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
|
|
|
{
|
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;
|
2005-06-17 02:59:34 +00:00
|
|
|
u_int maclen, block_size;
|
2000-04-04 04:38:59 +00:00
|
|
|
Enc *enc = NULL;
|
|
|
|
Mac *mac = NULL;
|
|
|
|
Comp *comp = NULL;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_discard)
|
2009-01-28 05:38:41 +00:00
|
|
|
return SSH_MSG_NONE;
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->newkeys[MODE_IN] != NULL) {
|
|
|
|
enc = &active_state->newkeys[MODE_IN]->enc;
|
|
|
|
mac = &active_state->newkeys[MODE_IN]->mac;
|
|
|
|
comp = &active_state->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
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packlen == 0) {
|
2000-04-04 04:38:59 +00:00
|
|
|
/*
|
|
|
|
* check if input size is less than the cipher block size,
|
|
|
|
* decrypt first block and extract length of incoming packet
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
if (buffer_len(&active_state->input) < block_size)
|
2000-04-04 04:38:59 +00:00
|
|
|
return SSH_MSG_NONE;
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_clear(&active_state->incoming_packet);
|
|
|
|
cp = buffer_append_space(&active_state->incoming_packet,
|
2000-04-04 04:38:59 +00:00
|
|
|
block_size);
|
2009-06-21 08:12:20 +00:00
|
|
|
cipher_crypt(&active_state->receive_context, cp,
|
|
|
|
buffer_ptr(&active_state->input), block_size);
|
|
|
|
cp = buffer_ptr(&active_state->incoming_packet);
|
|
|
|
active_state->packlen = get_u32(cp);
|
|
|
|
if (active_state->packlen < 1 + 4 ||
|
|
|
|
active_state->packlen > PACKET_MAX_SIZE) {
|
2003-09-22 11:06:46 +00:00
|
|
|
#ifdef PACKET_DEBUG
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->incoming_packet);
|
2003-09-22 11:06:46 +00:00
|
|
|
#endif
|
2009-06-21 08:12:20 +00:00
|
|
|
logit("Bad packet length %u.", active_state->packlen);
|
|
|
|
packet_start_discard(enc, mac, active_state->packlen,
|
2009-01-28 05:38:41 +00:00
|
|
|
PACKET_MAX_SIZE);
|
|
|
|
return SSH_MSG_NONE;
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
DBG(debug("input: packet len %u", active_state->packlen+4));
|
|
|
|
buffer_consume(&active_state->input, block_size);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
/* we have a partial packet of block_size bytes */
|
2009-06-21 08:12:20 +00:00
|
|
|
need = 4 + active_state->packlen - block_size;
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("partial packet %d, need %d, maclen %d", block_size,
|
|
|
|
need, maclen));
|
2008-12-01 10:40:48 +00:00
|
|
|
if (need % block_size != 0) {
|
|
|
|
logit("padding error: need %d block %d mod %d",
|
2000-04-04 04:38:59 +00:00
|
|
|
need, block_size, need % block_size);
|
2009-06-21 08:12:20 +00:00
|
|
|
packet_start_discard(enc, mac, active_state->packlen,
|
2009-01-28 05:38:41 +00:00
|
|
|
PACKET_MAX_SIZE - block_size);
|
|
|
|
return SSH_MSG_NONE;
|
2008-12-01 10:40:48 +00:00
|
|
|
}
|
2000-04-04 04:38:59 +00:00
|
|
|
/*
|
|
|
|
* check if the entire packet has been received and
|
|
|
|
* decrypt into incoming_packet
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
if (buffer_len(&active_state->input) < need + maclen)
|
2000-04-04 04:38:59 +00:00
|
|
|
return SSH_MSG_NONE;
|
|
|
|
#ifdef PACKET_DEBUG
|
|
|
|
fprintf(stderr, "read_poll enc/full: ");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->input);
|
2000-04-04 04:38:59 +00:00
|
|
|
#endif
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_append_space(&active_state->incoming_packet, need);
|
|
|
|
cipher_crypt(&active_state->receive_context, cp,
|
|
|
|
buffer_ptr(&active_state->input), need);
|
|
|
|
buffer_consume(&active_state->input, need);
|
2000-04-04 04:38:59 +00:00
|
|
|
/*
|
|
|
|
* compute MAC over seqnr and packet,
|
|
|
|
* increment sequence number for incoming packet
|
|
|
|
*/
|
2000-04-16 01:18:38 +00:00
|
|
|
if (mac && mac->enabled) {
|
2009-06-21 08:12:20 +00:00
|
|
|
macbuf = mac_compute(mac, active_state->p_read.seqnr,
|
|
|
|
buffer_ptr(&active_state->incoming_packet),
|
|
|
|
buffer_len(&active_state->incoming_packet));
|
2010-07-16 03:58:37 +00:00
|
|
|
if (timingsafe_bcmp(macbuf, buffer_ptr(&active_state->input),
|
2009-06-21 08:12:20 +00:00
|
|
|
mac->mac_len) != 0) {
|
2009-01-28 05:38:41 +00:00
|
|
|
logit("Corrupted MAC on input.");
|
|
|
|
if (need > PACKET_MAX_SIZE)
|
|
|
|
fatal("internal error need %d", need);
|
2009-06-21 08:12:20 +00:00
|
|
|
packet_start_discard(enc, mac, active_state->packlen,
|
2009-01-28 05:38:41 +00:00
|
|
|
PACKET_MAX_SIZE - need);
|
|
|
|
return SSH_MSG_NONE;
|
|
|
|
}
|
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
DBG(debug("MAC #%d ok", active_state->p_read.seqnr));
|
|
|
|
buffer_consume(&active_state->input, mac->mac_len);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
2009-01-28 05:38:41 +00:00
|
|
|
/* XXX now it's safe to use fatal/packet_disconnect */
|
2001-12-21 04:00:19 +00:00
|
|
|
if (seqnr_p != NULL)
|
2009-06-21 08:12:20 +00:00
|
|
|
*seqnr_p = active_state->p_read.seqnr;
|
|
|
|
if (++active_state->p_read.seqnr == 0)
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("incoming seqnr wraps around");
|
2009-06-21 08:12:20 +00:00
|
|
|
if (++active_state->p_read.packets == 0)
|
2003-04-09 10:50:06 +00:00
|
|
|
if (!(datafellows & SSH_BUG_NOREKEY))
|
|
|
|
fatal("XXX too many packets with same key");
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->p_read.blocks += (active_state->packlen + 4) / block_size;
|
|
|
|
active_state->p_read.bytes += active_state->packlen + 4;
|
2000-04-04 04:38:59 +00:00
|
|
|
|
|
|
|
/* get padlen */
|
2009-06-21 08:12:20 +00:00
|
|
|
cp = buffer_ptr(&active_state->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 */
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->incoming_packet, 4 + 1);
|
|
|
|
buffer_consume_end(&active_state->incoming_packet, padlen);
|
2000-04-04 04:38:59 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
DBG(debug("input: len before de-compress %d",
|
|
|
|
buffer_len(&active_state->incoming_packet)));
|
2000-04-04 04:38:59 +00:00
|
|
|
if (comp && comp->enabled) {
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_clear(&active_state->compression_buffer);
|
|
|
|
buffer_uncompress(&active_state->incoming_packet,
|
|
|
|
&active_state->compression_buffer);
|
|
|
|
buffer_clear(&active_state->incoming_packet);
|
|
|
|
buffer_append(&active_state->incoming_packet,
|
|
|
|
buffer_ptr(&active_state->compression_buffer),
|
|
|
|
buffer_len(&active_state->compression_buffer));
|
2002-07-07 22:11:51 +00:00
|
|
|
DBG(debug("input: len after de-compress %d",
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_len(&active_state->incoming_packet)));
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
* get packet type, implies consume.
|
|
|
|
* return length of payload (without type field)
|
|
|
|
*/
|
2009-06-21 08:12:20 +00:00
|
|
|
type = buffer_get_char(&active_state->incoming_packet);
|
2004-11-05 09:27:54 +00:00
|
|
|
if (type < SSH2_MSG_MIN || type >= SSH2_MSG_LOCAL_MIN)
|
|
|
|
packet_disconnect("Invalid ssh2 packet type: %d", type);
|
2001-04-04 02:00:54 +00:00
|
|
|
if (type == SSH2_MSG_NEWKEYS)
|
|
|
|
set_newkeys(MODE_IN);
|
2009-06-21 08:12:20 +00:00
|
|
|
else if (type == SSH2_MSG_USERAUTH_SUCCESS &&
|
|
|
|
!active_state->server_side)
|
2005-07-26 11:54:56 +00:00
|
|
|
packet_enable_delayed_compress();
|
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);
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_dump(&active_state->incoming_packet);
|
2000-04-04 04:38:59 +00:00
|
|
|
#endif
|
2001-06-05 21:09:18 +00:00
|
|
|
/* reset for next packet */
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packlen = 0;
|
2001-06-05 21:09:18 +00:00
|
|
|
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-06-23 21:49:25 +00:00
|
|
|
u_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);
|
2008-06-08 02:49:30 +00:00
|
|
|
if (type) {
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->keep_alive_timeouts = 0;
|
2000-04-04 04:38:59 +00:00
|
|
|
DBG(debug("received packet type %d", type));
|
2008-06-08 02:49:30 +00:00
|
|
|
}
|
2001-12-06 18:00:18 +00:00
|
|
|
switch (type) {
|
2008-02-10 11:27:47 +00:00
|
|
|
case SSH2_MSG_IGNORE:
|
2008-03-07 07:33:30 +00:00
|
|
|
debug3("Received SSH2_MSG_IGNORE");
|
2008-02-10 11:27:47 +00:00
|
|
|
break;
|
2000-04-04 04:38:59 +00:00
|
|
|
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);
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("Received disconnect from %s: %u: %.400s",
|
2002-06-23 21:49:25 +00:00
|
|
|
get_remote_ipaddr(), reason, msg);
|
2000-04-04 04:38:59 +00:00
|
|
|
xfree(msg);
|
2003-10-02 06:12:36 +00:00
|
|
|
cleanup_exit(255);
|
2000-04-04 04:38:59 +00:00
|
|
|
break;
|
2002-01-22 12:23:11 +00:00
|
|
|
case SSH2_MSG_UNIMPLEMENTED:
|
|
|
|
seqnr = packet_get_int();
|
2002-06-23 21:49:25 +00:00
|
|
|
debug("Received SSH2_MSG_UNIMPLEMENTED for %u",
|
|
|
|
seqnr);
|
2008-02-10 11:27:47 +00:00
|
|
|
break;
|
2000-04-04 04:38:59 +00:00
|
|
|
default:
|
|
|
|
return type;
|
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);
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("Received disconnect from %s: %.400s",
|
2002-06-23 21:49:25 +00:00
|
|
|
get_remote_ipaddr(), msg);
|
2003-10-02 06:12:36 +00:00
|
|
|
cleanup_exit(255);
|
2000-04-04 04:38:59 +00:00
|
|
|
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;
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_discard) {
|
|
|
|
active_state->keep_alive_timeouts = 0; /* ?? */
|
|
|
|
if (len >= active_state->packet_discard)
|
2009-01-28 05:38:41 +00:00
|
|
|
packet_stop_discard();
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->packet_discard -= len;
|
2009-01-28 05:38:41 +00:00
|
|
|
return;
|
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_append(&active_state->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;
|
2002-07-07 22:11:51 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_get(&active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_get_int(&active_state->incoming_packet);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2009-06-21 08:16:26 +00:00
|
|
|
/* Returns an 64 bit integer from the packet data. */
|
|
|
|
|
|
|
|
u_int64_t
|
|
|
|
packet_get_int64(void)
|
|
|
|
{
|
|
|
|
return buffer_get_int64(&active_state->incoming_packet);
|
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_get_bignum(&active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_get_bignum2(&active_state->incoming_packet, value);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
2010-09-10 01:39:26 +00:00
|
|
|
#ifdef OPENSSL_HAS_ECC
|
2010-08-31 12:41:14 +00:00
|
|
|
void
|
|
|
|
packet_get_ecpoint(const EC_GROUP *curve, EC_POINT *point)
|
|
|
|
{
|
|
|
|
buffer_get_ecpoint(&active_state->incoming_packet, curve, point);
|
|
|
|
}
|
2010-09-10 01:39:26 +00:00
|
|
|
#endif
|
2010-08-31 12:41:14 +00:00
|
|
|
|
2001-12-21 03:56:54 +00:00
|
|
|
void *
|
2005-06-17 02:59:34 +00:00
|
|
|
packet_get_raw(u_int *length_ptr)
|
2000-04-04 04:38:59 +00:00
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
u_int bytes = buffer_len(&active_state->incoming_packet);
|
2002-07-07 22:11:51 +00:00
|
|
|
|
2000-04-04 04:38:59 +00:00
|
|
|
if (length_ptr != NULL)
|
|
|
|
*length_ptr = bytes;
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_ptr(&active_state->incoming_packet);
|
2000-04-04 04:38:59 +00:00
|
|
|
}
|
|
|
|
|
2000-04-16 01:18:38 +00:00
|
|
|
int
|
|
|
|
packet_remaining(void)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_len(&active_state->incoming_packet);
|
2000-04-16 01:18:38 +00:00
|
|
|
}
|
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_get_string(&active_state->incoming_packet, length_ptr);
|
2008-05-19 04:59:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
packet_get_string_ptr(u_int *length_ptr)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_get_string_ptr(&active_state->incoming_packet, length_ptr);
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2010-08-31 12:36:39 +00:00
|
|
|
/* Ensures the returned string has no embedded \0 characters in it. */
|
|
|
|
char *
|
|
|
|
packet_get_cstring(u_int *length_ptr)
|
|
|
|
{
|
|
|
|
return buffer_get_cstring(&active_state->incoming_packet, length_ptr);
|
|
|
|
}
|
|
|
|
|
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;
|
2002-07-07 22:11:51 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
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);
|
|
|
|
|
2002-11-09 15:46:24 +00:00
|
|
|
/* Display the error locally */
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("Disconnecting: %.100s", buf);
|
2002-11-09 15:46:24 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* 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();
|
2003-10-02 06:12:36 +00:00
|
|
|
cleanup_exit(255);
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
int len = buffer_len(&active_state->output);
|
2009-06-21 08:53:53 +00:00
|
|
|
int cont;
|
2002-07-07 22:11:51 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
if (len > 0) {
|
2009-06-21 08:53:53 +00:00
|
|
|
cont = 0;
|
|
|
|
len = roaming_write(active_state->connection_out,
|
|
|
|
buffer_ptr(&active_state->output), len, &cont);
|
2008-07-04 23:40:56 +00:00
|
|
|
if (len == -1) {
|
2009-10-02 01:49:03 +00:00
|
|
|
if (errno == EINTR || errno == EAGAIN ||
|
|
|
|
errno == EWOULDBLOCK)
|
1999-11-24 13:26:21 +00:00
|
|
|
return;
|
2008-07-04 23:40:56 +00:00
|
|
|
fatal("Write failed: %.100s", strerror(errno));
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
2009-06-21 08:53:53 +00:00
|
|
|
if (len == 0 && !cont)
|
2008-07-04 23:40:56 +00:00
|
|
|
fatal("Write connection closed");
|
2009-06-21 08:12:20 +00:00
|
|
|
buffer_consume(&active_state->output, len);
|
1999-11-24 13:26:21 +00:00
|
|
|
}
|
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;
|
2008-06-12 20:42:45 +00:00
|
|
|
int ret, ms_remain;
|
|
|
|
struct timeval start, timeout, *timeoutp = NULL;
|
2001-03-05 07:07:49 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
setp = (fd_set *)xcalloc(howmany(active_state->connection_out + 1,
|
|
|
|
NFDBITS), sizeof(fd_mask));
|
1999-11-24 13:26:21 +00:00
|
|
|
packet_write_poll();
|
|
|
|
while (packet_have_data_to_write()) {
|
2009-06-21 08:12:20 +00:00
|
|
|
memset(setp, 0, howmany(active_state->connection_out + 1,
|
|
|
|
NFDBITS) * sizeof(fd_mask));
|
|
|
|
FD_SET(active_state->connection_out, setp);
|
2008-06-12 20:42:45 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_timeout_ms > 0) {
|
|
|
|
ms_remain = active_state->packet_timeout_ms;
|
2008-06-12 20:42:45 +00:00
|
|
|
timeoutp = &timeout;
|
|
|
|
}
|
|
|
|
for (;;) {
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_timeout_ms != -1) {
|
2008-06-12 20:42:45 +00:00
|
|
|
ms_to_timeval(&timeout, ms_remain);
|
|
|
|
gettimeofday(&start, NULL);
|
|
|
|
}
|
2009-06-21 08:12:20 +00:00
|
|
|
if ((ret = select(active_state->connection_out + 1,
|
|
|
|
NULL, setp, NULL, timeoutp)) >= 0)
|
2008-06-12 20:42:45 +00:00
|
|
|
break;
|
2009-10-02 01:49:03 +00:00
|
|
|
if (errno != EAGAIN && errno != EINTR &&
|
|
|
|
errno != EWOULDBLOCK)
|
2008-06-12 20:42:45 +00:00
|
|
|
break;
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->packet_timeout_ms == -1)
|
2008-06-12 20:42:45 +00:00
|
|
|
continue;
|
|
|
|
ms_subtract_diff(&start, &ms_remain);
|
|
|
|
if (ms_remain <= 0) {
|
|
|
|
ret = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (ret == 0) {
|
|
|
|
logit("Connection to %.200s timed out while "
|
|
|
|
"waiting to write", get_remote_ipaddr());
|
|
|
|
cleanup_exit(255);
|
|
|
|
}
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_len(&active_state->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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
if (active_state->interactive_mode)
|
|
|
|
return buffer_len(&active_state->output) < 16384;
|
1999-11-24 13:26:21 +00:00
|
|
|
else
|
2009-06-21 08:12:20 +00:00
|
|
|
return buffer_len(&active_state->output) < 128 * 1024;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
|
|
|
|
2002-12-23 02:42:52 +00:00
|
|
|
static void
|
2002-12-23 02:41:41 +00:00
|
|
|
packet_set_tos(int interactive)
|
|
|
|
{
|
2003-11-22 04:02:42 +00:00
|
|
|
#if defined(IP_TOS) && !defined(IP_TOS_IS_BROKEN)
|
2002-12-23 02:41:41 +00:00
|
|
|
int tos = interactive ? IPTOS_LOWDELAY : IPTOS_THROUGHPUT;
|
|
|
|
|
|
|
|
if (!packet_connection_is_on_socket() ||
|
|
|
|
!packet_connection_is_ipv4())
|
|
|
|
return;
|
2009-06-21 08:12:20 +00:00
|
|
|
if (setsockopt(active_state->connection_in, IPPROTO_IP, IP_TOS, &tos,
|
2002-12-23 02:41:41 +00:00
|
|
|
sizeof(tos)) < 0)
|
|
|
|
error("setsockopt IP_TOS %d: %.100s:",
|
|
|
|
tos, strerror(errno));
|
2003-04-02 15:18:22 +00:00
|
|
|
#endif
|
2003-11-22 04:02:42 +00:00
|
|
|
}
|
2002-12-23 02:41:41 +00:00
|
|
|
|
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
|
|
|
{
|
2009-06-21 08:59:36 +00:00
|
|
|
if (active_state->set_interactive_called)
|
2001-01-18 02:04:35 +00:00
|
|
|
return;
|
2009-06-21 08:59:36 +00:00
|
|
|
active_state->set_interactive_called = 1;
|
2001-01-18 02:04:35 +00:00
|
|
|
|
1999-11-24 13:26:21 +00:00
|
|
|
/* Record that we are in interactive mode. */
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->interactive_mode = interactive;
|
1999-11-24 13:26:21 +00:00
|
|
|
|
2000-01-14 04:45:46 +00:00
|
|
|
/* Only set socket options if using a socket. */
|
|
|
|
if (!packet_connection_is_on_socket())
|
2003-04-27 17:55:33 +00:00
|
|
|
return;
|
2009-06-21 08:12:20 +00:00
|
|
|
set_nodelay(active_state->connection_in);
|
2002-12-23 02:41:41 +00:00
|
|
|
packet_set_tos(interactive);
|
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
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
return active_state->interactive_mode;
|
1999-10-27 03:42:43 +00:00
|
|
|
}
|
1999-11-21 02:23:52 +00:00
|
|
|
|
2004-05-13 06:39:33 +00:00
|
|
|
int
|
2003-06-28 02:38:01 +00:00
|
|
|
packet_set_maxsize(u_int s)
|
1999-11-21 02:23:52 +00:00
|
|
|
{
|
2009-06-21 08:59:36 +00:00
|
|
|
if (active_state->set_maxsize_called) {
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("packet_set_maxsize: called twice: old %d new %d",
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->max_packet_size, s);
|
1999-11-24 13:26:21 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (s < 4 * 1024 || s > 1024 * 1024) {
|
2003-04-09 10:59:48 +00:00
|
|
|
logit("packet_set_maxsize: bad size %d", s);
|
1999-11-24 13:26:21 +00:00
|
|
|
return -1;
|
|
|
|
}
|
2009-06-21 08:59:36 +00:00
|
|
|
active_state->set_maxsize_called = 1;
|
2001-06-13 04:39:18 +00:00
|
|
|
debug("packet_set_maxsize: setting to %d", s);
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->max_packet_size = s;
|
1999-11-24 13:26:21 +00:00
|
|
|
return s;
|
1999-11-21 02:23:52 +00:00
|
|
|
}
|
2001-03-05 06:17:49 +00:00
|
|
|
|
2009-06-21 08:12:20 +00:00
|
|
|
int
|
|
|
|
packet_inc_alive_timeouts(void)
|
|
|
|
{
|
|
|
|
return ++active_state->keep_alive_timeouts;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
packet_set_alive_timeouts(int ka)
|
|
|
|
{
|
|
|
|
active_state->keep_alive_timeouts = ka;
|
|
|
|
}
|
|
|
|
|
|
|
|
u_int
|
|
|
|
packet_get_maxsize(void)
|
|
|
|
{
|
|
|
|
return active_state->max_packet_size;
|
|
|
|
}
|
|
|
|
|
2001-11-12 00:02:52 +00:00
|
|
|
/* roundup current message to pad bytes */
|
|
|
|
void
|
|
|
|
packet_add_padding(u_char pad)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->extra_pad = pad;
|
2001-11-12 00:02:52 +00:00
|
|
|
}
|
|
|
|
|
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)
|
|
|
|
{
|
2004-06-22 02:56:01 +00:00
|
|
|
u_int32_t rnd = 0;
|
2001-03-05 06:28:06 +00:00
|
|
|
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)
|
2004-06-22 02:56:01 +00:00
|
|
|
rnd = arc4random();
|
2006-03-26 03:25:19 +00:00
|
|
|
packet_put_char((u_char)rnd & 0xff);
|
2004-06-22 02:56:01 +00:00
|
|
|
rnd >>= 8;
|
2001-03-05 06:17:49 +00:00
|
|
|
}
|
|
|
|
}
|
2003-04-09 10:50:06 +00:00
|
|
|
|
2004-05-13 06:39:33 +00:00
|
|
|
#define MAX_PACKETS (1U<<31)
|
2003-04-09 10:50:06 +00:00
|
|
|
int
|
|
|
|
packet_need_rekeying(void)
|
|
|
|
{
|
|
|
|
if (datafellows & SSH_BUG_NOREKEY)
|
|
|
|
return 0;
|
|
|
|
return
|
2009-06-21 08:12:20 +00:00
|
|
|
(active_state->p_send.packets > MAX_PACKETS) ||
|
|
|
|
(active_state->p_read.packets > MAX_PACKETS) ||
|
|
|
|
(active_state->max_blocks_out &&
|
|
|
|
(active_state->p_send.blocks > active_state->max_blocks_out)) ||
|
|
|
|
(active_state->max_blocks_in &&
|
|
|
|
(active_state->p_read.blocks > active_state->max_blocks_in));
|
2003-04-09 10:50:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
packet_set_rekey_limit(u_int32_t bytes)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->rekey_limit = bytes;
|
2003-04-09 10:50:06 +00:00
|
|
|
}
|
2005-07-26 11:54:56 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
packet_set_server(void)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->server_side = 1;
|
2005-07-26 11:54:56 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
packet_set_authenticated(void)
|
|
|
|
{
|
2009-06-21 08:12:20 +00:00
|
|
|
active_state->after_authentication = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
packet_get_input(void)
|
|
|
|
{
|
|
|
|
return (void *)&active_state->input;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
packet_get_output(void)
|
|
|
|
{
|
|
|
|
return (void *)&active_state->output;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
packet_get_newkeys(int mode)
|
|
|
|
{
|
|
|
|
return (void *)active_state->newkeys[mode];
|
2005-07-26 11:54:56 +00:00
|
|
|
}
|
2009-07-05 21:11:13 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Save the state for the real connection, and use a separate state when
|
|
|
|
* resuming a suspended connection.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
packet_backup_state(void)
|
|
|
|
{
|
|
|
|
struct session_state *tmp;
|
|
|
|
|
|
|
|
close(active_state->connection_in);
|
|
|
|
active_state->connection_in = -1;
|
|
|
|
close(active_state->connection_out);
|
|
|
|
active_state->connection_out = -1;
|
|
|
|
if (backup_state)
|
|
|
|
tmp = backup_state;
|
|
|
|
else
|
|
|
|
tmp = alloc_session_state();
|
|
|
|
backup_state = active_state;
|
|
|
|
active_state = tmp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Swap in the old state when resuming a connecion.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
packet_restore_state(void)
|
|
|
|
{
|
|
|
|
struct session_state *tmp;
|
|
|
|
void *buf;
|
|
|
|
u_int len;
|
|
|
|
|
|
|
|
tmp = backup_state;
|
|
|
|
backup_state = active_state;
|
|
|
|
active_state = tmp;
|
|
|
|
active_state->connection_in = backup_state->connection_in;
|
|
|
|
backup_state->connection_in = -1;
|
|
|
|
active_state->connection_out = backup_state->connection_out;
|
|
|
|
backup_state->connection_out = -1;
|
|
|
|
len = buffer_len(&backup_state->input);
|
|
|
|
if (len > 0) {
|
|
|
|
buf = buffer_ptr(&backup_state->input);
|
|
|
|
buffer_append(&active_state->input, buf, len);
|
|
|
|
buffer_clear(&backup_state->input);
|
|
|
|
add_recv_bytes(len);
|
|
|
|
}
|
|
|
|
}
|