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