djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1 | /* $OpenBSD: packet.c,v 1.204 2015/01/28 21:15:47 djm Exp $ */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2 | /* |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 5 | * All rights reserved |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 6 | * This file contains code implementing the packet protocol and communication |
| 7 | * with the other side. This same code is used both on client and server side. |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 8 | * |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 9 | * As far as I am concerned, the code I have written for this software |
| 10 | * can be used freely for any purpose. Any derived versions of this |
| 11 | * software must be clearly marked as such, and if the derived work is |
| 12 | * incompatible with the protocol description in the RFC file, it must be |
| 13 | * called by a name other than "ssh" or "Secure Shell". |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 14 | * |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 15 | * |
| 16 | * SSH2 packet format added by Markus Friedl. |
Ben Lindstrom | 4469723 | 2001-07-04 03:32:30 +0000 | [diff] [blame] | 17 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
Damien Miller | e4340be | 2000-09-16 13:29:08 +1100 | [diff] [blame] | 18 | * |
| 19 | * Redistribution and use in source and binary forms, with or without |
| 20 | * modification, are permitted provided that the following conditions |
| 21 | * are met: |
| 22 | * 1. Redistributions of source code must retain the above copyright |
| 23 | * notice, this list of conditions and the following disclaimer. |
| 24 | * 2. Redistributions in binary form must reproduce the above copyright |
| 25 | * notice, this list of conditions and the following disclaimer in the |
| 26 | * documentation and/or other materials provided with the distribution. |
| 27 | * |
| 28 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| 29 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| 30 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| 31 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| 32 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| 33 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 34 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 35 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 36 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 37 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 38 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 39 | |
| 40 | #include "includes.h" |
Damien Miller | 68f8e99 | 2006-03-15 11:24:12 +1100 | [diff] [blame] | 41 | |
deraadt@openbsd.org | 087266e | 2015-01-20 23:14:00 +0000 | [diff] [blame] | 42 | #include <sys/param.h> /* MIN roundup */ |
Damien Miller | e3b60b5 | 2006-07-10 21:08:03 +1000 | [diff] [blame] | 43 | #include <sys/types.h> |
Damien Miller | a0898b8 | 2003-04-09 21:05:52 +1000 | [diff] [blame] | 44 | #include "openbsd-compat/sys-queue.h" |
Damien Miller | 8ec8c3e | 2006-07-10 20:35:38 +1000 | [diff] [blame] | 45 | #include <sys/socket.h> |
Damien Miller | 9aec919 | 2006-08-05 10:57:45 +1000 | [diff] [blame] | 46 | #ifdef HAVE_SYS_TIME_H |
| 47 | # include <sys/time.h> |
| 48 | #endif |
Damien Miller | 8ec8c3e | 2006-07-10 20:35:38 +1000 | [diff] [blame] | 49 | |
Damien Miller | 8ec8c3e | 2006-07-10 20:35:38 +1000 | [diff] [blame] | 50 | #include <netinet/in.h> |
Damien Miller | 68f8e99 | 2006-03-15 11:24:12 +1100 | [diff] [blame] | 51 | #include <netinet/ip.h> |
Darren Tucker | dace233 | 2006-09-22 19:22:17 +1000 | [diff] [blame] | 52 | #include <arpa/inet.h> |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 53 | |
Darren Tucker | 3997249 | 2006-07-12 22:22:46 +1000 | [diff] [blame] | 54 | #include <errno.h> |
Darren Tucker | 5d19626 | 2006-07-12 22:15:16 +1000 | [diff] [blame] | 55 | #include <stdarg.h> |
Damien Miller | a7a73ee | 2006-08-05 11:37:59 +1000 | [diff] [blame] | 56 | #include <stdio.h> |
Damien Miller | e7a1e5c | 2006-08-05 11:34:19 +1000 | [diff] [blame] | 57 | #include <stdlib.h> |
Damien Miller | e3476ed | 2006-07-24 14:13:33 +1000 | [diff] [blame] | 58 | #include <string.h> |
Damien Miller | e6b3b61 | 2006-07-24 14:01:23 +1000 | [diff] [blame] | 59 | #include <unistd.h> |
deraadt@openbsd.org | 087266e | 2015-01-20 23:14:00 +0000 | [diff] [blame] | 60 | #include <limits.h> |
Damien Miller | d783435 | 2006-08-05 12:39:39 +1000 | [diff] [blame] | 61 | #include <signal.h> |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 62 | #include <time.h> |
Darren Tucker | 5d19626 | 2006-07-12 22:15:16 +1000 | [diff] [blame] | 63 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 64 | #include <zlib.h> |
| 65 | |
| 66 | #include "buffer.h" /* typedefs XXX */ |
| 67 | #include "key.h" /* typedefs XXX */ |
| 68 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 69 | #include "xmalloc.h" |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 70 | #include "crc32.h" |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 71 | #include "deattack.h" |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 72 | #include "compat.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 73 | #include "ssh1.h" |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 74 | #include "ssh2.h" |
Damien Miller | 874d77b | 2000-10-14 16:23:11 +1100 | [diff] [blame] | 75 | #include "cipher.h" |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 76 | #include "sshkey.h" |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 77 | #include "kex.h" |
markus@openbsd.org | 128343b | 2015-01-13 19:31:40 +0000 | [diff] [blame] | 78 | #include "digest.h" |
Ben Lindstrom | 06b33aa | 2001-02-15 03:01:59 +0000 | [diff] [blame] | 79 | #include "mac.h" |
Ben Lindstrom | 226cfa0 | 2001-01-22 05:34:40 +0000 | [diff] [blame] | 80 | #include "log.h" |
| 81 | #include "canohost.h" |
Damien Miller | 4d00776 | 2002-02-05 11:52:54 +1100 | [diff] [blame] | 82 | #include "misc.h" |
Damien Miller | 7acefbb | 2014-07-18 14:11:24 +1000 | [diff] [blame] | 83 | #include "channels.h" |
Ben Lindstrom | 402c6cc | 2002-06-21 00:43:42 +0000 | [diff] [blame] | 84 | #include "ssh.h" |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 85 | #include "packet.h" |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 86 | #include "roaming.h" |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 87 | #include "ssherr.h" |
| 88 | #include "sshbuf.h" |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 89 | |
| 90 | #ifdef PACKET_DEBUG |
| 91 | #define DBG(x) x |
| 92 | #else |
| 93 | #define DBG(x) |
| 94 | #endif |
| 95 | |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 96 | #define PACKET_MAX_SIZE (256 * 1024) |
| 97 | |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 98 | struct packet_state { |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 99 | u_int32_t seqnr; |
| 100 | u_int32_t packets; |
| 101 | u_int64_t blocks; |
Damien Miller | b61f3fc | 2008-07-11 17:36:48 +1000 | [diff] [blame] | 102 | u_int64_t bytes; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 103 | }; |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 104 | |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 105 | struct packet { |
| 106 | TAILQ_ENTRY(packet) next; |
| 107 | u_char type; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 108 | struct sshbuf *payload; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 109 | }; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 110 | |
| 111 | struct session_state { |
| 112 | /* |
| 113 | * This variable contains the file descriptors used for |
| 114 | * communicating with the other side. connection_in is used for |
| 115 | * reading; connection_out for writing. These can be the same |
| 116 | * descriptor, in which case it is assumed to be a socket. |
| 117 | */ |
| 118 | int connection_in; |
| 119 | int connection_out; |
| 120 | |
| 121 | /* Protocol flags for the remote side. */ |
| 122 | u_int remote_protocol_flags; |
| 123 | |
| 124 | /* Encryption context for receiving data. Only used for decryption. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 125 | struct sshcipher_ctx receive_context; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 126 | |
| 127 | /* Encryption context for sending data. Only used for encryption. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 128 | struct sshcipher_ctx send_context; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 129 | |
| 130 | /* Buffer for raw input data from the socket. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 131 | struct sshbuf *input; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 132 | |
| 133 | /* Buffer for raw output data going to the socket. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 134 | struct sshbuf *output; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 135 | |
| 136 | /* Buffer for the partial outgoing packet being constructed. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 137 | struct sshbuf *outgoing_packet; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 138 | |
| 139 | /* Buffer for the incoming packet currently being processed. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 140 | struct sshbuf *incoming_packet; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 141 | |
| 142 | /* Scratch buffer for packet compression/decompression. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 143 | struct sshbuf *compression_buffer; |
| 144 | |
| 145 | /* Incoming/outgoing compression dictionaries */ |
| 146 | z_stream compression_in_stream; |
| 147 | z_stream compression_out_stream; |
| 148 | int compression_in_started; |
| 149 | int compression_out_started; |
| 150 | int compression_in_failures; |
| 151 | int compression_out_failures; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 152 | |
| 153 | /* |
| 154 | * Flag indicating whether packet compression/decompression is |
| 155 | * enabled. |
| 156 | */ |
| 157 | int packet_compression; |
| 158 | |
| 159 | /* default maximum packet size */ |
| 160 | u_int max_packet_size; |
| 161 | |
| 162 | /* Flag indicating whether this module has been initialized. */ |
| 163 | int initialized; |
| 164 | |
| 165 | /* Set to true if the connection is interactive. */ |
| 166 | int interactive_mode; |
| 167 | |
| 168 | /* Set to true if we are the server side. */ |
| 169 | int server_side; |
| 170 | |
| 171 | /* Set to true if we are authenticated. */ |
| 172 | int after_authentication; |
| 173 | |
| 174 | int keep_alive_timeouts; |
| 175 | |
| 176 | /* The maximum time that we will wait to send or receive a packet */ |
| 177 | int packet_timeout_ms; |
| 178 | |
| 179 | /* Session key information for Encryption and MAC */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 180 | struct newkeys *newkeys[MODE_MAX]; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 181 | struct packet_state p_read, p_send; |
| 182 | |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 183 | /* Volume-based rekeying */ |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 184 | u_int64_t max_blocks_in, max_blocks_out; |
| 185 | u_int32_t rekey_limit; |
| 186 | |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 187 | /* Time-based rekeying */ |
| 188 | time_t rekey_interval; /* how often in seconds */ |
| 189 | time_t rekey_time; /* time of last rekeying */ |
| 190 | |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 191 | /* Session key for protocol v1 */ |
| 192 | u_char ssh1_key[SSH_SESSION_KEY_LENGTH]; |
| 193 | u_int ssh1_keylen; |
| 194 | |
| 195 | /* roundup current message to extra_pad bytes */ |
| 196 | u_char extra_pad; |
| 197 | |
| 198 | /* XXX discard incoming data after MAC error */ |
| 199 | u_int packet_discard; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 200 | struct sshmac *packet_discard_mac; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 201 | |
| 202 | /* Used in packet_read_poll2() */ |
| 203 | u_int packlen; |
| 204 | |
Darren Tucker | 7b935c7 | 2009-06-21 18:59:36 +1000 | [diff] [blame] | 205 | /* Used in packet_send2 */ |
| 206 | int rekeying; |
| 207 | |
| 208 | /* Used in packet_set_interactive */ |
| 209 | int set_interactive_called; |
| 210 | |
| 211 | /* Used in packet_set_maxsize */ |
| 212 | int set_maxsize_called; |
| 213 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 214 | /* One-off warning about weak ciphers */ |
| 215 | int cipher_warning_done; |
| 216 | |
| 217 | /* SSH1 CRC compensation attack detector */ |
| 218 | struct deattack_ctx deattack; |
| 219 | |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 220 | TAILQ_HEAD(, packet) outgoing; |
| 221 | }; |
| 222 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 223 | struct ssh * |
| 224 | ssh_alloc_session_state(void) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 225 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 226 | struct ssh *ssh = NULL; |
| 227 | struct session_state *state = NULL; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 228 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 229 | if ((ssh = calloc(1, sizeof(*ssh))) == NULL || |
| 230 | (state = calloc(1, sizeof(*state))) == NULL || |
| 231 | (state->input = sshbuf_new()) == NULL || |
| 232 | (state->output = sshbuf_new()) == NULL || |
| 233 | (state->outgoing_packet = sshbuf_new()) == NULL || |
| 234 | (state->incoming_packet = sshbuf_new()) == NULL) |
| 235 | goto fail; |
| 236 | TAILQ_INIT(&state->outgoing); |
markus@openbsd.org | f582f0e | 2015-01-19 20:30:23 +0000 | [diff] [blame] | 237 | TAILQ_INIT(&ssh->private_keys); |
| 238 | TAILQ_INIT(&ssh->public_keys); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 239 | state->connection_in = -1; |
| 240 | state->connection_out = -1; |
| 241 | state->max_packet_size = 32768; |
| 242 | state->packet_timeout_ms = -1; |
| 243 | state->p_send.packets = state->p_read.packets = 0; |
| 244 | state->initialized = 1; |
| 245 | /* |
| 246 | * ssh_packet_send2() needs to queue packets until |
| 247 | * we've done the initial key exchange. |
| 248 | */ |
| 249 | state->rekeying = 1; |
| 250 | ssh->state = state; |
| 251 | return ssh; |
| 252 | fail: |
| 253 | if (state) { |
| 254 | sshbuf_free(state->input); |
| 255 | sshbuf_free(state->output); |
| 256 | sshbuf_free(state->incoming_packet); |
| 257 | sshbuf_free(state->outgoing_packet); |
| 258 | free(state); |
| 259 | } |
| 260 | free(ssh); |
| 261 | return NULL; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 262 | } |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 263 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 264 | /* |
| 265 | * Sets the descriptors used for communication. Disables encryption until |
| 266 | * packet_set_encryption_key is called. |
| 267 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 268 | struct ssh * |
| 269 | ssh_packet_set_connection(struct ssh *ssh, int fd_in, int fd_out) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 270 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 271 | struct session_state *state; |
| 272 | const struct sshcipher *none = cipher_by_name("none"); |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 273 | int r; |
Ben Lindstrom | 8b2eecd | 2002-07-07 22:11:51 +0000 | [diff] [blame] | 274 | |
Damien Miller | 874d77b | 2000-10-14 16:23:11 +1100 | [diff] [blame] | 275 | if (none == NULL) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 276 | fatal("%s: cannot load cipher 'none'", __func__); |
| 277 | if (ssh == NULL) |
| 278 | ssh = ssh_alloc_session_state(); |
| 279 | if (ssh == NULL) |
| 280 | fatal("%s: cound not allocate state", __func__); |
| 281 | state = ssh->state; |
| 282 | state->connection_in = fd_in; |
| 283 | state->connection_out = fd_out; |
| 284 | if ((r = cipher_init(&state->send_context, none, |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 285 | (const u_char *)"", 0, NULL, 0, CIPHER_ENCRYPT)) != 0 || |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 286 | (r = cipher_init(&state->receive_context, none, |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 287 | (const u_char *)"", 0, NULL, 0, CIPHER_DECRYPT)) != 0) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 288 | fatal("%s: cipher_init failed: %s", __func__, ssh_err(r)); |
| 289 | state->newkeys[MODE_IN] = state->newkeys[MODE_OUT] = NULL; |
| 290 | deattack_init(&state->deattack); |
| 291 | return ssh; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 292 | } |
| 293 | |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 294 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 295 | ssh_packet_set_timeout(struct ssh *ssh, int timeout, int count) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 296 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 297 | struct session_state *state = ssh->state; |
| 298 | |
Damien Miller | 8ed4de8 | 2011-12-19 10:52:50 +1100 | [diff] [blame] | 299 | if (timeout <= 0 || count <= 0) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 300 | state->packet_timeout_ms = -1; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 301 | return; |
| 302 | } |
| 303 | if ((INT_MAX / 1000) / count < timeout) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 304 | state->packet_timeout_ms = INT_MAX; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 305 | else |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 306 | state->packet_timeout_ms = timeout * count * 1000; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 307 | } |
| 308 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 309 | int |
| 310 | ssh_packet_stop_discard(struct ssh *ssh) |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 311 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 312 | struct session_state *state = ssh->state; |
| 313 | int r; |
| 314 | |
| 315 | if (state->packet_discard_mac) { |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 316 | char buf[1024]; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 317 | |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 318 | memset(buf, 'a', sizeof(buf)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 319 | while (sshbuf_len(state->incoming_packet) < |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 320 | PACKET_MAX_SIZE) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 321 | if ((r = sshbuf_put(state->incoming_packet, buf, |
| 322 | sizeof(buf))) != 0) |
| 323 | return r; |
| 324 | (void) mac_compute(state->packet_discard_mac, |
| 325 | state->p_read.seqnr, |
| 326 | sshbuf_ptr(state->incoming_packet), PACKET_MAX_SIZE, |
| 327 | NULL, 0); |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 328 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 329 | logit("Finished discarding for %.200s", ssh_remote_ipaddr(ssh)); |
| 330 | return SSH_ERR_MAC_INVALID; |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 331 | } |
| 332 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 333 | static int |
| 334 | ssh_packet_start_discard(struct ssh *ssh, struct sshenc *enc, |
| 335 | struct sshmac *mac, u_int packet_length, u_int discard) |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 336 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 337 | struct session_state *state = ssh->state; |
| 338 | int r; |
| 339 | |
| 340 | if (enc == NULL || !cipher_is_cbc(enc->cipher) || (mac && mac->etm)) { |
| 341 | if ((r = sshpkt_disconnect(ssh, "Packet corrupt")) != 0) |
| 342 | return r; |
| 343 | return SSH_ERR_MAC_INVALID; |
| 344 | } |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 345 | if (packet_length != PACKET_MAX_SIZE && mac && mac->enabled) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 346 | state->packet_discard_mac = mac; |
| 347 | if (sshbuf_len(state->input) >= discard && |
| 348 | (r = ssh_packet_stop_discard(ssh)) != 0) |
| 349 | return r; |
| 350 | state->packet_discard = discard - sshbuf_len(state->input); |
| 351 | return 0; |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 352 | } |
| 353 | |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 354 | /* Returns 1 if remote host is connected via socket, 0 if not. */ |
| 355 | |
| 356 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 357 | ssh_packet_connection_is_on_socket(struct ssh *ssh) |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 358 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 359 | struct session_state *state = ssh->state; |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 360 | struct sockaddr_storage from, to; |
| 361 | socklen_t fromlen, tolen; |
| 362 | |
| 363 | /* filedescriptors in and out are the same, so it's a socket */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 364 | if (state->connection_in == state->connection_out) |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 365 | return 1; |
| 366 | fromlen = sizeof(from); |
| 367 | memset(&from, 0, sizeof(from)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 368 | if (getpeername(state->connection_in, (struct sockaddr *)&from, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 369 | &fromlen) < 0) |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 370 | return 0; |
| 371 | tolen = sizeof(to); |
| 372 | memset(&to, 0, sizeof(to)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 373 | if (getpeername(state->connection_out, (struct sockaddr *)&to, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 374 | &tolen) < 0) |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 375 | return 0; |
| 376 | if (fromlen != tolen || memcmp(&from, &to, fromlen) != 0) |
| 377 | return 0; |
| 378 | if (from.ss_family != AF_INET && from.ss_family != AF_INET6) |
| 379 | return 0; |
| 380 | return 1; |
| 381 | } |
| 382 | |
Ben Lindstrom | f6027d3 | 2002-03-22 01:42:04 +0000 | [diff] [blame] | 383 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 384 | ssh_packet_get_bytes(struct ssh *ssh, u_int64_t *ibytes, u_int64_t *obytes) |
Ben Lindstrom | f6027d3 | 2002-03-22 01:42:04 +0000 | [diff] [blame] | 385 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 386 | if (ibytes) |
| 387 | *ibytes = ssh->state->p_read.bytes; |
| 388 | if (obytes) |
| 389 | *obytes = ssh->state->p_send.bytes; |
Ben Lindstrom | f6027d3 | 2002-03-22 01:42:04 +0000 | [diff] [blame] | 390 | } |
| 391 | |
| 392 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 393 | ssh_packet_connection_af(struct ssh *ssh) |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 394 | { |
| 395 | struct sockaddr_storage to; |
Damien Miller | 6fe375d | 2000-01-23 09:38:00 +1100 | [diff] [blame] | 396 | socklen_t tolen = sizeof(to); |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 397 | |
| 398 | memset(&to, 0, sizeof(to)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 399 | if (getsockname(ssh->state->connection_out, (struct sockaddr *)&to, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 400 | &tolen) < 0) |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 401 | return 0; |
Damien Miller | aa100c5 | 2002-04-26 16:54:34 +1000 | [diff] [blame] | 402 | #ifdef IPV4_IN_IPV6 |
Damien Miller | a8e06ce | 2003-11-21 23:48:55 +1100 | [diff] [blame] | 403 | if (to.ss_family == AF_INET6 && |
Damien Miller | aa100c5 | 2002-04-26 16:54:34 +1000 | [diff] [blame] | 404 | IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr)) |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 405 | return AF_INET; |
Damien Miller | aa100c5 | 2002-04-26 16:54:34 +1000 | [diff] [blame] | 406 | #endif |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 407 | return to.ss_family; |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 408 | } |
| 409 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 410 | /* Sets the connection into non-blocking mode. */ |
| 411 | |
| 412 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 413 | ssh_packet_set_nonblocking(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 414 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 415 | /* Set the socket into non-blocking mode. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 416 | set_nonblock(ssh->state->connection_in); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 417 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 418 | if (ssh->state->connection_out != ssh->state->connection_in) |
| 419 | set_nonblock(ssh->state->connection_out); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 420 | } |
| 421 | |
| 422 | /* Returns the socket used for reading. */ |
| 423 | |
| 424 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 425 | ssh_packet_get_connection_in(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 426 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 427 | return ssh->state->connection_in; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 428 | } |
| 429 | |
| 430 | /* Returns the descriptor used for writing. */ |
| 431 | |
| 432 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 433 | ssh_packet_get_connection_out(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 434 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 435 | return ssh->state->connection_out; |
| 436 | } |
| 437 | |
| 438 | /* |
| 439 | * Returns the IP-address of the remote host as a string. The returned |
| 440 | * string must not be freed. |
| 441 | */ |
| 442 | |
| 443 | const char * |
| 444 | ssh_remote_ipaddr(struct ssh *ssh) |
| 445 | { |
| 446 | /* Check whether we have cached the ipaddr. */ |
| 447 | if (ssh->remote_ipaddr == NULL) |
| 448 | ssh->remote_ipaddr = ssh_packet_connection_is_on_socket(ssh) ? |
| 449 | get_peer_ipaddr(ssh->state->connection_in) : |
| 450 | strdup("UNKNOWN"); |
| 451 | if (ssh->remote_ipaddr == NULL) |
| 452 | return "UNKNOWN"; |
| 453 | return ssh->remote_ipaddr; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 454 | } |
| 455 | |
| 456 | /* Closes the connection and clears and frees internal data structures. */ |
| 457 | |
| 458 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 459 | ssh_packet_close(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 460 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 461 | struct session_state *state = ssh->state; |
| 462 | int r; |
| 463 | u_int mode; |
| 464 | |
| 465 | if (!state->initialized) |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 466 | return; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 467 | state->initialized = 0; |
| 468 | if (state->connection_in == state->connection_out) { |
| 469 | shutdown(state->connection_out, SHUT_RDWR); |
| 470 | close(state->connection_out); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 471 | } else { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 472 | close(state->connection_in); |
| 473 | close(state->connection_out); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 474 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 475 | sshbuf_free(state->input); |
| 476 | sshbuf_free(state->output); |
| 477 | sshbuf_free(state->outgoing_packet); |
| 478 | sshbuf_free(state->incoming_packet); |
| 479 | for (mode = 0; mode < MODE_MAX; mode++) |
| 480 | kex_free_newkeys(state->newkeys[mode]); |
| 481 | if (state->compression_buffer) { |
| 482 | sshbuf_free(state->compression_buffer); |
| 483 | if (state->compression_out_started) { |
| 484 | z_streamp stream = &state->compression_out_stream; |
| 485 | debug("compress outgoing: " |
| 486 | "raw data %llu, compressed %llu, factor %.2f", |
| 487 | (unsigned long long)stream->total_in, |
| 488 | (unsigned long long)stream->total_out, |
| 489 | stream->total_in == 0 ? 0.0 : |
| 490 | (double) stream->total_out / stream->total_in); |
| 491 | if (state->compression_out_failures == 0) |
| 492 | deflateEnd(stream); |
| 493 | } |
| 494 | if (state->compression_in_started) { |
| 495 | z_streamp stream = &state->compression_out_stream; |
| 496 | debug("compress incoming: " |
| 497 | "raw data %llu, compressed %llu, factor %.2f", |
| 498 | (unsigned long long)stream->total_out, |
| 499 | (unsigned long long)stream->total_in, |
| 500 | stream->total_out == 0 ? 0.0 : |
| 501 | (double) stream->total_in / stream->total_out); |
| 502 | if (state->compression_in_failures == 0) |
| 503 | inflateEnd(stream); |
| 504 | } |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 505 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 506 | if ((r = cipher_cleanup(&state->send_context)) != 0) |
| 507 | error("%s: cipher_cleanup failed: %s", __func__, ssh_err(r)); |
| 508 | if ((r = cipher_cleanup(&state->receive_context)) != 0) |
| 509 | error("%s: cipher_cleanup failed: %s", __func__, ssh_err(r)); |
| 510 | if (ssh->remote_ipaddr) { |
| 511 | free(ssh->remote_ipaddr); |
| 512 | ssh->remote_ipaddr = NULL; |
| 513 | } |
| 514 | free(ssh->state); |
| 515 | ssh->state = NULL; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 516 | } |
| 517 | |
| 518 | /* Sets remote side protocol flags. */ |
| 519 | |
| 520 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 521 | ssh_packet_set_protocol_flags(struct ssh *ssh, u_int protocol_flags) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 522 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 523 | ssh->state->remote_protocol_flags = protocol_flags; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 524 | } |
| 525 | |
| 526 | /* Returns the remote protocol flags set earlier by the above function. */ |
| 527 | |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 528 | u_int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 529 | ssh_packet_get_protocol_flags(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 530 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 531 | return ssh->state->remote_protocol_flags; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 532 | } |
| 533 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 534 | /* |
| 535 | * Starts packet compression from the next packet on in both directions. |
| 536 | * Level is compression level 1 (fastest) - 9 (slow, best) as in gzip. |
| 537 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 538 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 539 | static int |
| 540 | ssh_packet_init_compression(struct ssh *ssh) |
Ben Lindstrom | fb50cdf | 2001-04-05 23:20:46 +0000 | [diff] [blame] | 541 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 542 | if (!ssh->state->compression_buffer && |
| 543 | ((ssh->state->compression_buffer = sshbuf_new()) == NULL)) |
| 544 | return SSH_ERR_ALLOC_FAIL; |
| 545 | return 0; |
| 546 | } |
| 547 | |
| 548 | static int |
| 549 | start_compression_out(struct ssh *ssh, int level) |
| 550 | { |
| 551 | if (level < 1 || level > 9) |
| 552 | return SSH_ERR_INVALID_ARGUMENT; |
| 553 | debug("Enabling compression at level %d.", level); |
| 554 | if (ssh->state->compression_out_started == 1) |
| 555 | deflateEnd(&ssh->state->compression_out_stream); |
| 556 | switch (deflateInit(&ssh->state->compression_out_stream, level)) { |
| 557 | case Z_OK: |
| 558 | ssh->state->compression_out_started = 1; |
| 559 | break; |
| 560 | case Z_MEM_ERROR: |
| 561 | return SSH_ERR_ALLOC_FAIL; |
| 562 | default: |
| 563 | return SSH_ERR_INTERNAL_ERROR; |
| 564 | } |
| 565 | return 0; |
| 566 | } |
| 567 | |
| 568 | static int |
| 569 | start_compression_in(struct ssh *ssh) |
| 570 | { |
| 571 | if (ssh->state->compression_in_started == 1) |
| 572 | inflateEnd(&ssh->state->compression_in_stream); |
| 573 | switch (inflateInit(&ssh->state->compression_in_stream)) { |
| 574 | case Z_OK: |
| 575 | ssh->state->compression_in_started = 1; |
| 576 | break; |
| 577 | case Z_MEM_ERROR: |
| 578 | return SSH_ERR_ALLOC_FAIL; |
| 579 | default: |
| 580 | return SSH_ERR_INTERNAL_ERROR; |
| 581 | } |
| 582 | return 0; |
| 583 | } |
| 584 | |
| 585 | int |
| 586 | ssh_packet_start_compression(struct ssh *ssh, int level) |
| 587 | { |
| 588 | int r; |
| 589 | |
| 590 | if (ssh->state->packet_compression && !compat20) |
| 591 | return SSH_ERR_INTERNAL_ERROR; |
| 592 | ssh->state->packet_compression = 1; |
| 593 | if ((r = ssh_packet_init_compression(ssh)) != 0 || |
| 594 | (r = start_compression_in(ssh)) != 0 || |
| 595 | (r = start_compression_out(ssh, level)) != 0) |
| 596 | return r; |
| 597 | return 0; |
| 598 | } |
| 599 | |
| 600 | /* XXX remove need for separate compression buffer */ |
| 601 | static int |
| 602 | compress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out) |
| 603 | { |
| 604 | u_char buf[4096]; |
| 605 | int r, status; |
| 606 | |
| 607 | if (ssh->state->compression_out_started != 1) |
| 608 | return SSH_ERR_INTERNAL_ERROR; |
| 609 | |
| 610 | /* This case is not handled below. */ |
| 611 | if (sshbuf_len(in) == 0) |
| 612 | return 0; |
| 613 | |
| 614 | /* Input is the contents of the input buffer. */ |
| 615 | if ((ssh->state->compression_out_stream.next_in = |
| 616 | sshbuf_mutable_ptr(in)) == NULL) |
| 617 | return SSH_ERR_INTERNAL_ERROR; |
| 618 | ssh->state->compression_out_stream.avail_in = sshbuf_len(in); |
| 619 | |
| 620 | /* Loop compressing until deflate() returns with avail_out != 0. */ |
| 621 | do { |
| 622 | /* Set up fixed-size output buffer. */ |
| 623 | ssh->state->compression_out_stream.next_out = buf; |
| 624 | ssh->state->compression_out_stream.avail_out = sizeof(buf); |
| 625 | |
| 626 | /* Compress as much data into the buffer as possible. */ |
| 627 | status = deflate(&ssh->state->compression_out_stream, |
| 628 | Z_PARTIAL_FLUSH); |
| 629 | switch (status) { |
| 630 | case Z_MEM_ERROR: |
| 631 | return SSH_ERR_ALLOC_FAIL; |
| 632 | case Z_OK: |
| 633 | /* Append compressed data to output_buffer. */ |
| 634 | if ((r = sshbuf_put(out, buf, sizeof(buf) - |
| 635 | ssh->state->compression_out_stream.avail_out)) != 0) |
| 636 | return r; |
| 637 | break; |
| 638 | case Z_STREAM_ERROR: |
| 639 | default: |
| 640 | ssh->state->compression_out_failures++; |
| 641 | return SSH_ERR_INVALID_FORMAT; |
| 642 | } |
| 643 | } while (ssh->state->compression_out_stream.avail_out == 0); |
| 644 | return 0; |
| 645 | } |
| 646 | |
| 647 | static int |
| 648 | uncompress_buffer(struct ssh *ssh, struct sshbuf *in, struct sshbuf *out) |
| 649 | { |
| 650 | u_char buf[4096]; |
| 651 | int r, status; |
| 652 | |
| 653 | if (ssh->state->compression_in_started != 1) |
| 654 | return SSH_ERR_INTERNAL_ERROR; |
| 655 | |
| 656 | if ((ssh->state->compression_in_stream.next_in = |
| 657 | sshbuf_mutable_ptr(in)) == NULL) |
| 658 | return SSH_ERR_INTERNAL_ERROR; |
| 659 | ssh->state->compression_in_stream.avail_in = sshbuf_len(in); |
| 660 | |
| 661 | for (;;) { |
| 662 | /* Set up fixed-size output buffer. */ |
| 663 | ssh->state->compression_in_stream.next_out = buf; |
| 664 | ssh->state->compression_in_stream.avail_out = sizeof(buf); |
| 665 | |
| 666 | status = inflate(&ssh->state->compression_in_stream, |
| 667 | Z_PARTIAL_FLUSH); |
| 668 | switch (status) { |
| 669 | case Z_OK: |
| 670 | if ((r = sshbuf_put(out, buf, sizeof(buf) - |
| 671 | ssh->state->compression_in_stream.avail_out)) != 0) |
| 672 | return r; |
| 673 | break; |
| 674 | case Z_BUF_ERROR: |
| 675 | /* |
| 676 | * Comments in zlib.h say that we should keep calling |
| 677 | * inflate() until we get an error. This appears to |
| 678 | * be the error that we get. |
| 679 | */ |
| 680 | return 0; |
| 681 | case Z_DATA_ERROR: |
| 682 | return SSH_ERR_INVALID_FORMAT; |
| 683 | case Z_MEM_ERROR: |
| 684 | return SSH_ERR_ALLOC_FAIL; |
| 685 | case Z_STREAM_ERROR: |
| 686 | default: |
| 687 | ssh->state->compression_in_failures++; |
| 688 | return SSH_ERR_INTERNAL_ERROR; |
| 689 | } |
| 690 | } |
| 691 | /* NOTREACHED */ |
| 692 | } |
| 693 | |
| 694 | /* Serialise compression state into a blob for privsep */ |
| 695 | static int |
| 696 | ssh_packet_get_compress_state(struct sshbuf *m, struct ssh *ssh) |
| 697 | { |
| 698 | struct session_state *state = ssh->state; |
| 699 | struct sshbuf *b; |
| 700 | int r; |
| 701 | |
| 702 | if ((b = sshbuf_new()) == NULL) |
| 703 | return SSH_ERR_ALLOC_FAIL; |
| 704 | if (state->compression_in_started) { |
| 705 | if ((r = sshbuf_put_string(b, &state->compression_in_stream, |
| 706 | sizeof(state->compression_in_stream))) != 0) |
| 707 | goto out; |
| 708 | } else if ((r = sshbuf_put_string(b, NULL, 0)) != 0) |
| 709 | goto out; |
| 710 | if (state->compression_out_started) { |
| 711 | if ((r = sshbuf_put_string(b, &state->compression_out_stream, |
| 712 | sizeof(state->compression_out_stream))) != 0) |
| 713 | goto out; |
| 714 | } else if ((r = sshbuf_put_string(b, NULL, 0)) != 0) |
| 715 | goto out; |
| 716 | r = sshbuf_put_stringb(m, b); |
| 717 | out: |
| 718 | sshbuf_free(b); |
| 719 | return r; |
| 720 | } |
| 721 | |
| 722 | /* Deserialise compression state from a blob for privsep */ |
| 723 | static int |
| 724 | ssh_packet_set_compress_state(struct ssh *ssh, struct sshbuf *m) |
| 725 | { |
| 726 | struct session_state *state = ssh->state; |
| 727 | struct sshbuf *b = NULL; |
| 728 | int r; |
| 729 | const u_char *inblob, *outblob; |
| 730 | size_t inl, outl; |
| 731 | |
| 732 | if ((r = sshbuf_froms(m, &b)) != 0) |
| 733 | goto out; |
| 734 | if ((r = sshbuf_get_string_direct(b, &inblob, &inl)) != 0 || |
| 735 | (r = sshbuf_get_string_direct(b, &outblob, &outl)) != 0) |
| 736 | goto out; |
| 737 | if (inl == 0) |
| 738 | state->compression_in_started = 0; |
| 739 | else if (inl != sizeof(state->compression_in_stream)) { |
| 740 | r = SSH_ERR_INTERNAL_ERROR; |
| 741 | goto out; |
| 742 | } else { |
| 743 | state->compression_in_started = 1; |
| 744 | memcpy(&state->compression_in_stream, inblob, inl); |
| 745 | } |
| 746 | if (outl == 0) |
| 747 | state->compression_out_started = 0; |
| 748 | else if (outl != sizeof(state->compression_out_stream)) { |
| 749 | r = SSH_ERR_INTERNAL_ERROR; |
| 750 | goto out; |
| 751 | } else { |
| 752 | state->compression_out_started = 1; |
| 753 | memcpy(&state->compression_out_stream, outblob, outl); |
| 754 | } |
| 755 | r = 0; |
| 756 | out: |
| 757 | sshbuf_free(b); |
| 758 | return r; |
Ben Lindstrom | fb50cdf | 2001-04-05 23:20:46 +0000 | [diff] [blame] | 759 | } |
| 760 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 761 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 762 | ssh_packet_set_compress_hooks(struct ssh *ssh, void *ctx, |
| 763 | void *(*allocfunc)(void *, u_int, u_int), |
| 764 | void (*freefunc)(void *, void *)) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 765 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 766 | ssh->state->compression_out_stream.zalloc = (alloc_func)allocfunc; |
| 767 | ssh->state->compression_out_stream.zfree = (free_func)freefunc; |
| 768 | ssh->state->compression_out_stream.opaque = ctx; |
| 769 | ssh->state->compression_in_stream.zalloc = (alloc_func)allocfunc; |
| 770 | ssh->state->compression_in_stream.zfree = (free_func)freefunc; |
| 771 | ssh->state->compression_in_stream.opaque = ctx; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 772 | } |
| 773 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 774 | /* |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 775 | * Causes any further packets to be encrypted using the given key. The same |
| 776 | * key is used for both sending and reception. However, both directions are |
| 777 | * encrypted independently of each other. |
| 778 | */ |
Ben Lindstrom | 402c6cc | 2002-06-21 00:43:42 +0000 | [diff] [blame] | 779 | |
Damien Miller | 1f0311c | 2014-05-15 14:24:09 +1000 | [diff] [blame] | 780 | #ifdef WITH_OPENSSL |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 781 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 782 | ssh_packet_set_encryption_key(struct ssh *ssh, const u_char *key, u_int keylen, int number) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 783 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 784 | struct session_state *state = ssh->state; |
| 785 | const struct sshcipher *cipher = cipher_by_number(number); |
| 786 | int r; |
| 787 | const char *wmsg; |
Damien Miller | 4f7becb | 2006-03-26 14:10:14 +1100 | [diff] [blame] | 788 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 789 | if (cipher == NULL) |
| 790 | fatal("%s: unknown cipher number %d", __func__, number); |
| 791 | if (keylen < 20) |
| 792 | fatal("%s: keylen too small: %d", __func__, keylen); |
| 793 | if (keylen > SSH_SESSION_KEY_LENGTH) |
| 794 | fatal("%s: keylen too big: %d", __func__, keylen); |
| 795 | memcpy(state->ssh1_key, key, keylen); |
| 796 | state->ssh1_keylen = keylen; |
| 797 | if ((r = cipher_init(&state->send_context, cipher, key, keylen, |
| 798 | NULL, 0, CIPHER_ENCRYPT)) != 0 || |
| 799 | (r = cipher_init(&state->receive_context, cipher, key, keylen, |
| 800 | NULL, 0, CIPHER_DECRYPT) != 0)) |
| 801 | fatal("%s: cipher_init failed: %s", __func__, ssh_err(r)); |
| 802 | if (!state->cipher_warning_done && |
| 803 | ((wmsg = cipher_warning_message(&state->send_context)) != NULL || |
| 804 | (wmsg = cipher_warning_message(&state->send_context)) != NULL)) { |
| 805 | error("Warning: %s", wmsg); |
| 806 | state->cipher_warning_done = 1; |
| 807 | } |
Damien Miller | eb8b60e | 2010-08-31 22:41:14 +1000 | [diff] [blame] | 808 | } |
Damien Miller | 6af914a | 2010-09-10 11:39:26 +1000 | [diff] [blame] | 809 | #endif |
Damien Miller | eb8b60e | 2010-08-31 22:41:14 +1000 | [diff] [blame] | 810 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 811 | /* |
| 812 | * Finalizes and sends the packet. If the encryption key has been set, |
| 813 | * encrypts the packet before sending. |
| 814 | */ |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 815 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 816 | int |
| 817 | ssh_packet_send1(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 818 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 819 | struct session_state *state = ssh->state; |
Ben Lindstrom | 4a7714a | 2002-02-26 18:04:38 +0000 | [diff] [blame] | 820 | u_char buf[8], *cp; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 821 | int r, padding, len; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 822 | u_int checksum; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 823 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 824 | /* |
| 825 | * If using packet compression, compress the payload of the outgoing |
| 826 | * packet. |
| 827 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 828 | if (state->packet_compression) { |
| 829 | sshbuf_reset(state->compression_buffer); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 830 | /* Skip padding. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 831 | if ((r = sshbuf_consume(state->outgoing_packet, 8)) != 0) |
| 832 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 833 | /* padding */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 834 | if ((r = sshbuf_put(state->compression_buffer, |
| 835 | "\0\0\0\0\0\0\0\0", 8)) != 0) |
| 836 | goto out; |
| 837 | if ((r = compress_buffer(ssh, state->outgoing_packet, |
| 838 | state->compression_buffer)) != 0) |
| 839 | goto out; |
| 840 | sshbuf_reset(state->outgoing_packet); |
| 841 | if ((r = sshbuf_putb(state->outgoing_packet, |
| 842 | state->compression_buffer)) != 0) |
| 843 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 844 | } |
| 845 | /* Compute packet length without padding (add checksum, remove padding). */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 846 | len = sshbuf_len(state->outgoing_packet) + 4 - 8; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 847 | |
Damien Miller | e247cc4 | 2000-05-07 12:03:14 +1000 | [diff] [blame] | 848 | /* Insert padding. Initialized to zero in packet_start1() */ |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 849 | padding = 8 - len % 8; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 850 | if (!state->send_context.plaintext) { |
| 851 | cp = sshbuf_mutable_ptr(state->outgoing_packet); |
| 852 | if (cp == NULL) { |
| 853 | r = SSH_ERR_INTERNAL_ERROR; |
| 854 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 855 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 856 | arc4random_buf(cp + 8 - padding, padding); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 857 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 858 | if ((r = sshbuf_consume(state->outgoing_packet, 8 - padding)) != 0) |
| 859 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 860 | |
| 861 | /* Add check bytes. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 862 | checksum = ssh_crc32(sshbuf_ptr(state->outgoing_packet), |
| 863 | sshbuf_len(state->outgoing_packet)); |
| 864 | POKE_U32(buf, checksum); |
| 865 | if ((r = sshbuf_put(state->outgoing_packet, buf, 4)) != 0) |
| 866 | goto out; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 867 | |
| 868 | #ifdef PACKET_DEBUG |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 869 | fprintf(stderr, "packet_send plain: "); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 870 | sshbuf_dump(state->outgoing_packet, stderr); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 871 | #endif |
| 872 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 873 | /* Append to output. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 874 | POKE_U32(buf, len); |
| 875 | if ((r = sshbuf_put(state->output, buf, 4)) != 0) |
| 876 | goto out; |
| 877 | if ((r = sshbuf_reserve(state->output, |
| 878 | sshbuf_len(state->outgoing_packet), &cp)) != 0) |
| 879 | goto out; |
| 880 | if ((r = cipher_crypt(&state->send_context, 0, cp, |
| 881 | sshbuf_ptr(state->outgoing_packet), |
| 882 | sshbuf_len(state->outgoing_packet), 0, 0)) != 0) |
| 883 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 884 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 885 | #ifdef PACKET_DEBUG |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 886 | fprintf(stderr, "encrypted: "); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 887 | sshbuf_dump(state->output, stderr); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 888 | #endif |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 889 | state->p_send.packets++; |
| 890 | state->p_send.bytes += len + |
| 891 | sshbuf_len(state->outgoing_packet); |
| 892 | sshbuf_reset(state->outgoing_packet); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 893 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 894 | /* |
Damien Miller | 788f212 | 2005-11-05 15:14:59 +1100 | [diff] [blame] | 895 | * Note that the packet is now only buffered in output. It won't be |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 896 | * actually sent until packet_write_wait or packet_write_poll is |
| 897 | * called. |
| 898 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 899 | r = 0; |
| 900 | out: |
| 901 | return r; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 902 | } |
| 903 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 904 | int |
| 905 | ssh_set_newkeys(struct ssh *ssh, int mode) |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 906 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 907 | struct session_state *state = ssh->state; |
| 908 | struct sshenc *enc; |
| 909 | struct sshmac *mac; |
| 910 | struct sshcomp *comp; |
| 911 | struct sshcipher_ctx *cc; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 912 | u_int64_t *max_blocks; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 913 | const char *wmsg; |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 914 | int r, crypt_type; |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 915 | |
Ben Lindstrom | 064496f | 2002-12-23 02:04:22 +0000 | [diff] [blame] | 916 | debug2("set_newkeys: mode %d", mode); |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 917 | |
Damien Miller | 963f6b2 | 2002-02-19 15:21:23 +1100 | [diff] [blame] | 918 | if (mode == MODE_OUT) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 919 | cc = &state->send_context; |
Darren Tucker | 3f9fdc7 | 2004-06-22 12:56:01 +1000 | [diff] [blame] | 920 | crypt_type = CIPHER_ENCRYPT; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 921 | state->p_send.packets = state->p_send.blocks = 0; |
| 922 | max_blocks = &state->max_blocks_out; |
Damien Miller | 963f6b2 | 2002-02-19 15:21:23 +1100 | [diff] [blame] | 923 | } else { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 924 | cc = &state->receive_context; |
Darren Tucker | 3f9fdc7 | 2004-06-22 12:56:01 +1000 | [diff] [blame] | 925 | crypt_type = CIPHER_DECRYPT; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 926 | state->p_read.packets = state->p_read.blocks = 0; |
| 927 | max_blocks = &state->max_blocks_in; |
Damien Miller | 963f6b2 | 2002-02-19 15:21:23 +1100 | [diff] [blame] | 928 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 929 | if (state->newkeys[mode] != NULL) { |
Ben Lindstrom | 064496f | 2002-12-23 02:04:22 +0000 | [diff] [blame] | 930 | debug("set_newkeys: rekeying"); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 931 | if ((r = cipher_cleanup(cc)) != 0) |
| 932 | return r; |
| 933 | enc = &state->newkeys[mode]->enc; |
| 934 | mac = &state->newkeys[mode]->mac; |
| 935 | comp = &state->newkeys[mode]->comp; |
Damien Miller | e45796f | 2007-06-11 14:01:42 +1000 | [diff] [blame] | 936 | mac_clear(mac); |
Damien Miller | a5103f4 | 2014-02-04 11:20:14 +1100 | [diff] [blame] | 937 | explicit_bzero(enc->iv, enc->iv_len); |
| 938 | explicit_bzero(enc->key, enc->key_len); |
| 939 | explicit_bzero(mac->key, mac->key_len); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 940 | free(enc->name); |
| 941 | free(enc->iv); |
| 942 | free(enc->key); |
| 943 | free(mac->name); |
| 944 | free(mac->key); |
| 945 | free(comp->name); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 946 | free(state->newkeys[mode]); |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 947 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 948 | /* move newkeys from kex to state */ |
| 949 | if ((state->newkeys[mode] = ssh->kex->newkeys[mode]) == NULL) |
| 950 | return SSH_ERR_INTERNAL_ERROR; |
| 951 | ssh->kex->newkeys[mode] = NULL; |
| 952 | enc = &state->newkeys[mode]->enc; |
| 953 | mac = &state->newkeys[mode]->mac; |
| 954 | comp = &state->newkeys[mode]->comp; |
| 955 | if (cipher_authlen(enc->cipher) == 0) { |
| 956 | if ((r = mac_init(mac)) != 0) |
| 957 | return r; |
| 958 | } |
| 959 | mac->enabled = 1; |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 960 | DBG(debug("cipher_init_context: %d", mode)); |
Damien Miller | 8668706 | 2014-07-02 15:28:02 +1000 | [diff] [blame] | 961 | if ((r = cipher_init(cc, enc->cipher, enc->key, enc->key_len, |
| 962 | enc->iv, enc->iv_len, crypt_type)) != 0) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 963 | return r; |
| 964 | if (!state->cipher_warning_done && |
| 965 | (wmsg = cipher_warning_message(cc)) != NULL) { |
| 966 | error("Warning: %s", wmsg); |
| 967 | state->cipher_warning_done = 1; |
| 968 | } |
Ben Lindstrom | f6027d3 | 2002-03-22 01:42:04 +0000 | [diff] [blame] | 969 | /* Deleting the keys does not gain extra security */ |
Damien Miller | a5103f4 | 2014-02-04 11:20:14 +1100 | [diff] [blame] | 970 | /* explicit_bzero(enc->iv, enc->block_size); |
| 971 | explicit_bzero(enc->key, enc->key_len); |
| 972 | explicit_bzero(mac->key, mac->key_len); */ |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 973 | if ((comp->type == COMP_ZLIB || |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 974 | (comp->type == COMP_DELAYED && |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 975 | state->after_authentication)) && comp->enabled == 0) { |
| 976 | if ((r = ssh_packet_init_compression(ssh)) < 0) |
| 977 | return r; |
| 978 | if (mode == MODE_OUT) { |
| 979 | if ((r = start_compression_out(ssh, 6)) != 0) |
| 980 | return r; |
| 981 | } else { |
| 982 | if ((r = start_compression_in(ssh)) != 0) |
| 983 | return r; |
| 984 | } |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 985 | comp->enabled = 1; |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 986 | } |
Darren Tucker | 81a0b37 | 2003-07-14 17:31:06 +1000 | [diff] [blame] | 987 | /* |
| 988 | * The 2^(blocksize*2) limit is too expensive for 3DES, |
| 989 | * blowfish, etc, so enforce a 1GB limit for small blocksizes. |
| 990 | */ |
| 991 | if (enc->block_size >= 16) |
| 992 | *max_blocks = (u_int64_t)1 << (enc->block_size*2); |
| 993 | else |
| 994 | *max_blocks = ((u_int64_t)1 << 30) / enc->block_size; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 995 | if (state->rekey_limit) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 996 | *max_blocks = MIN(*max_blocks, |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 997 | state->rekey_limit / enc->block_size); |
| 998 | return 0; |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 999 | } |
| 1000 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1001 | /* |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1002 | * Delayed compression for SSH2 is enabled after authentication: |
Darren Tucker | f676c57 | 2006-08-05 18:51:08 +1000 | [diff] [blame] | 1003 | * This happens on the server side after a SSH2_MSG_USERAUTH_SUCCESS is sent, |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1004 | * and on the client side after a SSH2_MSG_USERAUTH_SUCCESS is received. |
| 1005 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1006 | static int |
| 1007 | ssh_packet_enable_delayed_compress(struct ssh *ssh) |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1008 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1009 | struct session_state *state = ssh->state; |
| 1010 | struct sshcomp *comp = NULL; |
| 1011 | int r, mode; |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1012 | |
| 1013 | /* |
| 1014 | * Remember that we are past the authentication step, so rekeying |
| 1015 | * with COMP_DELAYED will turn on compression immediately. |
| 1016 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1017 | state->after_authentication = 1; |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1018 | for (mode = 0; mode < MODE_MAX; mode++) { |
Darren Tucker | 4aa665b | 2006-09-21 13:00:25 +1000 | [diff] [blame] | 1019 | /* protocol error: USERAUTH_SUCCESS received before NEWKEYS */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1020 | if (state->newkeys[mode] == NULL) |
Darren Tucker | 4aa665b | 2006-09-21 13:00:25 +1000 | [diff] [blame] | 1021 | continue; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1022 | comp = &state->newkeys[mode]->comp; |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1023 | if (comp && !comp->enabled && comp->type == COMP_DELAYED) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1024 | if ((r = ssh_packet_init_compression(ssh)) != 0) |
| 1025 | return r; |
| 1026 | if (mode == MODE_OUT) { |
| 1027 | if ((r = start_compression_out(ssh, 6)) != 0) |
| 1028 | return r; |
| 1029 | } else { |
| 1030 | if ((r = start_compression_in(ssh)) != 0) |
| 1031 | return r; |
| 1032 | } |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1033 | comp->enabled = 1; |
| 1034 | } |
| 1035 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1036 | return 0; |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 1037 | } |
| 1038 | |
| 1039 | /* |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1040 | * Finalize packet in SSH2 format (compress, mac, encrypt, enqueue) |
| 1041 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1042 | int |
| 1043 | ssh_packet_send2_wrapped(struct ssh *ssh) |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1044 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1045 | struct session_state *state = ssh->state; |
markus@openbsd.org | 128343b | 2015-01-13 19:31:40 +0000 | [diff] [blame] | 1046 | u_char type, *cp, macbuf[SSH_DIGEST_MAX_LENGTH]; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1047 | u_char padlen, pad = 0; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1048 | u_int authlen = 0, aadlen = 0; |
| 1049 | u_int len; |
| 1050 | struct sshenc *enc = NULL; |
| 1051 | struct sshmac *mac = NULL; |
| 1052 | struct sshcomp *comp = NULL; |
| 1053 | int r, block_size; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1054 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1055 | if (state->newkeys[MODE_OUT] != NULL) { |
| 1056 | enc = &state->newkeys[MODE_OUT]->enc; |
| 1057 | mac = &state->newkeys[MODE_OUT]->mac; |
| 1058 | comp = &state->newkeys[MODE_OUT]->comp; |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 1059 | /* disable mac for authenticated encryption */ |
| 1060 | if ((authlen = cipher_authlen(enc->cipher)) != 0) |
| 1061 | mac = NULL; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1062 | } |
Damien Miller | 963f6b2 | 2002-02-19 15:21:23 +1100 | [diff] [blame] | 1063 | block_size = enc ? enc->block_size : 8; |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 1064 | aadlen = (mac && mac->enabled && mac->etm) || authlen ? 4 : 0; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1065 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1066 | type = (sshbuf_ptr(state->outgoing_packet))[5]; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1067 | |
| 1068 | #ifdef PACKET_DEBUG |
| 1069 | fprintf(stderr, "plain: "); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1070 | sshbuf_dump(state->outgoing_packet, stderr); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1071 | #endif |
| 1072 | |
| 1073 | if (comp && comp->enabled) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1074 | len = sshbuf_len(state->outgoing_packet); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1075 | /* skip header, compress only payload */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1076 | if ((r = sshbuf_consume(state->outgoing_packet, 5)) != 0) |
| 1077 | goto out; |
| 1078 | sshbuf_reset(state->compression_buffer); |
| 1079 | if ((r = compress_buffer(ssh, state->outgoing_packet, |
| 1080 | state->compression_buffer)) != 0) |
| 1081 | goto out; |
| 1082 | sshbuf_reset(state->outgoing_packet); |
| 1083 | if ((r = sshbuf_put(state->outgoing_packet, |
| 1084 | "\0\0\0\0\0", 5)) != 0 || |
| 1085 | (r = sshbuf_putb(state->outgoing_packet, |
| 1086 | state->compression_buffer)) != 0) |
| 1087 | goto out; |
| 1088 | DBG(debug("compression: raw %d compressed %zd", len, |
| 1089 | sshbuf_len(state->outgoing_packet))); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1090 | } |
| 1091 | |
| 1092 | /* sizeof (packet_len + pad_len + payload) */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1093 | len = sshbuf_len(state->outgoing_packet); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1094 | |
| 1095 | /* |
| 1096 | * calc size of padding, alloc space, get random data, |
| 1097 | * minimum padding is 4 bytes |
| 1098 | */ |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1099 | len -= aadlen; /* packet length is not encrypted for EtM modes */ |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1100 | padlen = block_size - (len % block_size); |
| 1101 | if (padlen < 4) |
| 1102 | padlen += block_size; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1103 | if (state->extra_pad) { |
Damien Miller | 9f64390 | 2001-11-12 11:02:52 +1100 | [diff] [blame] | 1104 | /* will wrap if extra_pad+padlen > 255 */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1105 | state->extra_pad = |
| 1106 | roundup(state->extra_pad, block_size); |
| 1107 | pad = state->extra_pad - |
| 1108 | ((len + padlen) % state->extra_pad); |
Damien Miller | 2a32843 | 2014-04-20 13:24:01 +1000 | [diff] [blame] | 1109 | DBG(debug3("%s: adding %d (len %d padlen %d extra_pad %d)", |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1110 | __func__, pad, len, padlen, state->extra_pad)); |
Damien Miller | 9f64390 | 2001-11-12 11:02:52 +1100 | [diff] [blame] | 1111 | padlen += pad; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1112 | state->extra_pad = 0; |
Damien Miller | 9f64390 | 2001-11-12 11:02:52 +1100 | [diff] [blame] | 1113 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1114 | if ((r = sshbuf_reserve(state->outgoing_packet, padlen, &cp)) != 0) |
| 1115 | goto out; |
| 1116 | if (enc && !state->send_context.plaintext) { |
Damien Miller | e247cc4 | 2000-05-07 12:03:14 +1000 | [diff] [blame] | 1117 | /* random padding */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1118 | arc4random_buf(cp, padlen); |
Damien Miller | e247cc4 | 2000-05-07 12:03:14 +1000 | [diff] [blame] | 1119 | } else { |
| 1120 | /* clear padding */ |
Damien Miller | a5103f4 | 2014-02-04 11:20:14 +1100 | [diff] [blame] | 1121 | explicit_bzero(cp, padlen); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1122 | } |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1123 | /* sizeof (packet_len + pad_len + payload + padding) */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1124 | len = sshbuf_len(state->outgoing_packet); |
| 1125 | cp = sshbuf_mutable_ptr(state->outgoing_packet); |
| 1126 | if (cp == NULL) { |
| 1127 | r = SSH_ERR_INTERNAL_ERROR; |
| 1128 | goto out; |
| 1129 | } |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1130 | /* packet_length includes payload, padding and padding length field */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1131 | POKE_U32(cp, len - 4); |
Ben Lindstrom | 4a7714a | 2002-02-26 18:04:38 +0000 | [diff] [blame] | 1132 | cp[4] = padlen; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1133 | DBG(debug("send: len %d (includes padlen %d, aadlen %d)", |
| 1134 | len, padlen, aadlen)); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1135 | |
| 1136 | /* compute MAC over seqnr and packet(length fields, payload, padding) */ |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1137 | if (mac && mac->enabled && !mac->etm) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1138 | if ((r = mac_compute(mac, state->p_send.seqnr, |
| 1139 | sshbuf_ptr(state->outgoing_packet), len, |
markus@openbsd.org | 128343b | 2015-01-13 19:31:40 +0000 | [diff] [blame] | 1140 | macbuf, sizeof(macbuf))) != 0) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1141 | goto out; |
| 1142 | DBG(debug("done calc MAC out #%d", state->p_send.seqnr)); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1143 | } |
| 1144 | /* encrypt packet and append to output buffer. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1145 | if ((r = sshbuf_reserve(state->output, |
| 1146 | sshbuf_len(state->outgoing_packet) + authlen, &cp)) != 0) |
| 1147 | goto out; |
| 1148 | if ((r = cipher_crypt(&state->send_context, state->p_send.seqnr, cp, |
| 1149 | sshbuf_ptr(state->outgoing_packet), |
| 1150 | len - aadlen, aadlen, authlen)) != 0) |
| 1151 | goto out; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1152 | /* append unencrypted MAC */ |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1153 | if (mac && mac->enabled) { |
| 1154 | if (mac->etm) { |
| 1155 | /* EtM: compute mac over aadlen + cipher text */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1156 | if ((r = mac_compute(mac, state->p_send.seqnr, |
| 1157 | cp, len, macbuf, sizeof(macbuf))) != 0) |
| 1158 | goto out; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1159 | DBG(debug("done calc MAC(EtM) out #%d", |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1160 | state->p_send.seqnr)); |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1161 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1162 | if ((r = sshbuf_put(state->output, macbuf, mac->mac_len)) != 0) |
| 1163 | goto out; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1164 | } |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1165 | #ifdef PACKET_DEBUG |
| 1166 | fprintf(stderr, "encrypted: "); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1167 | sshbuf_dump(state->output, stderr); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1168 | #endif |
Damien Miller | 4af5130 | 2000-04-16 11:18:38 +1000 | [diff] [blame] | 1169 | /* increment sequence number for outgoing packets */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1170 | if (++state->p_send.seqnr == 0) |
Damien Miller | 996acd2 | 2003-04-09 20:59:48 +1000 | [diff] [blame] | 1171 | logit("outgoing seqnr wraps around"); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1172 | if (++state->p_send.packets == 0) |
| 1173 | if (!(ssh->compat & SSH_BUG_NOREKEY)) |
| 1174 | return SSH_ERR_NEED_REKEY; |
| 1175 | state->p_send.blocks += len / block_size; |
| 1176 | state->p_send.bytes += len; |
| 1177 | sshbuf_reset(state->outgoing_packet); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1178 | |
Ben Lindstrom | 2d90e00 | 2001-04-04 02:00:54 +0000 | [diff] [blame] | 1179 | if (type == SSH2_MSG_NEWKEYS) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1180 | r = ssh_set_newkeys(ssh, MODE_OUT); |
| 1181 | else if (type == SSH2_MSG_USERAUTH_SUCCESS && state->server_side) |
| 1182 | r = ssh_packet_enable_delayed_compress(ssh); |
| 1183 | else |
| 1184 | r = 0; |
| 1185 | out: |
| 1186 | return r; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1187 | } |
| 1188 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1189 | int |
| 1190 | ssh_packet_send2(struct ssh *ssh) |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1191 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1192 | struct session_state *state = ssh->state; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1193 | struct packet *p; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1194 | u_char type; |
| 1195 | int r; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1196 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1197 | type = sshbuf_ptr(state->outgoing_packet)[5]; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1198 | |
| 1199 | /* during rekeying we can only send key exchange messages */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1200 | if (state->rekeying) { |
Damien Miller | 1de2cfe | 2012-02-11 08:18:43 +1100 | [diff] [blame] | 1201 | if ((type < SSH2_MSG_TRANSPORT_MIN) || |
| 1202 | (type > SSH2_MSG_TRANSPORT_MAX) || |
| 1203 | (type == SSH2_MSG_SERVICE_REQUEST) || |
| 1204 | (type == SSH2_MSG_SERVICE_ACCEPT)) { |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1205 | debug("enqueue packet: %u", type); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1206 | p = calloc(1, sizeof(*p)); |
| 1207 | if (p == NULL) |
| 1208 | return SSH_ERR_ALLOC_FAIL; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1209 | p->type = type; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1210 | p->payload = state->outgoing_packet; |
| 1211 | TAILQ_INSERT_TAIL(&state->outgoing, p, next); |
| 1212 | state->outgoing_packet = sshbuf_new(); |
| 1213 | if (state->outgoing_packet == NULL) |
| 1214 | return SSH_ERR_ALLOC_FAIL; |
| 1215 | return 0; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1216 | } |
| 1217 | } |
| 1218 | |
| 1219 | /* rekeying starts with sending KEXINIT */ |
| 1220 | if (type == SSH2_MSG_KEXINIT) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1221 | state->rekeying = 1; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1222 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1223 | if ((r = ssh_packet_send2_wrapped(ssh)) != 0) |
| 1224 | return r; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1225 | |
| 1226 | /* after a NEWKEYS message we can send the complete queue */ |
| 1227 | if (type == SSH2_MSG_NEWKEYS) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1228 | state->rekeying = 0; |
| 1229 | state->rekey_time = monotime(); |
| 1230 | while ((p = TAILQ_FIRST(&state->outgoing))) { |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1231 | type = p->type; |
| 1232 | debug("dequeue packet: %u", type); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1233 | sshbuf_free(state->outgoing_packet); |
| 1234 | state->outgoing_packet = p->payload; |
| 1235 | TAILQ_REMOVE(&state->outgoing, p, next); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 1236 | free(p); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1237 | if ((r = ssh_packet_send2_wrapped(ssh)) != 0) |
| 1238 | return r; |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 1239 | } |
| 1240 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1241 | return 0; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1242 | } |
| 1243 | |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1244 | /* |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1245 | * Waits until a packet has been received, and returns its type. Note that |
| 1246 | * no other data is processed until this returns, so this function should not |
| 1247 | * be used during the interactive session. |
| 1248 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1249 | |
| 1250 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1251 | ssh_packet_read_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1252 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1253 | struct session_state *state = ssh->state; |
| 1254 | int len, r, ms_remain, cont; |
Ben Lindstrom | cb978aa | 2001-03-05 07:07:49 +0000 | [diff] [blame] | 1255 | fd_set *setp; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1256 | char buf[8192]; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1257 | struct timeval timeout, start, *timeoutp = NULL; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1258 | |
Darren Tucker | 99bb761 | 2008-06-13 22:02:50 +1000 | [diff] [blame] | 1259 | DBG(debug("packet_read()")); |
| 1260 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1261 | setp = (fd_set *)calloc(howmany(state->connection_in + 1, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1262 | NFDBITS), sizeof(fd_mask)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1263 | if (setp == NULL) |
| 1264 | return SSH_ERR_ALLOC_FAIL; |
Ben Lindstrom | cb978aa | 2001-03-05 07:07:49 +0000 | [diff] [blame] | 1265 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1266 | /* Since we are blocking, ensure that all written packets have been sent. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1267 | ssh_packet_write_wait(ssh); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1268 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1269 | /* Stay in the loop until we have received a complete packet. */ |
| 1270 | for (;;) { |
| 1271 | /* Try to read a packet from the buffer. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1272 | r = ssh_packet_read_poll_seqnr(ssh, typep, seqnr_p); |
| 1273 | if (r != 0) |
| 1274 | break; |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1275 | if (!compat20 && ( |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1276 | *typep == SSH_SMSG_SUCCESS |
| 1277 | || *typep == SSH_SMSG_FAILURE |
| 1278 | || *typep == SSH_CMSG_EOF |
| 1279 | || *typep == SSH_CMSG_EXIT_CONFIRMATION)) |
| 1280 | if ((r = sshpkt_get_end(ssh)) != 0) |
| 1281 | break; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1282 | /* If we got a packet, return it. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1283 | if (*typep != SSH_MSG_NONE) |
| 1284 | break; |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1285 | /* |
| 1286 | * Otherwise, wait for some data to arrive, add it to the |
| 1287 | * buffer, and try again. |
| 1288 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1289 | memset(setp, 0, howmany(state->connection_in + 1, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1290 | NFDBITS) * sizeof(fd_mask)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1291 | FD_SET(state->connection_in, setp); |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1292 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1293 | if (state->packet_timeout_ms > 0) { |
| 1294 | ms_remain = state->packet_timeout_ms; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1295 | timeoutp = &timeout; |
| 1296 | } |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1297 | /* Wait for some data to arrive. */ |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1298 | for (;;) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1299 | if (state->packet_timeout_ms != -1) { |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1300 | ms_to_timeval(&timeout, ms_remain); |
| 1301 | gettimeofday(&start, NULL); |
| 1302 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1303 | if ((r = select(state->connection_in + 1, setp, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1304 | NULL, NULL, timeoutp)) >= 0) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1305 | break; |
Damien Miller | ea43742 | 2009-10-02 11:49:03 +1000 | [diff] [blame] | 1306 | if (errno != EAGAIN && errno != EINTR && |
| 1307 | errno != EWOULDBLOCK) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1308 | break; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1309 | if (state->packet_timeout_ms == -1) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1310 | continue; |
| 1311 | ms_subtract_diff(&start, &ms_remain); |
| 1312 | if (ms_remain <= 0) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1313 | r = 0; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1314 | break; |
| 1315 | } |
| 1316 | } |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1317 | if (r == 0) |
| 1318 | return SSH_ERR_CONN_TIMEOUT; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1319 | /* Read data from the socket. */ |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 1320 | do { |
| 1321 | cont = 0; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1322 | len = roaming_read(state->connection_in, buf, |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 1323 | sizeof(buf), &cont); |
| 1324 | } while (len == 0 && cont); |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1325 | if (len == 0) |
| 1326 | return SSH_ERR_CONN_CLOSED; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1327 | if (len < 0) |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1328 | return SSH_ERR_SYSTEM_ERROR; |
| 1329 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1330 | /* Append it to the buffer. */ |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1331 | if ((r = ssh_packet_process_incoming(ssh, buf, len)) != 0) |
| 1332 | return r; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1333 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1334 | free(setp); |
| 1335 | return r; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1336 | } |
| 1337 | |
Damien Miller | 278f907 | 2001-12-21 15:00:19 +1100 | [diff] [blame] | 1338 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1339 | ssh_packet_read(struct ssh *ssh) |
Damien Miller | 278f907 | 2001-12-21 15:00:19 +1100 | [diff] [blame] | 1340 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1341 | u_char type; |
| 1342 | int r; |
| 1343 | |
| 1344 | if ((r = ssh_packet_read_seqnr(ssh, &type, NULL)) != 0) |
| 1345 | fatal("%s: %s", __func__, ssh_err(r)); |
| 1346 | return type; |
Damien Miller | 278f907 | 2001-12-21 15:00:19 +1100 | [diff] [blame] | 1347 | } |
| 1348 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1349 | /* |
| 1350 | * Waits until a packet has been received, verifies that its type matches |
| 1351 | * that given, and gives a fatal error and exits if there is a mismatch. |
| 1352 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1353 | |
| 1354 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1355 | ssh_packet_read_expect(struct ssh *ssh, int expected_type) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1356 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1357 | int type; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1358 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1359 | type = ssh_packet_read(ssh); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1360 | if (type != expected_type) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1361 | ssh_packet_disconnect(ssh, |
| 1362 | "Protocol error: expected packet type %d, got %d", |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1363 | expected_type, type); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1364 | } |
| 1365 | |
| 1366 | /* Checks if a full packet is available in the data received so far via |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1367 | * packet_process_incoming. If so, reads the packet; otherwise returns |
| 1368 | * SSH_MSG_NONE. This does not wait for data from the connection. |
| 1369 | * |
Damien Miller | 5ed3d57 | 2008-02-10 22:27:47 +1100 | [diff] [blame] | 1370 | * SSH_MSG_DISCONNECT is handled specially here. Also, |
| 1371 | * SSH_MSG_IGNORE messages are skipped by this function and are never returned |
| 1372 | * to higher levels. |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1373 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1374 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1375 | int |
| 1376 | ssh_packet_read_poll1(struct ssh *ssh, u_char *typep) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1377 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1378 | struct session_state *state = ssh->state; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 1379 | u_int len, padded_len; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1380 | const u_char *cp; |
| 1381 | u_char *p; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 1382 | u_int checksum, stored_checksum; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1383 | int r; |
| 1384 | |
| 1385 | *typep = SSH_MSG_NONE; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1386 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1387 | /* Check if input size is less than minimum packet size. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1388 | if (sshbuf_len(state->input) < 4 + 8) |
| 1389 | return 0; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1390 | /* Get length of incoming packet. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1391 | len = PEEK_U32(sshbuf_ptr(state->input)); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1392 | if (len < 1 + 2 + 2 || len > 256 * 1024) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1393 | ssh_packet_disconnect(ssh, "Bad packet length %u.", |
| 1394 | len); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1395 | padded_len = (len + 8) & ~7; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1396 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1397 | /* Check if the packet has been entirely received. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1398 | if (sshbuf_len(state->input) < 4 + padded_len) |
| 1399 | return 0; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1400 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1401 | /* The entire packet is in buffer. */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1402 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1403 | /* Consume packet length. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1404 | if ((r = sshbuf_consume(state->input, 4)) != 0) |
| 1405 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1406 | |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1407 | /* |
| 1408 | * Cryptographic attack detector for ssh |
| 1409 | * (C)1998 CORE-SDI, Buenos Aires Argentina |
| 1410 | * Ariel Futoransky(futo@core-sdi.com) |
| 1411 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1412 | if (!state->receive_context.plaintext) { |
| 1413 | switch (detect_attack(&state->deattack, |
| 1414 | sshbuf_ptr(state->input), padded_len)) { |
| 1415 | case DEATTACK_OK: |
| 1416 | break; |
Damien Miller | 3c9c1fb | 2006-09-17 06:08:53 +1000 | [diff] [blame] | 1417 | case DEATTACK_DETECTED: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1418 | ssh_packet_disconnect(ssh, |
| 1419 | "crc32 compensation attack: network attack detected" |
| 1420 | ); |
Damien Miller | 3c9c1fb | 2006-09-17 06:08:53 +1000 | [diff] [blame] | 1421 | case DEATTACK_DOS_DETECTED: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1422 | ssh_packet_disconnect(ssh, |
| 1423 | "deattack denial of service detected"); |
| 1424 | default: |
| 1425 | ssh_packet_disconnect(ssh, "deattack error"); |
Damien Miller | 3c9c1fb | 2006-09-17 06:08:53 +1000 | [diff] [blame] | 1426 | } |
| 1427 | } |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1428 | |
| 1429 | /* Decrypt data to incoming_packet. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1430 | sshbuf_reset(state->incoming_packet); |
| 1431 | if ((r = sshbuf_reserve(state->incoming_packet, padded_len, &p)) != 0) |
| 1432 | goto out; |
| 1433 | if ((r = cipher_crypt(&state->receive_context, 0, p, |
| 1434 | sshbuf_ptr(state->input), padded_len, 0, 0)) != 0) |
| 1435 | goto out; |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1436 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1437 | if ((r = sshbuf_consume(state->input, padded_len)) != 0) |
| 1438 | goto out; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1439 | |
| 1440 | #ifdef PACKET_DEBUG |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1441 | fprintf(stderr, "read_poll plain: "); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1442 | sshbuf_dump(state->incoming_packet, stderr); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1443 | #endif |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1444 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1445 | /* Compute packet checksum. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1446 | checksum = ssh_crc32(sshbuf_ptr(state->incoming_packet), |
| 1447 | sshbuf_len(state->incoming_packet) - 4); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1448 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1449 | /* Skip padding. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1450 | if ((r = sshbuf_consume(state->incoming_packet, 8 - len % 8)) != 0) |
| 1451 | goto out; |
Damien Miller | fd7c911 | 1999-11-08 16:15:55 +1100 | [diff] [blame] | 1452 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1453 | /* Test check bytes. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1454 | if (len != sshbuf_len(state->incoming_packet)) |
| 1455 | ssh_packet_disconnect(ssh, |
| 1456 | "packet_read_poll1: len %d != sshbuf_len %zd.", |
| 1457 | len, sshbuf_len(state->incoming_packet)); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1458 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1459 | cp = sshbuf_ptr(state->incoming_packet) + len - 4; |
| 1460 | stored_checksum = PEEK_U32(cp); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1461 | if (checksum != stored_checksum) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1462 | ssh_packet_disconnect(ssh, |
| 1463 | "Corrupted check bytes on input."); |
| 1464 | if ((r = sshbuf_consume_end(state->incoming_packet, 4)) < 0) |
| 1465 | goto out; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1466 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1467 | if (state->packet_compression) { |
| 1468 | sshbuf_reset(state->compression_buffer); |
| 1469 | if ((r = uncompress_buffer(ssh, state->incoming_packet, |
| 1470 | state->compression_buffer)) != 0) |
| 1471 | goto out; |
| 1472 | sshbuf_reset(state->incoming_packet); |
| 1473 | if ((r = sshbuf_putb(state->incoming_packet, |
| 1474 | state->compression_buffer)) != 0) |
| 1475 | goto out; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1476 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1477 | state->p_read.packets++; |
| 1478 | state->p_read.bytes += padded_len + 4; |
| 1479 | if ((r = sshbuf_get_u8(state->incoming_packet, typep)) != 0) |
| 1480 | goto out; |
| 1481 | if (*typep < SSH_MSG_MIN || *typep > SSH_MSG_MAX) |
| 1482 | ssh_packet_disconnect(ssh, |
| 1483 | "Invalid ssh1 packet type: %d", *typep); |
| 1484 | r = 0; |
| 1485 | out: |
| 1486 | return r; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1487 | } |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1488 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1489 | int |
| 1490 | ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1491 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1492 | struct session_state *state = ssh->state; |
Ben Lindstrom | 46c1622 | 2000-12-22 01:43:59 +0000 | [diff] [blame] | 1493 | u_int padlen, need; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1494 | u_char *cp, macbuf[SSH_DIGEST_MAX_LENGTH]; |
| 1495 | u_int maclen, aadlen = 0, authlen = 0, block_size; |
| 1496 | struct sshenc *enc = NULL; |
| 1497 | struct sshmac *mac = NULL; |
| 1498 | struct sshcomp *comp = NULL; |
markus@openbsd.org | 128343b | 2015-01-13 19:31:40 +0000 | [diff] [blame] | 1499 | int r; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1500 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1501 | *typep = SSH_MSG_NONE; |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 1502 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1503 | if (state->packet_discard) |
| 1504 | return 0; |
| 1505 | |
| 1506 | if (state->newkeys[MODE_IN] != NULL) { |
| 1507 | enc = &state->newkeys[MODE_IN]->enc; |
| 1508 | mac = &state->newkeys[MODE_IN]->mac; |
| 1509 | comp = &state->newkeys[MODE_IN]->comp; |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 1510 | /* disable mac for authenticated encryption */ |
| 1511 | if ((authlen = cipher_authlen(enc->cipher)) != 0) |
| 1512 | mac = NULL; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1513 | } |
| 1514 | maclen = mac && mac->enabled ? mac->mac_len : 0; |
Damien Miller | 963f6b2 | 2002-02-19 15:21:23 +1100 | [diff] [blame] | 1515 | block_size = enc ? enc->block_size : 8; |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 1516 | aadlen = (mac && mac->enabled && mac->etm) || authlen ? 4 : 0; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1517 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1518 | if (aadlen && state->packlen == 0) { |
| 1519 | if (cipher_get_length(&state->receive_context, |
| 1520 | &state->packlen, state->p_read.seqnr, |
| 1521 | sshbuf_ptr(state->input), sshbuf_len(state->input)) != 0) |
| 1522 | return 0; |
| 1523 | if (state->packlen < 1 + 4 || |
| 1524 | state->packlen > PACKET_MAX_SIZE) { |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1525 | #ifdef PACKET_DEBUG |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1526 | sshbuf_dump(state->input, stderr); |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1527 | #endif |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1528 | logit("Bad packet length %u.", state->packlen); |
| 1529 | if ((r = sshpkt_disconnect(ssh, "Packet corrupt")) != 0) |
| 1530 | return r; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1531 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1532 | sshbuf_reset(state->incoming_packet); |
| 1533 | } else if (state->packlen == 0) { |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1534 | /* |
| 1535 | * check if input size is less than the cipher block size, |
| 1536 | * decrypt first block and extract length of incoming packet |
| 1537 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1538 | if (sshbuf_len(state->input) < block_size) |
| 1539 | return 0; |
| 1540 | sshbuf_reset(state->incoming_packet); |
| 1541 | if ((r = sshbuf_reserve(state->incoming_packet, block_size, |
| 1542 | &cp)) != 0) |
| 1543 | goto out; |
| 1544 | if ((r = cipher_crypt(&state->receive_context, |
| 1545 | state->p_send.seqnr, cp, sshbuf_ptr(state->input), |
| 1546 | block_size, 0, 0)) != 0) |
| 1547 | goto out; |
| 1548 | state->packlen = PEEK_U32(sshbuf_ptr(state->incoming_packet)); |
| 1549 | if (state->packlen < 1 + 4 || |
| 1550 | state->packlen > PACKET_MAX_SIZE) { |
Darren Tucker | a8151da | 2003-09-22 21:06:46 +1000 | [diff] [blame] | 1551 | #ifdef PACKET_DEBUG |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1552 | fprintf(stderr, "input: \n"); |
| 1553 | sshbuf_dump(state->input, stderr); |
| 1554 | fprintf(stderr, "incoming_packet: \n"); |
| 1555 | sshbuf_dump(state->incoming_packet, stderr); |
Darren Tucker | a8151da | 2003-09-22 21:06:46 +1000 | [diff] [blame] | 1556 | #endif |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1557 | logit("Bad packet length %u.", state->packlen); |
| 1558 | return ssh_packet_start_discard(ssh, enc, mac, |
| 1559 | state->packlen, PACKET_MAX_SIZE); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1560 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1561 | if ((r = sshbuf_consume(state->input, block_size)) != 0) |
| 1562 | goto out; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1563 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1564 | DBG(debug("input: packet len %u", state->packlen+4)); |
| 1565 | |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1566 | if (aadlen) { |
| 1567 | /* only the payload is encrypted */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1568 | need = state->packlen; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1569 | } else { |
| 1570 | /* |
| 1571 | * the payload size and the payload are encrypted, but we |
| 1572 | * have a partial packet of block_size bytes |
| 1573 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1574 | need = 4 + state->packlen - block_size; |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1575 | } |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 1576 | DBG(debug("partial packet: block %d, need %d, maclen %d, authlen %d," |
| 1577 | " aadlen %d", block_size, need, maclen, authlen, aadlen)); |
Darren Tucker | 99d11a3 | 2008-12-01 21:40:48 +1100 | [diff] [blame] | 1578 | if (need % block_size != 0) { |
| 1579 | logit("padding error: need %d block %d mod %d", |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1580 | need, block_size, need % block_size); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1581 | return ssh_packet_start_discard(ssh, enc, mac, |
| 1582 | state->packlen, PACKET_MAX_SIZE - block_size); |
Darren Tucker | 99d11a3 | 2008-12-01 21:40:48 +1100 | [diff] [blame] | 1583 | } |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1584 | /* |
| 1585 | * check if the entire packet has been received and |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1586 | * decrypt into incoming_packet: |
| 1587 | * 'aadlen' bytes are unencrypted, but authenticated. |
Damien Miller | 1d75abf | 2013-01-09 16:12:19 +1100 | [diff] [blame] | 1588 | * 'need' bytes are encrypted, followed by either |
| 1589 | * 'authlen' bytes of authentication tag or |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1590 | * 'maclen' bytes of message authentication code. |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1591 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1592 | if (sshbuf_len(state->input) < aadlen + need + authlen + maclen) |
| 1593 | return 0; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1594 | #ifdef PACKET_DEBUG |
| 1595 | fprintf(stderr, "read_poll enc/full: "); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1596 | sshbuf_dump(state->input, stderr); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1597 | #endif |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1598 | /* EtM: compute mac over encrypted input */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1599 | if (mac && mac->enabled && mac->etm) { |
| 1600 | if ((r = mac_compute(mac, state->p_read.seqnr, |
| 1601 | sshbuf_ptr(state->input), aadlen + need, |
markus@openbsd.org | 128343b | 2015-01-13 19:31:40 +0000 | [diff] [blame] | 1602 | macbuf, sizeof(macbuf))) != 0) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1603 | goto out; |
| 1604 | } |
| 1605 | if ((r = sshbuf_reserve(state->incoming_packet, aadlen + need, |
| 1606 | &cp)) != 0) |
| 1607 | goto out; |
| 1608 | if ((r = cipher_crypt(&state->receive_context, state->p_read.seqnr, cp, |
| 1609 | sshbuf_ptr(state->input), need, aadlen, authlen)) != 0) |
| 1610 | goto out; |
| 1611 | if ((r = sshbuf_consume(state->input, aadlen + need + authlen)) != 0) |
| 1612 | goto out; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1613 | /* |
| 1614 | * compute MAC over seqnr and packet, |
| 1615 | * increment sequence number for incoming packet |
| 1616 | */ |
Damien Miller | 4af5130 | 2000-04-16 11:18:38 +1000 | [diff] [blame] | 1617 | if (mac && mac->enabled) { |
Damien Miller | af43a7a | 2012-12-12 10:46:31 +1100 | [diff] [blame] | 1618 | if (!mac->etm) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1619 | if ((r = mac_compute(mac, state->p_read.seqnr, |
| 1620 | sshbuf_ptr(state->incoming_packet), |
| 1621 | sshbuf_len(state->incoming_packet), |
markus@openbsd.org | 128343b | 2015-01-13 19:31:40 +0000 | [diff] [blame] | 1622 | macbuf, sizeof(macbuf))) != 0) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1623 | goto out; |
| 1624 | if (timingsafe_bcmp(macbuf, sshbuf_ptr(state->input), |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1625 | mac->mac_len) != 0) { |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 1626 | logit("Corrupted MAC on input."); |
| 1627 | if (need > PACKET_MAX_SIZE) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1628 | return SSH_ERR_INTERNAL_ERROR; |
| 1629 | return ssh_packet_start_discard(ssh, enc, mac, |
| 1630 | state->packlen, PACKET_MAX_SIZE - need); |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 1631 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1632 | |
| 1633 | DBG(debug("MAC #%d ok", state->p_read.seqnr)); |
| 1634 | if ((r = sshbuf_consume(state->input, mac->mac_len)) != 0) |
| 1635 | goto out; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1636 | } |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 1637 | /* XXX now it's safe to use fatal/packet_disconnect */ |
Damien Miller | 278f907 | 2001-12-21 15:00:19 +1100 | [diff] [blame] | 1638 | if (seqnr_p != NULL) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1639 | *seqnr_p = state->p_read.seqnr; |
| 1640 | if (++state->p_read.seqnr == 0) |
Damien Miller | 996acd2 | 2003-04-09 20:59:48 +1000 | [diff] [blame] | 1641 | logit("incoming seqnr wraps around"); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1642 | if (++state->p_read.packets == 0) |
| 1643 | if (!(ssh->compat & SSH_BUG_NOREKEY)) |
| 1644 | return SSH_ERR_NEED_REKEY; |
| 1645 | state->p_read.blocks += (state->packlen + 4) / block_size; |
| 1646 | state->p_read.bytes += state->packlen + 4; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1647 | |
| 1648 | /* get padlen */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1649 | padlen = sshbuf_ptr(state->incoming_packet)[4]; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1650 | DBG(debug("input: padlen %d", padlen)); |
| 1651 | if (padlen < 4) |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1652 | ssh_packet_disconnect(ssh, |
| 1653 | "Corrupted padlen %d on input.", padlen); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1654 | |
| 1655 | /* skip packet size + padlen, discard padding */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1656 | if ((r = sshbuf_consume(state->incoming_packet, 4 + 1)) != 0 || |
| 1657 | ((r = sshbuf_consume_end(state->incoming_packet, padlen)) != 0)) |
| 1658 | goto out; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1659 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1660 | DBG(debug("input: len before de-compress %zd", |
| 1661 | sshbuf_len(state->incoming_packet))); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1662 | if (comp && comp->enabled) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1663 | sshbuf_reset(state->compression_buffer); |
| 1664 | if ((r = uncompress_buffer(ssh, state->incoming_packet, |
| 1665 | state->compression_buffer)) != 0) |
| 1666 | goto out; |
| 1667 | sshbuf_reset(state->incoming_packet); |
| 1668 | if ((r = sshbuf_putb(state->incoming_packet, |
| 1669 | state->compression_buffer)) != 0) |
| 1670 | goto out; |
| 1671 | DBG(debug("input: len after de-compress %zd", |
| 1672 | sshbuf_len(state->incoming_packet))); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1673 | } |
| 1674 | /* |
| 1675 | * get packet type, implies consume. |
| 1676 | * return length of payload (without type field) |
| 1677 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1678 | if ((r = sshbuf_get_u8(state->incoming_packet, typep)) != 0) |
| 1679 | goto out; |
| 1680 | if (*typep < SSH2_MSG_MIN || *typep >= SSH2_MSG_LOCAL_MIN) |
| 1681 | ssh_packet_disconnect(ssh, |
| 1682 | "Invalid ssh2 packet type: %d", *typep); |
| 1683 | if (*typep == SSH2_MSG_NEWKEYS) |
| 1684 | r = ssh_set_newkeys(ssh, MODE_IN); |
| 1685 | else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) |
| 1686 | r = ssh_packet_enable_delayed_compress(ssh); |
| 1687 | else |
| 1688 | r = 0; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1689 | #ifdef PACKET_DEBUG |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1690 | fprintf(stderr, "read/plain[%d]:\r\n", *typep); |
| 1691 | sshbuf_dump(state->incoming_packet, stderr); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1692 | #endif |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1693 | /* reset for next packet */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1694 | state->packlen = 0; |
| 1695 | out: |
| 1696 | return r; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1697 | } |
| 1698 | |
| 1699 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1700 | ssh_packet_read_poll_seqnr(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1701 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1702 | struct session_state *state = ssh->state; |
Ben Lindstrom | 3f58474 | 2002-06-23 21:49:25 +0000 | [diff] [blame] | 1703 | u_int reason, seqnr; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1704 | int r; |
| 1705 | u_char *msg; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1706 | |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1707 | for (;;) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1708 | msg = NULL; |
Ben Lindstrom | 80c6d77 | 2001-06-05 21:09:18 +0000 | [diff] [blame] | 1709 | if (compat20) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1710 | r = ssh_packet_read_poll2(ssh, typep, seqnr_p); |
| 1711 | if (r != 0) |
| 1712 | return r; |
| 1713 | if (*typep) { |
| 1714 | state->keep_alive_timeouts = 0; |
| 1715 | DBG(debug("received packet type %d", *typep)); |
Darren Tucker | 136e56f | 2008-06-08 12:49:30 +1000 | [diff] [blame] | 1716 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1717 | switch (*typep) { |
Damien Miller | 5ed3d57 | 2008-02-10 22:27:47 +1100 | [diff] [blame] | 1718 | case SSH2_MSG_IGNORE: |
Damien Miller | 58226f6 | 2008-03-07 18:33:30 +1100 | [diff] [blame] | 1719 | debug3("Received SSH2_MSG_IGNORE"); |
Damien Miller | 5ed3d57 | 2008-02-10 22:27:47 +1100 | [diff] [blame] | 1720 | break; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1721 | case SSH2_MSG_DEBUG: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1722 | if ((r = sshpkt_get_u8(ssh, NULL)) != 0 || |
| 1723 | (r = sshpkt_get_string(ssh, &msg, NULL)) != 0 || |
| 1724 | (r = sshpkt_get_string(ssh, NULL, NULL)) != 0) { |
| 1725 | if (msg) |
| 1726 | free(msg); |
| 1727 | return r; |
| 1728 | } |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1729 | debug("Remote: %.900s", msg); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 1730 | free(msg); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1731 | break; |
| 1732 | case SSH2_MSG_DISCONNECT: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1733 | if ((r = sshpkt_get_u32(ssh, &reason)) != 0 || |
| 1734 | (r = sshpkt_get_string(ssh, &msg, NULL)) != 0) |
| 1735 | return r; |
Damien Miller | d5edefd | 2013-04-23 15:21:39 +1000 | [diff] [blame] | 1736 | /* Ignore normal client exit notifications */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1737 | do_log2(ssh->state->server_side && |
Damien Miller | d5edefd | 2013-04-23 15:21:39 +1000 | [diff] [blame] | 1738 | reason == SSH2_DISCONNECT_BY_APPLICATION ? |
| 1739 | SYSLOG_LEVEL_INFO : SYSLOG_LEVEL_ERROR, |
| 1740 | "Received disconnect from %s: %u: %.400s", |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1741 | ssh_remote_ipaddr(ssh), reason, msg); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 1742 | free(msg); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1743 | return SSH_ERR_DISCONNECTED; |
Damien Miller | 659811f | 2002-01-22 23:23:11 +1100 | [diff] [blame] | 1744 | case SSH2_MSG_UNIMPLEMENTED: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1745 | if ((r = sshpkt_get_u32(ssh, &seqnr)) != 0) |
| 1746 | return r; |
Ben Lindstrom | 3f58474 | 2002-06-23 21:49:25 +0000 | [diff] [blame] | 1747 | debug("Received SSH2_MSG_UNIMPLEMENTED for %u", |
| 1748 | seqnr); |
Damien Miller | 5ed3d57 | 2008-02-10 22:27:47 +1100 | [diff] [blame] | 1749 | break; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1750 | default: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1751 | return 0; |
Kevin Steves | ef4eea9 | 2001-02-05 12:42:17 +0000 | [diff] [blame] | 1752 | } |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1753 | } else { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1754 | r = ssh_packet_read_poll1(ssh, typep); |
| 1755 | switch (*typep) { |
Damien Miller | ce98654 | 2013-07-18 16:12:44 +1000 | [diff] [blame] | 1756 | case SSH_MSG_NONE: |
| 1757 | return SSH_MSG_NONE; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1758 | case SSH_MSG_IGNORE: |
| 1759 | break; |
| 1760 | case SSH_MSG_DEBUG: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1761 | if ((r = sshpkt_get_string(ssh, &msg, NULL)) != 0) |
| 1762 | return r; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1763 | debug("Remote: %.900s", msg); |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 1764 | free(msg); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1765 | break; |
| 1766 | case SSH_MSG_DISCONNECT: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1767 | if ((r = sshpkt_get_string(ssh, &msg, NULL)) != 0) |
| 1768 | return r; |
Damien Miller | 894926e | 2013-02-12 11:03:58 +1100 | [diff] [blame] | 1769 | error("Received disconnect from %s: %.400s", |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1770 | ssh_remote_ipaddr(ssh), msg); |
| 1771 | free(msg); |
| 1772 | return SSH_ERR_DISCONNECTED; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1773 | default: |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1774 | DBG(debug("received packet type %d", *typep)); |
| 1775 | return 0; |
Kevin Steves | ef4eea9 | 2001-02-05 12:42:17 +0000 | [diff] [blame] | 1776 | } |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1777 | } |
| 1778 | } |
| 1779 | } |
| 1780 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1781 | /* |
| 1782 | * Buffers the given amount of input characters. This is intended to be used |
| 1783 | * together with packet_read_poll. |
| 1784 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1785 | |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1786 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1787 | ssh_packet_process_incoming(struct ssh *ssh, const char *buf, u_int len) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1788 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1789 | struct session_state *state = ssh->state; |
| 1790 | int r; |
| 1791 | |
| 1792 | if (state->packet_discard) { |
| 1793 | state->keep_alive_timeouts = 0; /* ?? */ |
| 1794 | if (len >= state->packet_discard) { |
| 1795 | if ((r = ssh_packet_stop_discard(ssh)) != 0) |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1796 | return r; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1797 | } |
| 1798 | state->packet_discard -= len; |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1799 | return 0; |
Damien Miller | 13ae44c | 2009-01-28 16:38:41 +1100 | [diff] [blame] | 1800 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1801 | if ((r = sshbuf_put(ssh->state->input, buf, len)) != 0) |
djm@openbsd.org | fae7bbe | 2015-01-28 21:15:47 +0000 | [diff] [blame^] | 1802 | return r; |
| 1803 | |
| 1804 | return 0; |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1805 | } |
| 1806 | |
Damien Miller | 4af5130 | 2000-04-16 11:18:38 +1000 | [diff] [blame] | 1807 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1808 | ssh_packet_remaining(struct ssh *ssh) |
Damien Miller | 4af5130 | 2000-04-16 11:18:38 +1000 | [diff] [blame] | 1809 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1810 | return sshbuf_len(ssh->state->incoming_packet); |
Damien Miller | da108ec | 2010-08-31 22:36:39 +1000 | [diff] [blame] | 1811 | } |
| 1812 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1813 | /* |
| 1814 | * Sends a diagnostic message from the server to the client. This message |
| 1815 | * can be sent at any time (but not while constructing another message). The |
| 1816 | * message is printed immediately, but only if the client is being executed |
| 1817 | * in verbose mode. These messages are primarily intended to ease debugging |
| 1818 | * authentication problems. The length of the formatted message must not |
| 1819 | * exceed 1024 bytes. This will automatically call packet_write_wait. |
| 1820 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1821 | |
| 1822 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1823 | ssh_packet_send_debug(struct ssh *ssh, const char *fmt,...) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1824 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1825 | char buf[1024]; |
| 1826 | va_list args; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1827 | int r; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1828 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1829 | if (compat20 && (ssh->compat & SSH_BUG_DEBUG)) |
Ben Lindstrom | a14ee47 | 2000-12-07 01:24:58 +0000 | [diff] [blame] | 1830 | return; |
| 1831 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1832 | va_start(args, fmt); |
| 1833 | vsnprintf(buf, sizeof(buf), fmt, args); |
| 1834 | va_end(args); |
| 1835 | |
Damien Miller | 7c8af4f | 2000-05-01 08:24:07 +1000 | [diff] [blame] | 1836 | if (compat20) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1837 | if ((r = sshpkt_start(ssh, SSH2_MSG_DEBUG)) != 0 || |
| 1838 | (r = sshpkt_put_u8(ssh, 0)) != 0 || /* always display */ |
| 1839 | (r = sshpkt_put_cstring(ssh, buf)) != 0 || |
| 1840 | (r = sshpkt_put_cstring(ssh, "")) != 0 || |
| 1841 | (r = sshpkt_send(ssh)) != 0) |
| 1842 | fatal("%s: %s", __func__, ssh_err(r)); |
Damien Miller | 7c8af4f | 2000-05-01 08:24:07 +1000 | [diff] [blame] | 1843 | } else { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1844 | if ((r = sshpkt_start(ssh, SSH_MSG_DEBUG)) != 0 || |
| 1845 | (r = sshpkt_put_cstring(ssh, buf)) != 0 || |
| 1846 | (r = sshpkt_send(ssh)) != 0) |
| 1847 | fatal("%s: %s", __func__, ssh_err(r)); |
Damien Miller | 7c8af4f | 2000-05-01 08:24:07 +1000 | [diff] [blame] | 1848 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1849 | ssh_packet_write_wait(ssh); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1850 | } |
| 1851 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1852 | /* |
| 1853 | * Logs the error plus constructs and sends a disconnect packet, closes the |
| 1854 | * connection, and exits. This function never returns. The error message |
| 1855 | * should not contain a newline. The length of the formatted message must |
| 1856 | * not exceed 1024 bytes. |
| 1857 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1858 | |
| 1859 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1860 | ssh_packet_disconnect(struct ssh *ssh, const char *fmt,...) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1861 | { |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1862 | char buf[1024]; |
| 1863 | va_list args; |
| 1864 | static int disconnecting = 0; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1865 | int r; |
Ben Lindstrom | 8b2eecd | 2002-07-07 22:11:51 +0000 | [diff] [blame] | 1866 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1867 | if (disconnecting) /* Guard against recursive invocations. */ |
| 1868 | fatal("packet_disconnect called recursively."); |
| 1869 | disconnecting = 1; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1870 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1871 | /* |
| 1872 | * Format the message. Note that the caller must make sure the |
| 1873 | * message is of limited size. |
| 1874 | */ |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1875 | va_start(args, fmt); |
| 1876 | vsnprintf(buf, sizeof(buf), fmt, args); |
| 1877 | va_end(args); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1878 | |
Ben Lindstrom | 9bda7ae | 2002-11-09 15:46:24 +0000 | [diff] [blame] | 1879 | /* Display the error locally */ |
Damien Miller | 996acd2 | 2003-04-09 20:59:48 +1000 | [diff] [blame] | 1880 | logit("Disconnecting: %.100s", buf); |
Ben Lindstrom | 9bda7ae | 2002-11-09 15:46:24 +0000 | [diff] [blame] | 1881 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1882 | /* Send the disconnect message to the other side, and wait for it to get sent. */ |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1883 | if (compat20) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1884 | if ((r = sshpkt_start(ssh, SSH2_MSG_DISCONNECT)) != 0 || |
| 1885 | (r = sshpkt_put_u32(ssh, SSH2_DISCONNECT_PROTOCOL_ERROR)) != 0 || |
| 1886 | (r = sshpkt_put_cstring(ssh, buf)) != 0 || |
| 1887 | (r = sshpkt_put_cstring(ssh, "")) != 0 || |
| 1888 | (r = sshpkt_send(ssh)) != 0) |
| 1889 | fatal("%s: %s", __func__, ssh_err(r)); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1890 | } else { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1891 | if ((r = sshpkt_start(ssh, SSH_MSG_DISCONNECT)) != 0 || |
| 1892 | (r = sshpkt_put_cstring(ssh, buf)) != 0 || |
| 1893 | (r = sshpkt_send(ssh)) != 0) |
| 1894 | fatal("%s: %s", __func__, ssh_err(r)); |
Damien Miller | 33b1356 | 2000-04-04 14:38:59 +1000 | [diff] [blame] | 1895 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1896 | ssh_packet_write_wait(ssh); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1897 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1898 | /* Close the connection. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1899 | ssh_packet_close(ssh); |
Darren Tucker | 3e33cec | 2003-10-02 16:12:36 +1000 | [diff] [blame] | 1900 | cleanup_exit(255); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1901 | } |
| 1902 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1903 | /* Checks if there is any buffered output, and tries to write some of the output. */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1904 | |
| 1905 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1906 | ssh_packet_write_poll(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1907 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1908 | struct session_state *state = ssh->state; |
| 1909 | int len = sshbuf_len(state->output); |
| 1910 | int cont, r; |
Ben Lindstrom | 8b2eecd | 2002-07-07 22:11:51 +0000 | [diff] [blame] | 1911 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1912 | if (len > 0) { |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 1913 | cont = 0; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1914 | len = roaming_write(state->connection_out, |
| 1915 | sshbuf_ptr(state->output), len, &cont); |
Damien Miller | d874fa5 | 2008-07-05 09:40:56 +1000 | [diff] [blame] | 1916 | if (len == -1) { |
Damien Miller | ea43742 | 2009-10-02 11:49:03 +1000 | [diff] [blame] | 1917 | if (errno == EINTR || errno == EAGAIN || |
| 1918 | errno == EWOULDBLOCK) |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1919 | return; |
Damien Miller | d874fa5 | 2008-07-05 09:40:56 +1000 | [diff] [blame] | 1920 | fatal("Write failed: %.100s", strerror(errno)); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1921 | } |
Darren Tucker | c5564e1 | 2009-06-21 18:53:53 +1000 | [diff] [blame] | 1922 | if (len == 0 && !cont) |
Damien Miller | d874fa5 | 2008-07-05 09:40:56 +1000 | [diff] [blame] | 1923 | fatal("Write connection closed"); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1924 | if ((r = sshbuf_consume(state->output, len)) != 0) |
| 1925 | fatal("%s: %s", __func__, ssh_err(r)); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1926 | } |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1927 | } |
| 1928 | |
Damien Miller | 5428f64 | 1999-11-25 11:54:57 +1100 | [diff] [blame] | 1929 | /* |
| 1930 | * Calls packet_write_poll repeatedly until all pending output data has been |
| 1931 | * written. |
| 1932 | */ |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1933 | |
| 1934 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1935 | ssh_packet_write_wait(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1936 | { |
Ben Lindstrom | cb978aa | 2001-03-05 07:07:49 +0000 | [diff] [blame] | 1937 | fd_set *setp; |
Damien Miller | ce98654 | 2013-07-18 16:12:44 +1000 | [diff] [blame] | 1938 | int ret, ms_remain = 0; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1939 | struct timeval start, timeout, *timeoutp = NULL; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1940 | struct session_state *state = ssh->state; |
Ben Lindstrom | cb978aa | 2001-03-05 07:07:49 +0000 | [diff] [blame] | 1941 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1942 | setp = (fd_set *)calloc(howmany(state->connection_out + 1, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1943 | NFDBITS), sizeof(fd_mask)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1944 | if (setp == NULL) |
| 1945 | fatal("%s: calloc failed", __func__); |
| 1946 | ssh_packet_write_poll(ssh); |
| 1947 | while (ssh_packet_have_data_to_write(ssh)) { |
| 1948 | memset(setp, 0, howmany(state->connection_out + 1, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1949 | NFDBITS) * sizeof(fd_mask)); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1950 | FD_SET(state->connection_out, setp); |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1951 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1952 | if (state->packet_timeout_ms > 0) { |
| 1953 | ms_remain = state->packet_timeout_ms; |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1954 | timeoutp = &timeout; |
| 1955 | } |
| 1956 | for (;;) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1957 | if (state->packet_timeout_ms != -1) { |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1958 | ms_to_timeval(&timeout, ms_remain); |
| 1959 | gettimeofday(&start, NULL); |
| 1960 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1961 | if ((ret = select(state->connection_out + 1, |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 1962 | NULL, setp, NULL, timeoutp)) >= 0) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1963 | break; |
Damien Miller | ea43742 | 2009-10-02 11:49:03 +1000 | [diff] [blame] | 1964 | if (errno != EAGAIN && errno != EINTR && |
| 1965 | errno != EWOULDBLOCK) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1966 | break; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1967 | if (state->packet_timeout_ms == -1) |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1968 | continue; |
| 1969 | ms_subtract_diff(&start, &ms_remain); |
| 1970 | if (ms_remain <= 0) { |
| 1971 | ret = 0; |
| 1972 | break; |
| 1973 | } |
| 1974 | } |
| 1975 | if (ret == 0) { |
| 1976 | logit("Connection to %.200s timed out while " |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1977 | "waiting to write", ssh_remote_ipaddr(ssh)); |
Darren Tucker | 3fc464e | 2008-06-13 06:42:45 +1000 | [diff] [blame] | 1978 | cleanup_exit(255); |
| 1979 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1980 | ssh_packet_write_poll(ssh); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 1981 | } |
Darren Tucker | a627d42 | 2013-06-02 07:31:17 +1000 | [diff] [blame] | 1982 | free(setp); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1983 | } |
| 1984 | |
| 1985 | /* Returns true if there is buffered data to write to the connection. */ |
| 1986 | |
| 1987 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1988 | ssh_packet_have_data_to_write(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1989 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1990 | return sshbuf_len(ssh->state->output) != 0; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1991 | } |
| 1992 | |
| 1993 | /* Returns true if there is not too much data to write to the connection. */ |
| 1994 | |
| 1995 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1996 | ssh_packet_not_very_much_data_to_write(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 1997 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 1998 | if (ssh->state->interactive_mode) |
| 1999 | return sshbuf_len(ssh->state->output) < 16384; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 2000 | else |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2001 | return sshbuf_len(ssh->state->output) < 128 * 1024; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2002 | } |
| 2003 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2004 | void |
| 2005 | ssh_packet_set_tos(struct ssh *ssh, int tos) |
Ben Lindstrom | a743398 | 2002-12-23 02:41:41 +0000 | [diff] [blame] | 2006 | { |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 2007 | #ifndef IP_TOS_IS_BROKEN |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2008 | if (!ssh_packet_connection_is_on_socket(ssh)) |
Ben Lindstrom | a743398 | 2002-12-23 02:41:41 +0000 | [diff] [blame] | 2009 | return; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2010 | switch (ssh_packet_connection_af(ssh)) { |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 2011 | # ifdef IP_TOS |
| 2012 | case AF_INET: |
| 2013 | debug3("%s: set IP_TOS 0x%02x", __func__, tos); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2014 | if (setsockopt(ssh->state->connection_in, |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 2015 | IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) |
| 2016 | error("setsockopt IP_TOS %d: %.100s:", |
| 2017 | tos, strerror(errno)); |
| 2018 | break; |
| 2019 | # endif /* IP_TOS */ |
| 2020 | # ifdef IPV6_TCLASS |
| 2021 | case AF_INET6: |
| 2022 | debug3("%s: set IPV6_TCLASS 0x%02x", __func__, tos); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2023 | if (setsockopt(ssh->state->connection_in, |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 2024 | IPPROTO_IPV6, IPV6_TCLASS, &tos, sizeof(tos)) < 0) |
| 2025 | error("setsockopt IPV6_TCLASS %d: %.100s:", |
| 2026 | tos, strerror(errno)); |
| 2027 | break; |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 2028 | # endif /* IPV6_TCLASS */ |
Damien Miller | 23f425b | 2011-05-15 08:58:15 +1000 | [diff] [blame] | 2029 | } |
Damien Miller | d2ac5d7 | 2011-05-15 08:43:13 +1000 | [diff] [blame] | 2030 | #endif /* IP_TOS_IS_BROKEN */ |
Damien Miller | 5924ceb | 2003-11-22 15:02:42 +1100 | [diff] [blame] | 2031 | } |
Ben Lindstrom | a743398 | 2002-12-23 02:41:41 +0000 | [diff] [blame] | 2032 | |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2033 | /* Informs that the current session is interactive. Sets IP flags for that. */ |
| 2034 | |
| 2035 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2036 | ssh_packet_set_interactive(struct ssh *ssh, int interactive, int qos_interactive, int qos_bulk) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2037 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2038 | struct session_state *state = ssh->state; |
| 2039 | |
| 2040 | if (state->set_interactive_called) |
Ben Lindstrom | bf555ba | 2001-01-18 02:04:35 +0000 | [diff] [blame] | 2041 | return; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2042 | state->set_interactive_called = 1; |
Ben Lindstrom | bf555ba | 2001-01-18 02:04:35 +0000 | [diff] [blame] | 2043 | |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 2044 | /* Record that we are in interactive mode. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2045 | state->interactive_mode = interactive; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2046 | |
Damien Miller | 34132e5 | 2000-01-14 15:45:46 +1100 | [diff] [blame] | 2047 | /* Only set socket options if using a socket. */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2048 | if (!ssh_packet_connection_is_on_socket(ssh)) |
Ben Lindstrom | 93b6b77 | 2003-04-27 17:55:33 +0000 | [diff] [blame] | 2049 | return; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2050 | set_nodelay(state->connection_in); |
| 2051 | ssh_packet_set_tos(ssh, interactive ? qos_interactive : |
| 2052 | qos_bulk); |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2053 | } |
| 2054 | |
| 2055 | /* Returns true if the current connection is interactive. */ |
| 2056 | |
| 2057 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2058 | ssh_packet_is_interactive(struct ssh *ssh) |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2059 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2060 | return ssh->state->interactive_mode; |
Damien Miller | d4a8b7e | 1999-10-27 13:42:43 +1000 | [diff] [blame] | 2061 | } |
Damien Miller | 6162d12 | 1999-11-21 13:23:52 +1100 | [diff] [blame] | 2062 | |
Darren Tucker | 1f8311c | 2004-05-13 16:39:33 +1000 | [diff] [blame] | 2063 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2064 | ssh_packet_set_maxsize(struct ssh *ssh, u_int s) |
Damien Miller | 6162d12 | 1999-11-21 13:23:52 +1100 | [diff] [blame] | 2065 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2066 | struct session_state *state = ssh->state; |
| 2067 | |
| 2068 | if (state->set_maxsize_called) { |
Damien Miller | 996acd2 | 2003-04-09 20:59:48 +1000 | [diff] [blame] | 2069 | logit("packet_set_maxsize: called twice: old %d new %d", |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2070 | state->max_packet_size, s); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 2071 | return -1; |
| 2072 | } |
| 2073 | if (s < 4 * 1024 || s > 1024 * 1024) { |
Damien Miller | 996acd2 | 2003-04-09 20:59:48 +1000 | [diff] [blame] | 2074 | logit("packet_set_maxsize: bad size %d", s); |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 2075 | return -1; |
| 2076 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2077 | state->set_maxsize_called = 1; |
Ben Lindstrom | 16d45b3 | 2001-06-13 04:39:18 +0000 | [diff] [blame] | 2078 | debug("packet_set_maxsize: setting to %d", s); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2079 | state->max_packet_size = s; |
Damien Miller | 95def09 | 1999-11-25 00:26:21 +1100 | [diff] [blame] | 2080 | return s; |
Damien Miller | 6162d12 | 1999-11-21 13:23:52 +1100 | [diff] [blame] | 2081 | } |
Ben Lindstrom | 5699c5f | 2001-03-05 06:17:49 +0000 | [diff] [blame] | 2082 | |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2083 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2084 | ssh_packet_inc_alive_timeouts(struct ssh *ssh) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2085 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2086 | return ++ssh->state->keep_alive_timeouts; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2087 | } |
| 2088 | |
| 2089 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2090 | ssh_packet_set_alive_timeouts(struct ssh *ssh, int ka) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2091 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2092 | ssh->state->keep_alive_timeouts = ka; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2093 | } |
| 2094 | |
| 2095 | u_int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2096 | ssh_packet_get_maxsize(struct ssh *ssh) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2097 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2098 | return ssh->state->max_packet_size; |
Damien Miller | 9f64390 | 2001-11-12 11:02:52 +1100 | [diff] [blame] | 2099 | } |
| 2100 | |
Ben Lindstrom | 5699c5f | 2001-03-05 06:17:49 +0000 | [diff] [blame] | 2101 | /* |
| 2102 | * 9.2. Ignored Data Message |
Ben Lindstrom | a370005 | 2001-04-05 23:26:32 +0000 | [diff] [blame] | 2103 | * |
Ben Lindstrom | 5699c5f | 2001-03-05 06:17:49 +0000 | [diff] [blame] | 2104 | * byte SSH_MSG_IGNORE |
| 2105 | * string data |
Ben Lindstrom | a370005 | 2001-04-05 23:26:32 +0000 | [diff] [blame] | 2106 | * |
Ben Lindstrom | 5699c5f | 2001-03-05 06:17:49 +0000 | [diff] [blame] | 2107 | * All implementations MUST understand (and ignore) this message at any |
| 2108 | * time (after receiving the protocol version). No implementation is |
| 2109 | * required to send them. This message can be used as an additional |
| 2110 | * protection measure against advanced traffic analysis techniques. |
| 2111 | */ |
Ben Lindstrom | e229b25 | 2001-03-05 06:28:06 +0000 | [diff] [blame] | 2112 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2113 | ssh_packet_send_ignore(struct ssh *ssh, int nbytes) |
Ben Lindstrom | e229b25 | 2001-03-05 06:28:06 +0000 | [diff] [blame] | 2114 | { |
Darren Tucker | 3f9fdc7 | 2004-06-22 12:56:01 +1000 | [diff] [blame] | 2115 | u_int32_t rnd = 0; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2116 | int r, i; |
Ben Lindstrom | e229b25 | 2001-03-05 06:28:06 +0000 | [diff] [blame] | 2117 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2118 | if ((r = sshpkt_start(ssh, compat20 ? |
| 2119 | SSH2_MSG_IGNORE : SSH_MSG_IGNORE)) != 0 || |
| 2120 | (r = sshpkt_put_u32(ssh, nbytes)) != 0) |
| 2121 | fatal("%s: %s", __func__, ssh_err(r)); |
Damien Miller | 9f0f5c6 | 2001-12-21 14:45:46 +1100 | [diff] [blame] | 2122 | for (i = 0; i < nbytes; i++) { |
Ben Lindstrom | 5699c5f | 2001-03-05 06:17:49 +0000 | [diff] [blame] | 2123 | if (i % 4 == 0) |
Darren Tucker | 3f9fdc7 | 2004-06-22 12:56:01 +1000 | [diff] [blame] | 2124 | rnd = arc4random(); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2125 | if ((r = sshpkt_put_u8(ssh, (u_char)rnd & 0xff)) != 0) |
| 2126 | fatal("%s: %s", __func__, ssh_err(r)); |
Darren Tucker | 3f9fdc7 | 2004-06-22 12:56:01 +1000 | [diff] [blame] | 2127 | rnd >>= 8; |
Ben Lindstrom | 5699c5f | 2001-03-05 06:17:49 +0000 | [diff] [blame] | 2128 | } |
| 2129 | } |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2130 | |
Darren Tucker | 1f8311c | 2004-05-13 16:39:33 +1000 | [diff] [blame] | 2131 | #define MAX_PACKETS (1U<<31) |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2132 | int |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2133 | ssh_packet_need_rekeying(struct ssh *ssh) |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2134 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2135 | struct session_state *state = ssh->state; |
| 2136 | |
| 2137 | if (ssh->compat & SSH_BUG_NOREKEY) |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2138 | return 0; |
| 2139 | return |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2140 | (state->p_send.packets > MAX_PACKETS) || |
| 2141 | (state->p_read.packets > MAX_PACKETS) || |
| 2142 | (state->max_blocks_out && |
| 2143 | (state->p_send.blocks > state->max_blocks_out)) || |
| 2144 | (state->max_blocks_in && |
| 2145 | (state->p_read.blocks > state->max_blocks_in)) || |
| 2146 | (state->rekey_interval != 0 && state->rekey_time + |
| 2147 | state->rekey_interval <= monotime()); |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2148 | } |
| 2149 | |
| 2150 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2151 | ssh_packet_set_rekey_limits(struct ssh *ssh, u_int32_t bytes, time_t seconds) |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2152 | { |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 2153 | debug3("rekey after %lld bytes, %d seconds", (long long)bytes, |
| 2154 | (int)seconds); |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2155 | ssh->state->rekey_limit = bytes; |
| 2156 | ssh->state->rekey_interval = seconds; |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 2157 | /* |
| 2158 | * We set the time here so that in post-auth privsep slave we count |
| 2159 | * from the completion of the authentication. |
| 2160 | */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2161 | ssh->state->rekey_time = monotime(); |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 2162 | } |
| 2163 | |
| 2164 | time_t |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2165 | ssh_packet_get_rekey_timeout(struct ssh *ssh) |
Darren Tucker | c53c2af | 2013-05-16 20:28:16 +1000 | [diff] [blame] | 2166 | { |
| 2167 | time_t seconds; |
| 2168 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2169 | seconds = ssh->state->rekey_time + ssh->state->rekey_interval - |
Darren Tucker | b759c9c | 2013-06-02 07:46:16 +1000 | [diff] [blame] | 2170 | monotime(); |
Darren Tucker | 5f96f3b | 2013-05-16 20:29:28 +1000 | [diff] [blame] | 2171 | return (seconds <= 0 ? 1 : seconds); |
Damien Miller | a5539d2 | 2003-04-09 20:50:06 +1000 | [diff] [blame] | 2172 | } |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 2173 | |
| 2174 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2175 | ssh_packet_set_server(struct ssh *ssh) |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 2176 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2177 | ssh->state->server_side = 1; |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 2178 | } |
| 2179 | |
| 2180 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2181 | ssh_packet_set_authenticated(struct ssh *ssh) |
Damien Miller | 9786e6e | 2005-07-26 21:54:56 +1000 | [diff] [blame] | 2182 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2183 | ssh->state->after_authentication = 1; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2184 | } |
| 2185 | |
| 2186 | void * |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2187 | ssh_packet_get_input(struct ssh *ssh) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2188 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2189 | return (void *)ssh->state->input; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2190 | } |
| 2191 | |
| 2192 | void * |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2193 | ssh_packet_get_output(struct ssh *ssh) |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2194 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2195 | return (void *)ssh->state->output; |
Darren Tucker | f7288d7 | 2009-06-21 18:12:20 +1000 | [diff] [blame] | 2196 | } |
| 2197 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2198 | /* XXX TODO update roaming to new API (does not work anyway) */ |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2199 | /* |
| 2200 | * Save the state for the real connection, and use a separate state when |
| 2201 | * resuming a suspended connection. |
| 2202 | */ |
| 2203 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2204 | ssh_packet_backup_state(struct ssh *ssh, |
| 2205 | struct ssh *backup_state) |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2206 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2207 | struct ssh *tmp; |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2208 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2209 | close(ssh->state->connection_in); |
| 2210 | ssh->state->connection_in = -1; |
| 2211 | close(ssh->state->connection_out); |
| 2212 | ssh->state->connection_out = -1; |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2213 | if (backup_state) |
| 2214 | tmp = backup_state; |
| 2215 | else |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2216 | tmp = ssh_alloc_session_state(); |
| 2217 | backup_state = ssh; |
| 2218 | ssh = tmp; |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2219 | } |
| 2220 | |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2221 | /* XXX FIXME FIXME FIXME */ |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2222 | /* |
| 2223 | * Swap in the old state when resuming a connecion. |
| 2224 | */ |
| 2225 | void |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2226 | ssh_packet_restore_state(struct ssh *ssh, |
| 2227 | struct ssh *backup_state) |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2228 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2229 | struct ssh *tmp; |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2230 | u_int len; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2231 | int r; |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2232 | |
| 2233 | tmp = backup_state; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2234 | backup_state = ssh; |
| 2235 | ssh = tmp; |
| 2236 | ssh->state->connection_in = backup_state->state->connection_in; |
| 2237 | backup_state->state->connection_in = -1; |
| 2238 | ssh->state->connection_out = backup_state->state->connection_out; |
| 2239 | backup_state->state->connection_out = -1; |
| 2240 | len = sshbuf_len(backup_state->state->input); |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2241 | if (len > 0) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2242 | if ((r = sshbuf_putb(ssh->state->input, |
| 2243 | backup_state->state->input)) != 0) |
| 2244 | fatal("%s: %s", __func__, ssh_err(r)); |
| 2245 | sshbuf_reset(backup_state->state->input); |
Darren Tucker | e841eb0 | 2009-07-06 07:11:13 +1000 | [diff] [blame] | 2246 | add_recv_bytes(len); |
| 2247 | } |
| 2248 | } |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2249 | |
| 2250 | /* Reset after_authentication and reset compression in post-auth privsep */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2251 | static int |
| 2252 | ssh_packet_set_postauth(struct ssh *ssh) |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2253 | { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2254 | struct sshcomp *comp; |
| 2255 | int r, mode; |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2256 | |
| 2257 | debug("%s: called", __func__); |
| 2258 | /* This was set in net child, but is not visible in user child */ |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2259 | ssh->state->after_authentication = 1; |
| 2260 | ssh->state->rekeying = 0; |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2261 | for (mode = 0; mode < MODE_MAX; mode++) { |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2262 | if (ssh->state->newkeys[mode] == NULL) |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2263 | continue; |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2264 | comp = &ssh->state->newkeys[mode]->comp; |
| 2265 | if (comp && comp->enabled && |
| 2266 | (r = ssh_packet_init_compression(ssh)) != 0) |
| 2267 | return r; |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2268 | } |
markus@openbsd.org | 091c302 | 2015-01-19 19:52:16 +0000 | [diff] [blame] | 2269 | return 0; |
| 2270 | } |
| 2271 | |
| 2272 | /* Packet state (de-)serialization for privsep */ |
| 2273 | |
| 2274 | /* turn kex into a blob for packet state serialization */ |
| 2275 | static int |
| 2276 | kex_to_blob(struct sshbuf *m, struct kex *kex) |
| 2277 | { |
| 2278 | int r; |
| 2279 | |
| 2280 | if ((r = sshbuf_put_string(m, kex->session_id, |
| 2281 | kex->session_id_len)) != 0 || |
| 2282 | (r = sshbuf_put_u32(m, kex->we_need)) != 0 || |
| 2283 | (r = sshbuf_put_u32(m, kex->hostkey_type)) != 0 || |
| 2284 | (r = sshbuf_put_u32(m, kex->kex_type)) != 0 || |
| 2285 | (r = sshbuf_put_stringb(m, kex->my)) != 0 || |
| 2286 | (r = sshbuf_put_stringb(m, kex->peer)) != 0 || |
| 2287 | (r = sshbuf_put_u32(m, kex->flags)) != 0 || |
| 2288 | (r = sshbuf_put_cstring(m, kex->client_version_string)) != 0 || |
| 2289 | (r = sshbuf_put_cstring(m, kex->server_version_string)) != 0) |
| 2290 | return r; |
| 2291 | return 0; |
| 2292 | } |
| 2293 | |
| 2294 | /* turn key exchange results into a blob for packet state serialization */ |
| 2295 | static int |
| 2296 | newkeys_to_blob(struct sshbuf *m, struct ssh *ssh, int mode) |
| 2297 | { |
| 2298 | struct sshbuf *b; |
| 2299 | struct sshcipher_ctx *cc; |
| 2300 | struct sshcomp *comp; |
| 2301 | struct sshenc *enc; |
| 2302 | struct sshmac *mac; |
| 2303 | struct newkeys *newkey; |
| 2304 | int r; |
| 2305 | |
| 2306 | if ((newkey = ssh->state->newkeys[mode]) == NULL) |
| 2307 | return SSH_ERR_INTERNAL_ERROR; |
| 2308 | enc = &newkey->enc; |
| 2309 | mac = &newkey->mac; |
| 2310 | comp = &newkey->comp; |
| 2311 | cc = (mode == MODE_OUT) ? &ssh->state->send_context : |
| 2312 | &ssh->state->receive_context; |
| 2313 | if ((r = cipher_get_keyiv(cc, enc->iv, enc->iv_len)) != 0) |
| 2314 | return r; |
| 2315 | if ((b = sshbuf_new()) == NULL) |
| 2316 | return SSH_ERR_ALLOC_FAIL; |
| 2317 | /* The cipher struct is constant and shared, you export pointer */ |
| 2318 | if ((r = sshbuf_put_cstring(b, enc->name)) != 0 || |
| 2319 | (r = sshbuf_put(b, &enc->cipher, sizeof(enc->cipher))) != 0 || |
| 2320 | (r = sshbuf_put_u32(b, enc->enabled)) != 0 || |
| 2321 | (r = sshbuf_put_u32(b, enc->block_size)) != 0 || |
| 2322 | (r = sshbuf_put_string(b, enc->key, enc->key_len)) != 0 || |
| 2323 | (r = sshbuf_put_string(b, enc->iv, enc->iv_len)) != 0) |
| 2324 | goto out; |
| 2325 | if (cipher_authlen(enc->cipher) == 0) { |
| 2326 | if ((r = sshbuf_put_cstring(b, mac->name)) != 0 || |
| 2327 | (r = sshbuf_put_u32(b, mac->enabled)) != 0 || |
| 2328 | (r = sshbuf_put_string(b, mac->key, mac->key_len)) != 0) |
| 2329 | goto out; |
| 2330 | } |
| 2331 | if ((r = sshbuf_put_u32(b, comp->type)) != 0 || |
| 2332 | (r = sshbuf_put_u32(b, comp->enabled)) != 0 || |
| 2333 | (r = sshbuf_put_cstring(b, comp->name)) != 0) |
| 2334 | goto out; |
| 2335 | r = sshbuf_put_stringb(m, b); |
| 2336 | out: |
| 2337 | if (b != NULL) |
| 2338 | sshbuf_free(b); |
| 2339 | return r; |
| 2340 | } |
| 2341 | |
| 2342 | /* serialize packet state into a blob */ |
| 2343 | int |
| 2344 | ssh_packet_get_state(struct ssh *ssh, struct sshbuf *m) |
| 2345 | { |
| 2346 | struct session_state *state = ssh->state; |
| 2347 | u_char *p; |
| 2348 | size_t slen, rlen; |
| 2349 | int r, ssh1cipher; |
| 2350 | |
| 2351 | if (!compat20) { |
| 2352 | ssh1cipher = cipher_get_number(state->receive_context.cipher); |
| 2353 | slen = cipher_get_keyiv_len(&state->send_context); |
| 2354 | rlen = cipher_get_keyiv_len(&state->receive_context); |
| 2355 | if ((r = sshbuf_put_u32(m, state->remote_protocol_flags)) != 0 || |
| 2356 | (r = sshbuf_put_u32(m, ssh1cipher)) != 0 || |
| 2357 | (r = sshbuf_put_string(m, state->ssh1_key, state->ssh1_keylen)) != 0 || |
| 2358 | (r = sshbuf_put_u32(m, slen)) != 0 || |
| 2359 | (r = sshbuf_reserve(m, slen, &p)) != 0 || |
| 2360 | (r = cipher_get_keyiv(&state->send_context, p, slen)) != 0 || |
| 2361 | (r = sshbuf_put_u32(m, rlen)) != 0 || |
| 2362 | (r = sshbuf_reserve(m, rlen, &p)) != 0 || |
| 2363 | (r = cipher_get_keyiv(&state->receive_context, p, rlen)) != 0) |
| 2364 | return r; |
| 2365 | } else { |
| 2366 | if ((r = kex_to_blob(m, ssh->kex)) != 0 || |
| 2367 | (r = newkeys_to_blob(m, ssh, MODE_OUT)) != 0 || |
| 2368 | (r = newkeys_to_blob(m, ssh, MODE_IN)) != 0 || |
| 2369 | (r = sshbuf_put_u32(m, state->p_send.seqnr)) != 0 || |
| 2370 | (r = sshbuf_put_u64(m, state->p_send.blocks)) != 0 || |
| 2371 | (r = sshbuf_put_u32(m, state->p_send.packets)) != 0 || |
| 2372 | (r = sshbuf_put_u64(m, state->p_send.bytes)) != 0 || |
| 2373 | (r = sshbuf_put_u32(m, state->p_read.seqnr)) != 0 || |
| 2374 | (r = sshbuf_put_u64(m, state->p_read.blocks)) != 0 || |
| 2375 | (r = sshbuf_put_u32(m, state->p_read.packets)) != 0 || |
| 2376 | (r = sshbuf_put_u64(m, state->p_read.bytes)) != 0) |
| 2377 | return r; |
| 2378 | } |
| 2379 | |
| 2380 | slen = cipher_get_keycontext(&state->send_context, NULL); |
| 2381 | rlen = cipher_get_keycontext(&state->receive_context, NULL); |
| 2382 | if ((r = sshbuf_put_u32(m, slen)) != 0 || |
| 2383 | (r = sshbuf_reserve(m, slen, &p)) != 0) |
| 2384 | return r; |
| 2385 | if (cipher_get_keycontext(&state->send_context, p) != (int)slen) |
| 2386 | return SSH_ERR_INTERNAL_ERROR; |
| 2387 | if ((r = sshbuf_put_u32(m, rlen)) != 0 || |
| 2388 | (r = sshbuf_reserve(m, rlen, &p)) != 0) |
| 2389 | return r; |
| 2390 | if (cipher_get_keycontext(&state->receive_context, p) != (int)rlen) |
| 2391 | return SSH_ERR_INTERNAL_ERROR; |
| 2392 | |
| 2393 | if ((r = ssh_packet_get_compress_state(m, ssh)) != 0 || |
| 2394 | (r = sshbuf_put_stringb(m, state->input)) != 0 || |
| 2395 | (r = sshbuf_put_stringb(m, state->output)) != 0) |
| 2396 | return r; |
| 2397 | |
| 2398 | if (compat20) { |
| 2399 | if ((r = sshbuf_put_u64(m, get_sent_bytes())) != 0 || |
| 2400 | (r = sshbuf_put_u64(m, get_recv_bytes())) != 0) |
| 2401 | return r; |
| 2402 | } |
| 2403 | return 0; |
| 2404 | } |
| 2405 | |
| 2406 | /* restore key exchange results from blob for packet state de-serialization */ |
| 2407 | static int |
| 2408 | newkeys_from_blob(struct sshbuf *m, struct ssh *ssh, int mode) |
| 2409 | { |
| 2410 | struct sshbuf *b = NULL; |
| 2411 | struct sshcomp *comp; |
| 2412 | struct sshenc *enc; |
| 2413 | struct sshmac *mac; |
| 2414 | struct newkeys *newkey = NULL; |
| 2415 | size_t keylen, ivlen, maclen; |
| 2416 | int r; |
| 2417 | |
| 2418 | if ((newkey = calloc(1, sizeof(*newkey))) == NULL) { |
| 2419 | r = SSH_ERR_ALLOC_FAIL; |
| 2420 | goto out; |
| 2421 | } |
| 2422 | if ((r = sshbuf_froms(m, &b)) != 0) |
| 2423 | goto out; |
| 2424 | #ifdef DEBUG_PK |
| 2425 | sshbuf_dump(b, stderr); |
| 2426 | #endif |
| 2427 | enc = &newkey->enc; |
| 2428 | mac = &newkey->mac; |
| 2429 | comp = &newkey->comp; |
| 2430 | |
| 2431 | if ((r = sshbuf_get_cstring(b, &enc->name, NULL)) != 0 || |
| 2432 | (r = sshbuf_get(b, &enc->cipher, sizeof(enc->cipher))) != 0 || |
| 2433 | (r = sshbuf_get_u32(b, (u_int *)&enc->enabled)) != 0 || |
| 2434 | (r = sshbuf_get_u32(b, &enc->block_size)) != 0 || |
| 2435 | (r = sshbuf_get_string(b, &enc->key, &keylen)) != 0 || |
| 2436 | (r = sshbuf_get_string(b, &enc->iv, &ivlen)) != 0) |
| 2437 | goto out; |
| 2438 | if (cipher_authlen(enc->cipher) == 0) { |
| 2439 | if ((r = sshbuf_get_cstring(b, &mac->name, NULL)) != 0) |
| 2440 | goto out; |
| 2441 | if ((r = mac_setup(mac, mac->name)) != 0) |
| 2442 | goto out; |
| 2443 | if ((r = sshbuf_get_u32(b, (u_int *)&mac->enabled)) != 0 || |
| 2444 | (r = sshbuf_get_string(b, &mac->key, &maclen)) != 0) |
| 2445 | goto out; |
| 2446 | if (maclen > mac->key_len) { |
| 2447 | r = SSH_ERR_INVALID_FORMAT; |
| 2448 | goto out; |
| 2449 | } |
| 2450 | mac->key_len = maclen; |
| 2451 | } |
| 2452 | if ((r = sshbuf_get_u32(b, &comp->type)) != 0 || |
| 2453 | (r = sshbuf_get_u32(b, (u_int *)&comp->enabled)) != 0 || |
| 2454 | (r = sshbuf_get_cstring(b, &comp->name, NULL)) != 0) |
| 2455 | goto out; |
| 2456 | if (enc->name == NULL || |
| 2457 | cipher_by_name(enc->name) != enc->cipher) { |
| 2458 | r = SSH_ERR_INVALID_FORMAT; |
| 2459 | goto out; |
| 2460 | } |
| 2461 | if (sshbuf_len(b) != 0) { |
| 2462 | r = SSH_ERR_INVALID_FORMAT; |
| 2463 | goto out; |
| 2464 | } |
| 2465 | enc->key_len = keylen; |
| 2466 | enc->iv_len = ivlen; |
| 2467 | ssh->kex->newkeys[mode] = newkey; |
| 2468 | newkey = NULL; |
| 2469 | r = 0; |
| 2470 | out: |
| 2471 | if (newkey != NULL) |
| 2472 | free(newkey); |
| 2473 | if (b != NULL) |
| 2474 | sshbuf_free(b); |
| 2475 | return r; |
| 2476 | } |
| 2477 | |
| 2478 | /* restore kex from blob for packet state de-serialization */ |
| 2479 | static int |
| 2480 | kex_from_blob(struct sshbuf *m, struct kex **kexp) |
| 2481 | { |
| 2482 | struct kex *kex; |
| 2483 | int r; |
| 2484 | |
| 2485 | if ((kex = calloc(1, sizeof(struct kex))) == NULL || |
| 2486 | (kex->my = sshbuf_new()) == NULL || |
| 2487 | (kex->peer = sshbuf_new()) == NULL) { |
| 2488 | r = SSH_ERR_ALLOC_FAIL; |
| 2489 | goto out; |
| 2490 | } |
| 2491 | if ((r = sshbuf_get_string(m, &kex->session_id, &kex->session_id_len)) != 0 || |
| 2492 | (r = sshbuf_get_u32(m, &kex->we_need)) != 0 || |
| 2493 | (r = sshbuf_get_u32(m, (u_int *)&kex->hostkey_type)) != 0 || |
| 2494 | (r = sshbuf_get_u32(m, &kex->kex_type)) != 0 || |
| 2495 | (r = sshbuf_get_stringb(m, kex->my)) != 0 || |
| 2496 | (r = sshbuf_get_stringb(m, kex->peer)) != 0 || |
| 2497 | (r = sshbuf_get_u32(m, &kex->flags)) != 0 || |
| 2498 | (r = sshbuf_get_cstring(m, &kex->client_version_string, NULL)) != 0 || |
| 2499 | (r = sshbuf_get_cstring(m, &kex->server_version_string, NULL)) != 0) |
| 2500 | goto out; |
| 2501 | kex->server = 1; |
| 2502 | kex->done = 1; |
| 2503 | r = 0; |
| 2504 | out: |
| 2505 | if (r != 0 || kexp == NULL) { |
| 2506 | if (kex != NULL) { |
| 2507 | if (kex->my != NULL) |
| 2508 | sshbuf_free(kex->my); |
| 2509 | if (kex->peer != NULL) |
| 2510 | sshbuf_free(kex->peer); |
| 2511 | free(kex); |
| 2512 | } |
| 2513 | if (kexp != NULL) |
| 2514 | *kexp = NULL; |
| 2515 | } else { |
| 2516 | *kexp = kex; |
| 2517 | } |
| 2518 | return r; |
| 2519 | } |
| 2520 | |
| 2521 | /* |
| 2522 | * Restore packet state from content of blob 'm' (de-serialization). |
| 2523 | * Note that 'm' will be partially consumed on parsing or any other errors. |
| 2524 | */ |
| 2525 | int |
| 2526 | ssh_packet_set_state(struct ssh *ssh, struct sshbuf *m) |
| 2527 | { |
| 2528 | struct session_state *state = ssh->state; |
| 2529 | const u_char *ssh1key, *ivin, *ivout, *keyin, *keyout, *input, *output; |
| 2530 | size_t ssh1keylen, rlen, slen, ilen, olen; |
| 2531 | int r; |
| 2532 | u_int ssh1cipher = 0; |
| 2533 | u_int64_t sent_bytes = 0, recv_bytes = 0; |
| 2534 | |
| 2535 | if (!compat20) { |
| 2536 | if ((r = sshbuf_get_u32(m, &state->remote_protocol_flags)) != 0 || |
| 2537 | (r = sshbuf_get_u32(m, &ssh1cipher)) != 0 || |
| 2538 | (r = sshbuf_get_string_direct(m, &ssh1key, &ssh1keylen)) != 0 || |
| 2539 | (r = sshbuf_get_string_direct(m, &ivout, &slen)) != 0 || |
| 2540 | (r = sshbuf_get_string_direct(m, &ivin, &rlen)) != 0) |
| 2541 | return r; |
| 2542 | if (ssh1cipher > INT_MAX) |
| 2543 | return SSH_ERR_KEY_UNKNOWN_CIPHER; |
| 2544 | ssh_packet_set_encryption_key(ssh, ssh1key, ssh1keylen, |
| 2545 | (int)ssh1cipher); |
| 2546 | if (cipher_get_keyiv_len(&state->send_context) != (int)slen || |
| 2547 | cipher_get_keyiv_len(&state->receive_context) != (int)rlen) |
| 2548 | return SSH_ERR_INVALID_FORMAT; |
| 2549 | if ((r = cipher_set_keyiv(&state->send_context, ivout)) != 0 || |
| 2550 | (r = cipher_set_keyiv(&state->receive_context, ivin)) != 0) |
| 2551 | return r; |
| 2552 | } else { |
| 2553 | if ((r = kex_from_blob(m, &ssh->kex)) != 0 || |
| 2554 | (r = newkeys_from_blob(m, ssh, MODE_OUT)) != 0 || |
| 2555 | (r = newkeys_from_blob(m, ssh, MODE_IN)) != 0 || |
| 2556 | (r = sshbuf_get_u32(m, &state->p_send.seqnr)) != 0 || |
| 2557 | (r = sshbuf_get_u64(m, &state->p_send.blocks)) != 0 || |
| 2558 | (r = sshbuf_get_u32(m, &state->p_send.packets)) != 0 || |
| 2559 | (r = sshbuf_get_u64(m, &state->p_send.bytes)) != 0 || |
| 2560 | (r = sshbuf_get_u32(m, &state->p_read.seqnr)) != 0 || |
| 2561 | (r = sshbuf_get_u64(m, &state->p_read.blocks)) != 0 || |
| 2562 | (r = sshbuf_get_u32(m, &state->p_read.packets)) != 0 || |
| 2563 | (r = sshbuf_get_u64(m, &state->p_read.bytes)) != 0) |
| 2564 | return r; |
| 2565 | /* XXX ssh_set_newkeys overrides p_read.packets? XXX */ |
| 2566 | if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0 || |
| 2567 | (r = ssh_set_newkeys(ssh, MODE_OUT)) != 0) |
| 2568 | return r; |
| 2569 | } |
| 2570 | if ((r = sshbuf_get_string_direct(m, &keyout, &slen)) != 0 || |
| 2571 | (r = sshbuf_get_string_direct(m, &keyin, &rlen)) != 0) |
| 2572 | return r; |
| 2573 | if (cipher_get_keycontext(&state->send_context, NULL) != (int)slen || |
| 2574 | cipher_get_keycontext(&state->receive_context, NULL) != (int)rlen) |
| 2575 | return SSH_ERR_INVALID_FORMAT; |
| 2576 | cipher_set_keycontext(&state->send_context, keyout); |
| 2577 | cipher_set_keycontext(&state->receive_context, keyin); |
| 2578 | |
| 2579 | if ((r = ssh_packet_set_compress_state(ssh, m)) != 0 || |
| 2580 | (r = ssh_packet_set_postauth(ssh)) != 0) |
| 2581 | return r; |
| 2582 | |
| 2583 | sshbuf_reset(state->input); |
| 2584 | sshbuf_reset(state->output); |
| 2585 | if ((r = sshbuf_get_string_direct(m, &input, &ilen)) != 0 || |
| 2586 | (r = sshbuf_get_string_direct(m, &output, &olen)) != 0 || |
| 2587 | (r = sshbuf_put(state->input, input, ilen)) != 0 || |
| 2588 | (r = sshbuf_put(state->output, output, olen)) != 0) |
| 2589 | return r; |
| 2590 | |
| 2591 | if (compat20) { |
| 2592 | if ((r = sshbuf_get_u64(m, &sent_bytes)) != 0 || |
| 2593 | (r = sshbuf_get_u64(m, &recv_bytes)) != 0) |
| 2594 | return r; |
| 2595 | roam_set_bytes(sent_bytes, recv_bytes); |
| 2596 | } |
| 2597 | if (sshbuf_len(m)) |
| 2598 | return SSH_ERR_INVALID_FORMAT; |
| 2599 | debug3("%s: done", __func__); |
| 2600 | return 0; |
| 2601 | } |
| 2602 | |
| 2603 | /* NEW API */ |
| 2604 | |
| 2605 | /* put data to the outgoing packet */ |
| 2606 | |
| 2607 | int |
| 2608 | sshpkt_put(struct ssh *ssh, const void *v, size_t len) |
| 2609 | { |
| 2610 | return sshbuf_put(ssh->state->outgoing_packet, v, len); |
| 2611 | } |
| 2612 | |
| 2613 | int |
| 2614 | sshpkt_putb(struct ssh *ssh, const struct sshbuf *b) |
| 2615 | { |
| 2616 | return sshbuf_putb(ssh->state->outgoing_packet, b); |
| 2617 | } |
| 2618 | |
| 2619 | int |
| 2620 | sshpkt_put_u8(struct ssh *ssh, u_char val) |
| 2621 | { |
| 2622 | return sshbuf_put_u8(ssh->state->outgoing_packet, val); |
| 2623 | } |
| 2624 | |
| 2625 | int |
| 2626 | sshpkt_put_u32(struct ssh *ssh, u_int32_t val) |
| 2627 | { |
| 2628 | return sshbuf_put_u32(ssh->state->outgoing_packet, val); |
| 2629 | } |
| 2630 | |
| 2631 | int |
| 2632 | sshpkt_put_u64(struct ssh *ssh, u_int64_t val) |
| 2633 | { |
| 2634 | return sshbuf_put_u64(ssh->state->outgoing_packet, val); |
| 2635 | } |
| 2636 | |
| 2637 | int |
| 2638 | sshpkt_put_string(struct ssh *ssh, const void *v, size_t len) |
| 2639 | { |
| 2640 | return sshbuf_put_string(ssh->state->outgoing_packet, v, len); |
| 2641 | } |
| 2642 | |
| 2643 | int |
| 2644 | sshpkt_put_cstring(struct ssh *ssh, const void *v) |
| 2645 | { |
| 2646 | return sshbuf_put_cstring(ssh->state->outgoing_packet, v); |
| 2647 | } |
| 2648 | |
| 2649 | int |
| 2650 | sshpkt_put_stringb(struct ssh *ssh, const struct sshbuf *v) |
| 2651 | { |
| 2652 | return sshbuf_put_stringb(ssh->state->outgoing_packet, v); |
| 2653 | } |
| 2654 | |
| 2655 | int |
| 2656 | sshpkt_put_ec(struct ssh *ssh, const EC_POINT *v, const EC_GROUP *g) |
| 2657 | { |
| 2658 | return sshbuf_put_ec(ssh->state->outgoing_packet, v, g); |
| 2659 | } |
| 2660 | |
| 2661 | int |
| 2662 | sshpkt_put_bignum1(struct ssh *ssh, const BIGNUM *v) |
| 2663 | { |
| 2664 | return sshbuf_put_bignum1(ssh->state->outgoing_packet, v); |
| 2665 | } |
| 2666 | |
| 2667 | int |
| 2668 | sshpkt_put_bignum2(struct ssh *ssh, const BIGNUM *v) |
| 2669 | { |
| 2670 | return sshbuf_put_bignum2(ssh->state->outgoing_packet, v); |
| 2671 | } |
| 2672 | |
| 2673 | /* fetch data from the incoming packet */ |
| 2674 | |
| 2675 | int |
| 2676 | sshpkt_get(struct ssh *ssh, void *valp, size_t len) |
| 2677 | { |
| 2678 | return sshbuf_get(ssh->state->incoming_packet, valp, len); |
| 2679 | } |
| 2680 | |
| 2681 | int |
| 2682 | sshpkt_get_u8(struct ssh *ssh, u_char *valp) |
| 2683 | { |
| 2684 | return sshbuf_get_u8(ssh->state->incoming_packet, valp); |
| 2685 | } |
| 2686 | |
| 2687 | int |
| 2688 | sshpkt_get_u32(struct ssh *ssh, u_int32_t *valp) |
| 2689 | { |
| 2690 | return sshbuf_get_u32(ssh->state->incoming_packet, valp); |
| 2691 | } |
| 2692 | |
| 2693 | int |
| 2694 | sshpkt_get_u64(struct ssh *ssh, u_int64_t *valp) |
| 2695 | { |
| 2696 | return sshbuf_get_u64(ssh->state->incoming_packet, valp); |
| 2697 | } |
| 2698 | |
| 2699 | int |
| 2700 | sshpkt_get_string(struct ssh *ssh, u_char **valp, size_t *lenp) |
| 2701 | { |
| 2702 | return sshbuf_get_string(ssh->state->incoming_packet, valp, lenp); |
| 2703 | } |
| 2704 | |
| 2705 | int |
| 2706 | sshpkt_get_string_direct(struct ssh *ssh, const u_char **valp, size_t *lenp) |
| 2707 | { |
| 2708 | return sshbuf_get_string_direct(ssh->state->incoming_packet, valp, lenp); |
| 2709 | } |
| 2710 | |
| 2711 | int |
| 2712 | sshpkt_get_cstring(struct ssh *ssh, char **valp, size_t *lenp) |
| 2713 | { |
| 2714 | return sshbuf_get_cstring(ssh->state->incoming_packet, valp, lenp); |
| 2715 | } |
| 2716 | |
| 2717 | int |
| 2718 | sshpkt_get_ec(struct ssh *ssh, EC_POINT *v, const EC_GROUP *g) |
| 2719 | { |
| 2720 | return sshbuf_get_ec(ssh->state->incoming_packet, v, g); |
| 2721 | } |
| 2722 | |
| 2723 | int |
| 2724 | sshpkt_get_bignum1(struct ssh *ssh, BIGNUM *v) |
| 2725 | { |
| 2726 | return sshbuf_get_bignum1(ssh->state->incoming_packet, v); |
| 2727 | } |
| 2728 | |
| 2729 | int |
| 2730 | sshpkt_get_bignum2(struct ssh *ssh, BIGNUM *v) |
| 2731 | { |
| 2732 | return sshbuf_get_bignum2(ssh->state->incoming_packet, v); |
| 2733 | } |
| 2734 | |
| 2735 | int |
| 2736 | sshpkt_get_end(struct ssh *ssh) |
| 2737 | { |
| 2738 | if (sshbuf_len(ssh->state->incoming_packet) > 0) |
| 2739 | return SSH_ERR_UNEXPECTED_TRAILING_DATA; |
| 2740 | return 0; |
| 2741 | } |
| 2742 | |
| 2743 | const u_char * |
| 2744 | sshpkt_ptr(struct ssh *ssh, size_t *lenp) |
| 2745 | { |
| 2746 | if (lenp != NULL) |
| 2747 | *lenp = sshbuf_len(ssh->state->incoming_packet); |
| 2748 | return sshbuf_ptr(ssh->state->incoming_packet); |
| 2749 | } |
| 2750 | |
| 2751 | /* start a new packet */ |
| 2752 | |
| 2753 | int |
| 2754 | sshpkt_start(struct ssh *ssh, u_char type) |
| 2755 | { |
| 2756 | u_char buf[9]; |
| 2757 | int len; |
| 2758 | |
| 2759 | DBG(debug("packet_start[%d]", type)); |
| 2760 | len = compat20 ? 6 : 9; |
| 2761 | memset(buf, 0, len - 1); |
| 2762 | buf[len - 1] = type; |
| 2763 | sshbuf_reset(ssh->state->outgoing_packet); |
| 2764 | return sshbuf_put(ssh->state->outgoing_packet, buf, len); |
| 2765 | } |
| 2766 | |
| 2767 | /* send it */ |
| 2768 | |
| 2769 | int |
| 2770 | sshpkt_send(struct ssh *ssh) |
| 2771 | { |
| 2772 | if (compat20) |
| 2773 | return ssh_packet_send2(ssh); |
| 2774 | else |
| 2775 | return ssh_packet_send1(ssh); |
| 2776 | } |
| 2777 | |
| 2778 | int |
| 2779 | sshpkt_disconnect(struct ssh *ssh, const char *fmt,...) |
| 2780 | { |
| 2781 | char buf[1024]; |
| 2782 | va_list args; |
| 2783 | int r; |
| 2784 | |
| 2785 | va_start(args, fmt); |
| 2786 | vsnprintf(buf, sizeof(buf), fmt, args); |
| 2787 | va_end(args); |
| 2788 | |
| 2789 | if (compat20) { |
| 2790 | if ((r = sshpkt_start(ssh, SSH2_MSG_DISCONNECT)) != 0 || |
| 2791 | (r = sshpkt_put_u32(ssh, SSH2_DISCONNECT_PROTOCOL_ERROR)) != 0 || |
| 2792 | (r = sshpkt_put_cstring(ssh, buf)) != 0 || |
| 2793 | (r = sshpkt_put_cstring(ssh, "")) != 0 || |
| 2794 | (r = sshpkt_send(ssh)) != 0) |
| 2795 | return r; |
| 2796 | } else { |
| 2797 | if ((r = sshpkt_start(ssh, SSH_MSG_DISCONNECT)) != 0 || |
| 2798 | (r = sshpkt_put_cstring(ssh, buf)) != 0 || |
| 2799 | (r = sshpkt_send(ssh)) != 0) |
| 2800 | return r; |
| 2801 | } |
| 2802 | return 0; |
| 2803 | } |
| 2804 | |
| 2805 | /* roundup current message to pad bytes */ |
| 2806 | int |
| 2807 | sshpkt_add_padding(struct ssh *ssh, u_char pad) |
| 2808 | { |
| 2809 | ssh->state->extra_pad = pad; |
| 2810 | return 0; |
Damien Miller | c31a0cd | 2014-05-15 14:37:39 +1000 | [diff] [blame] | 2811 | } |