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