dropbear: packet.c annotate

annotate packet.c @ 1027:daf21fd50abf fastopen

In theory TFO should work. Needs platform cleanup and testing

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 19 Feb 2015 00:32:00 +0800
parents	59a1146e8b9d
children	0da8ba489c23

rev	line source
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Dropbear - a SSH2 server
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 *
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * Copyright (c) 2002,2003 Matt Johnston
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * All rights reserved.
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * Permission is hereby granted, free of charge, to any person obtaining a copy
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 * of this software and associated documentation files (the "Software"), to deal
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * in the Software without restriction, including without limitation the rights
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * copies of the Software, and to permit persons to whom the Software is
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 * furnished to do so, subject to the following conditions:
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 *
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * The above copyright notice and this permission notice shall be included in
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * all copies or substantial portions of the Software.
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 *
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 * SOFTWARE. */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 #include "includes.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 #include "packet.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #include "session.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 #include "dbutil.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 #include "ssh.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 #include "algo.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 #include "buffer.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #include "kex.h"
858 220f55d540ae rename random.h to dbrandom.h since some OSes have a system random.h Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	33 #include "dbrandom.h"
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "service.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "auth.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #include "channel.h"
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	38 static int read_packet_init();
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	39 static void make_mac(unsigned int seqno, const struct key_context_directional * key_state,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	40 buffer * clear_buf, unsigned int clear_len,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	41 unsigned char *output_mac);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	42 static int checkmac();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43
906 4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	44 /* For exact details see http://www.zlib.net/zlib_tech.html
4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	45 * 5 bytes per 16kB block, plus 6 bytes for the stream.
4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	46 * We might allocate 5 unnecessary bytes here if it's an
4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	47 * exact multiple. */
4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	48 #define ZLIB_COMPRESS_EXPANSION (((RECV_MAX_PAYLOAD_LEN/16384)+1)*5 + 6)
791 0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	49 #define ZLIB_DECOMPRESS_INCR 1024
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 static buffer* buf_decompress(buffer* buf, unsigned int len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 static void buf_compress(buffer * dest, buffer * src, unsigned int len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	55 struct iovec * packet_queue_to_iovec(struct Queue queue, int ret_iov_count) {
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	56 struct iovec *iov = NULL;
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	57 struct Link *l;
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	58 unsigned int i, packet_type;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	59 int len;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	60 buffer *writebuf;
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	61
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	62 #ifndef IOV_MAX
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	63 #define IOV_MAX UIO_MAXIOV
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	64 #endif
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	65
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	66 *ret_iov_count = MIN(queue->count, IOV_MAX);
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	67
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	68 iov = m_malloc(sizeof(iov) *ret_iov_count);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	69 for (l = queue->head, i = 0; l; l = l->link, i++)
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	70 {
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	71 writebuf = (buffer*)l->item;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	72 packet_type = writebuf->data[writebuf->len-1];
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	73 len = writebuf->len - 1 - writebuf->pos;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	74 dropbear_assert(len > 0);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	75 TRACE2(("write_packet writev #%d type %d len %d/%d", i, packet_type,
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	76 len, writebuf->len-1))
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	77 iov[i].iov_base = buf_getptr(writebuf, len);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	78 iov[i].iov_len = len;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	79 }
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	80
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	81 return iov;
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	82 }
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	83
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	84 void packet_queue_consume(struct Queue *queue, ssize_t written) {
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	85 buffer *writebuf;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	86 int len;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	87 while (written > 0) {
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	88 writebuf = (buffer*)examine(queue);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	89 len = writebuf->len - 1 - writebuf->pos;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	90 if (len > written) {
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	91 /* partial buffer write */
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	92 buf_incrpos(writebuf, written);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	93 written = 0;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	94 } else {
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	95 written -= len;
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	96 dequeue(queue);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	97 buf_free(writebuf);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	98 }
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	99 }
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	100 }
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	101
531 164b7c2cd5df disapproval of revision 'a101cbd046507cf723e6362a49196dbd4b924042' Matt Johnston <matt@ucc.asn.au> parents: 529 diff changeset	102 /* non-blocking function writing out a current encrypted packet */
164b7c2cd5df disapproval of revision 'a101cbd046507cf723e6362a49196dbd4b924042' Matt Johnston <matt@ucc.asn.au> parents: 529 diff changeset	103 void write_packet() {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	105 ssize_t written;
aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	106 int len;
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	107 buffer * writebuf = NULL;
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	108 unsigned packet_type;
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	109 #ifdef HAVE_WRITEV
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	110 struct iovec *iov = NULL;
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	111 int iov_count;
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	112 #endif
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	114 TRACE2(("enter write_packet"))
531 164b7c2cd5df disapproval of revision 'a101cbd046507cf723e6362a49196dbd4b924042' Matt Johnston <matt@ucc.asn.au> parents: 529 diff changeset	115 dropbear_assert(!isempty(&ses.writequeue));
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116
934 68723d66dec6 Be more careful in case a platform doesn't define UIO_MAXIOV nor IOV_MAX Matt Johnston <matt@ucc.asn.au> parents: 933 diff changeset	117 #if defined(HAVE_WRITEV) && (defined(IOV_MAX) \|\| defined(UIO_MAXIOV))
933 c919dbb39395 Limit size of the iovect passed to writev in packet.c Ronny Meeus <ronny.meeus@gmail.com> parents: 932 diff changeset	118
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	119 iov = packet_queue_to_iovec(&ses.writequeue, &iov_count);
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	120 /* This may return EAGAIN. The main loop sometimes
c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	121 calls write_packet() without bothering to test with select() since
c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	122 it's likely to be necessary */
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	123 written = writev(ses.sock_out, iov, iov_count);
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	124 if (written < 0) {
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	125 if (errno == EINTR \|\| errno == EAGAIN) {
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	126 TRACE2(("leave write_packet: EINTR"))
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	127 m_free(iov);
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	128 return;
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	129 } else {
932 3873b39c4de6 Print errno information in write_packet Ronny Meeus <ronny.meeus@gmail.com> parents: 928 diff changeset	130 dropbear_exit("Error writing: %s", strerror(errno));
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	131 }
926 b8208506322e Use AUTH_TIMEOUT only before authdone != 1. Yousong Zhou <yszhou4tech@gmail.com> parents: 906 diff changeset	132 }
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	133 m_free(iov);
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	134
59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	135 packet_queue_consume(&ses.writequeue, written);
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	136
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	137 if (written == 0) {
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	138 ses.remoteclosed();
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	139 }
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	140
934 68723d66dec6 Be more careful in case a platform doesn't define UIO_MAXIOV nor IOV_MAX Matt Johnston <matt@ucc.asn.au> parents: 933 diff changeset	141 #else /* No writev () */
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 /* Get the next buffer in the queue of encrypted packets to write*/
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 writebuf = (buffer*)examine(&ses.writequeue);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	145 /* The last byte of the buffer is not to be transmitted, but is
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	146 * a cleartext packet_type indicator */
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	147 packet_type = writebuf->data[writebuf->len-1];
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	148 len = writebuf->len - 1 - writebuf->pos;
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 232 diff changeset	149 dropbear_assert(len > 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 /* Try to write as much as possible */
479 e3db1f7a2e43 - Split main socket var into ses.sock_in/ses.sock_out in preparation Matt Johnston <matt@ucc.asn.au> parents: 456 diff changeset	151 written = write(ses.sock_out, buf_getptr(writebuf, len), len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 if (written < 0) {
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	154 if (errno == EINTR \|\| errno == EAGAIN) {
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	155 TRACE2(("leave writepacket: EINTR"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156 return;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	157 } else {
932 3873b39c4de6 Print errno information in write_packet Ronny Meeus <ronny.meeus@gmail.com> parents: 928 diff changeset	158 dropbear_exit("Error writing: %s", strerror(errno));
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	160 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 if (written == 0) {
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	163 ses.remoteclosed();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 if (written == len) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 /* We've finished with the packet, free it */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 dequeue(&ses.writequeue);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 buf_free(writebuf);
70 b0316ce64e4b Merging in the changes from 0.41-0.43 main Dropbear tree Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	170 writebuf = NULL;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 } else {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 /* More packet left to write, leave it in the queue for later */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 buf_incrpos(writebuf, written);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 }
934 68723d66dec6 Be more careful in case a platform doesn't define UIO_MAXIOV nor IOV_MAX Matt Johnston <matt@ucc.asn.au> parents: 933 diff changeset	175 #endif /* writev */
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	177 TRACE2(("leave write_packet"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 /* Non-blocking function reading available portion of a packet into the
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 * ses's buffer, decrypting the length if encrypted, decrypting the
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 * full portion if possible */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 void read_packet() {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185 int len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 unsigned int maxlen;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 unsigned char blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	189 TRACE2(("enter read_packet"))
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	190 blocksize = ses.keys->recv.algo_crypt->blocksize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 if (ses.readbuf == NULL \|\| ses.readbuf->len < blocksize) {
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	193 int ret;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 /* In the first blocksize of a packet */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 /* Read the first blocksize of the packet, so we can decrypt it and
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 * find the length of the whole packet */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	198 ret = read_packet_init();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	200 if (ret == DROPBEAR_FAILURE) {
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	201 /* didn't read enough to determine the length */
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	202 TRACE2(("leave read_packet: packetinit done"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 return;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 /* Attempt to read the remainder of the packet, note that there
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 * mightn't be any available (EAGAIN) */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 maxlen = ses.readbuf->len - ses.readbuf->pos;
711 f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	210 if (maxlen == 0) {
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	211 /* Occurs when the packet is only a single block long and has all
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	212 * been read in read_packet_init(). Usually means that MAC is disabled
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	213 */
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	214 len = 0;
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	215 } else {
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	216 len = read(ses.sock_in, buf_getptr(ses.readbuf, maxlen), maxlen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217
711 f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	218 if (len == 0) {
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	219 ses.remoteclosed();
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	220 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221
711 f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	222 if (len < 0) {
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	223 if (errno == EINTR \|\| errno == EAGAIN) {
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	224 TRACE2(("leave read_packet: EINTR or EAGAIN"))
711 f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	225 return;
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	226 } else {
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	227 dropbear_exit("Error reading: %s", strerror(errno));
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	228 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 }
711 f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	230
f4232b65b316 Fix "-m none" case where an entire packet fits in a block and can be Matt Johnston <matt@ucc.asn.au> parents: 623 diff changeset	231 buf_incrpos(ses.readbuf, len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 if ((unsigned int)len == maxlen) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 /* The whole packet has been read */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 decrypt_packet();
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	237 /* The main select() loop process_packet() to
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 * handle the packet contents... */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 }
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	240 TRACE2(("leave read_packet"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	242
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 /* Function used to read the initial portion of a packet, and determine the
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 * length. Only called during the first BLOCKSIZE of a packet. */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	245 /* Returns DROPBEAR_SUCCESS if the length is determined,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	246 * DROPBEAR_FAILURE otherwise */
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	247 static int read_packet_init() {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	249 unsigned int maxlen;
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	250 int slen;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	251 unsigned int len;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	252 unsigned int blocksize;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	253 unsigned int macsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	256 blocksize = ses.keys->recv.algo_crypt->blocksize;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	257 macsize = ses.keys->recv.algo_mac->hashsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	259 if (ses.readbuf == NULL) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260 /* start of a new packet */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261 ses.readbuf = buf_new(INIT_READBUF);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	263
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264 maxlen = blocksize - ses.readbuf->pos;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	265
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	266 /* read the rest of the packet if possible */
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	267 slen = read(ses.sock_in, buf_getwriteptr(ses.readbuf, maxlen),
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 maxlen);
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	269 if (slen == 0) {
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	270 ses.remoteclosed();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	272 if (slen < 0) {
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	273 if (errno == EINTR \|\| errno == EAGAIN) {
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	274 TRACE2(("leave read_packet_init: EINTR"))
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	275 return DROPBEAR_FAILURE;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	276 }
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 592 diff changeset	277 dropbear_exit("Error reading: %s", strerror(errno));
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	280 buf_incrwritepos(ses.readbuf, slen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	282 if ((unsigned int)slen != maxlen) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283 /* don't have enough bytes to determine length, get next time */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	284 return DROPBEAR_FAILURE;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 /* now we have the first block, need to get packet length, so we decrypt
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 * the first block (only need first 4 bytes) */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 buf_setpos(ses.readbuf, 0);
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	290 if (ses.keys->recv.crypt_mode->decrypt(buf_getptr(ses.readbuf, blocksize),
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	291 buf_getwriteptr(ses.readbuf, blocksize),
502 43bbe17d6ba0 - Add Counter Mode support Matt Johnston <matt@ucc.asn.au> parents: 501 diff changeset	292 blocksize,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	293 &ses.keys->recv.cipher_state) != CRYPT_OK) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 592 diff changeset	294 dropbear_exit("Error decrypting");
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	296 len = buf_getint(ses.readbuf) + 4 + macsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297
990 e3614649b1f5 Integrity error (bad packet size %u) negative length Fedor Brunner <fedor.brunner@azet.sk> parents: 957 diff changeset	298 TRACE2(("packet size is %u, block %u mac %u", len, blocksize, macsize))
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	299
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 /* check packet length */
448 9c61e7af0156 Rearrange the channel buffer sizes into three neat use-editable values in Matt Johnston <matt@ucc.asn.au> parents: 426 diff changeset	302 if ((len > RECV_MAX_PACKET_LEN) \|\|
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 (len < MIN_PACKET_LEN + macsize) \|\|
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304 ((len - macsize) % blocksize != 0)) {
990 e3614649b1f5 Integrity error (bad packet size %u) negative length Fedor Brunner <fedor.brunner@azet.sk> parents: 957 diff changeset	305 dropbear_exit("Integrity error (bad packet size %u)", len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	308 if (len > ses.readbuf->size) {
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	309 buf_resize(ses.readbuf, len);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	310 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	311 buf_setlen(ses.readbuf, len);
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	312 buf_setpos(ses.readbuf, blocksize);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	313 return DROPBEAR_SUCCESS;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 /* handle the received packet */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 void decrypt_packet() {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	318
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 unsigned char blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320 unsigned char macsize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	321 unsigned int padlen;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	322 unsigned int len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	323
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	324 TRACE2(("enter decrypt_packet"))
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	325 blocksize = ses.keys->recv.algo_crypt->blocksize;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	326 macsize = ses.keys->recv.algo_mac->hashsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	327
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	328 ses.kexstate.datarecv += ses.readbuf->len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	329
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	330 /* we've already decrypted the first blocksize in read_packet_init */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	331 buf_setpos(ses.readbuf, blocksize);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	332
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	333 /* decrypt it in-place */
528 378a6389f88e - Don't be dumb and encrypt/decrypt in a while() loop - why did I do this?? Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	334 len = ses.readbuf->len - macsize - ses.readbuf->pos;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	335 if (ses.keys->recv.crypt_mode->decrypt(
528 378a6389f88e - Don't be dumb and encrypt/decrypt in a while() loop - why did I do this?? Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	336 buf_getptr(ses.readbuf, len),
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	337 buf_getwriteptr(ses.readbuf, len),
528 378a6389f88e - Don't be dumb and encrypt/decrypt in a while() loop - why did I do this?? Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	338 len,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	339 &ses.keys->recv.cipher_state) != CRYPT_OK) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 592 diff changeset	340 dropbear_exit("Error decrypting");
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	341 }
528 378a6389f88e - Don't be dumb and encrypt/decrypt in a while() loop - why did I do this?? Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	342 buf_incrpos(ses.readbuf, len);
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	343
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	344 /* check the hmac */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	345 if (checkmac() != DROPBEAR_SUCCESS) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 dropbear_exit("Integrity error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 /* get padding length */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	350 buf_setpos(ses.readbuf, PACKET_PADDING_OFF);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	351 padlen = buf_getbyte(ses.readbuf);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353 /* payload length */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 /* - 4 - 1 is for LEN and PADLEN values */
556 ccdc4c6183c0 - Payload length doesn't include macsize. Matt Johnston <matt@ucc.asn.au> parents: 535 diff changeset	355 len = ses.readbuf->len - padlen - 4 - 1 - macsize;
906 4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	356 if ((len > RECV_MAX_PAYLOAD_LEN+ZLIB_COMPRESS_EXPANSION) \|\| (len < 1)) {
990 e3614649b1f5 Integrity error (bad packet size %u) negative length Fedor Brunner <fedor.brunner@azet.sk> parents: 957 diff changeset	357 dropbear_exit("Bad packet size %u", len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	359
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	360 buf_setpos(ses.readbuf, PACKET_PAYLOAD_OFF);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362 #ifndef DISABLE_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	363 if (is_compress_recv()) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 /* decompress */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	365 ses.payload = buf_decompress(ses.readbuf, len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 } else
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	368 {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 /* copy payload */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	370 ses.payload = buf_new(len);
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	371 memcpy(ses.payload->data, buf_getptr(ses.readbuf, len), len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372 buf_incrlen(ses.payload, len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	375 buf_free(ses.readbuf);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	376 ses.readbuf = NULL;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 buf_setpos(ses.payload, 0);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 ses.recvseq++;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	381 TRACE2(("leave decrypt_packet"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	384 /* Checks the mac at the end of a decrypted readbuf.
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385 * Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	386 static int checkmac() {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	388 unsigned char mac_bytes[MAX_MAC_LEN];
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	389 unsigned int mac_size, contents_len;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	390
752 24172f555f9c Fix MAC bug which would prevent asymmetric hashes Matt Johnston <matt@ucc.asn.au> parents: 731 diff changeset	391 mac_size = ses.keys->recv.algo_mac->hashsize;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	392 contents_len = ses.readbuf->len - mac_size;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	393
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	394 buf_setpos(ses.readbuf, 0);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	395 make_mac(ses.recvseq, &ses.keys->recv, ses.readbuf, contents_len, mac_bytes);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	396
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 /* compare the hash */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	398 buf_setpos(ses.readbuf, contents_len);
817 a625f9e135a4 Constant time memcmp for the hmac and password crypt Matt Johnston <matt@ucc.asn.au> parents: 791 diff changeset	399 if (constant_time_memcmp(mac_bytes, buf_getptr(ses.readbuf, mac_size), mac_size) != 0) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	400 return DROPBEAR_FAILURE;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	401 } else {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 return DROPBEAR_SUCCESS;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	406 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	407 /* returns a pointer to a newly created buffer */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 static buffer* buf_decompress(buffer* buf, unsigned int len) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	410 int result;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	411 buffer * ret;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	412 z_streamp zstream;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	414 zstream = ses.keys->recv.zstream;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 ret = buf_new(len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 zstream->avail_in = len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 zstream->next_in = buf_getptr(buf, len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 /* decompress the payload, incrementally resizing the output buffer */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 while (1) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 zstream->avail_out = ret->size - ret->pos;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 zstream->next_out = buf_getwriteptr(ret, zstream->avail_out);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 result = inflate(zstream, Z_SYNC_FLUSH);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428 buf_setlen(ret, ret->size - zstream->avail_out);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 buf_setpos(ret, ret->len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431 if (result != Z_BUF_ERROR && result != Z_OK) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 dropbear_exit("zlib error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435 if (zstream->avail_in == 0 &&
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 (zstream->avail_out != 0 \|\| result == Z_BUF_ERROR)) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 /* we can only exit if avail_out hasn't all been used,
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 * and there's no remaining input */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 return ret;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	441
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 if (zstream->avail_out == 0) {
791 0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	443 int new_size = 0;
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	444 if (ret->size >= RECV_MAX_PAYLOAD_LEN) {
906 4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	445 /* Already been increased as large as it can go,
4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	446 * yet didn't finish up the decompression */
791 0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	447 dropbear_exit("bad packet, oversized decompressed");
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	448 }
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	449 new_size = MIN(RECV_MAX_PAYLOAD_LEN, ret->size + ZLIB_DECOMPRESS_INCR);
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	450 buf_resize(ret, new_size);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	457 /* returns 1 if the packet is a valid type during kex (see 7.1 of rfc4253) */
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	458 static int packet_is_okay_kex(unsigned char type) {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	459 if (type >= SSH_MSG_USERAUTH_REQUEST) {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	460 return 0;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	461 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	462 if (type == SSH_MSG_SERVICE_REQUEST \|\| type == SSH_MSG_SERVICE_ACCEPT) {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	463 return 0;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	464 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	465 if (type == SSH_MSG_KEXINIT) {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	466 /* XXX should this die horribly if !dataallowed ?? */
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	467 return 0;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	468 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	469 return 1;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	470 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	471
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	472 static void enqueue_reply_packet() {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	473 struct packetlist * new_item = NULL;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	474 new_item = m_malloc(sizeof(struct packetlist));
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	475 new_item->next = NULL;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	476
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	477 new_item->payload = buf_newcopy(ses.writepayload);
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	478 buf_setpos(ses.writepayload, 0);
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	479 buf_setlen(ses.writepayload, 0);
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	480
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	481 if (ses.reply_queue_tail) {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	482 ses.reply_queue_tail->next = new_item;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	483 } else {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	484 ses.reply_queue_head = new_item;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	485 }
456 f6c999ba31da Fix delayed packet queue handling Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	486 ses.reply_queue_tail = new_item;
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	487 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	488
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	489 void maybe_flush_reply_queue() {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	490 struct packetlist tmp_item = NULL, curr_item = NULL;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	491 if (!ses.dataallowed)
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	492 {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	493 TRACE(("maybe_empty_reply_queue - no data allowed"))
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	494 return;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	495 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	496
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	497 for (curr_item = ses.reply_queue_head; curr_item; ) {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	498 CHECKCLEARTOWRITE();
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	499 buf_putbytes(ses.writepayload,
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	500 curr_item->payload->data, curr_item->payload->len);
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	501
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	502 buf_free(curr_item->payload);
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	503 tmp_item = curr_item;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	504 curr_item = curr_item->next;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	505 m_free(tmp_item);
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	506 encrypt_packet();
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	507 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	508 ses.reply_queue_head = ses.reply_queue_tail = NULL;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	509 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	510
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511 /* encrypt the writepayload, putting into writebuf, ready for write_packet()
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	512 * to put on the wire */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 void encrypt_packet() {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	515 unsigned char padlen;
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	516 unsigned char blocksize, mac_size;
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	517 buffer * writebuf; /* the packet which will go on the wire. This is
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	518 encrypted in-place. */
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	519 unsigned char packet_type;
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	520 unsigned int len, encrypt_buf_size;
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	521 unsigned char mac_bytes[MAX_MAC_LEN];
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	522
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	523 time_t now;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	525 TRACE2(("enter encrypt_packet()"))
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	526
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	527 buf_setpos(ses.writepayload, 0);
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	528 packet_type = buf_getbyte(ses.writepayload);
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	529 buf_setpos(ses.writepayload, 0);
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	530
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	531 TRACE2(("encrypt_packet type is %d", packet_type))
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	532
752 24172f555f9c Fix MAC bug which would prevent asymmetric hashes Matt Johnston <matt@ucc.asn.au> parents: 731 diff changeset	533 if ((!ses.dataallowed && !packet_is_okay_kex(packet_type))) {
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	534 /* During key exchange only particular packets are allowed.
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	535 Since this packet_type isn't OK we just enqueue it to send
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	536 after the KEX, see maybe_flush_reply_queue */
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	537 enqueue_reply_packet();
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	538 return;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	539 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	540
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	541 blocksize = ses.keys->trans.algo_crypt->blocksize;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	542 mac_size = ses.keys->trans.algo_mac->hashsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	543
605 53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	544 /* Encrypted packet len is payload+5. We need to then make sure
53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	545 * there is enough space for padding or MIN_PACKET_LEN.
53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	546 * Add extra 3 since we need at least 4 bytes of padding */
53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	547 encrypt_buf_size = (ses.writepayload->len+4+1)
53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	548 + MAX(MIN_PACKET_LEN, blocksize) + 3
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	549 /* add space for the MAC at the end */
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	550 + mac_size
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	551 #ifndef DISABLE_ZLIB
605 53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	552 /* some extra in case 'compression' makes it larger */
906 4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	553 + ZLIB_COMPRESS_EXPANSION
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	554 #endif
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	555 /* and an extra cleartext (stripped before transmission) byte for the
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	556 * packet type */
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	557 + 1;
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	558
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	559 writebuf = buf_new(encrypt_buf_size);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	560 buf_setlen(writebuf, PACKET_PAYLOAD_OFF);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	561 buf_setpos(writebuf, PACKET_PAYLOAD_OFF);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	562
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	563 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	564 /* compression */
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	565 if (is_compress_trans()) {
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	566 buf_compress(writebuf, ses.writepayload, ses.writepayload->len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	567 } else
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	568 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	569 {
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	570 memcpy(buf_getwriteptr(writebuf, ses.writepayload->len),
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	571 buf_getptr(ses.writepayload, ses.writepayload->len),
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	572 ses.writepayload->len);
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	573 buf_incrwritepos(writebuf, ses.writepayload->len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	574 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	575
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	576 /* finished with payload */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	577 buf_setpos(ses.writepayload, 0);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	578 buf_setlen(ses.writepayload, 0);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	579
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	580 /* length of padding - packet length must be a multiple of blocksize,
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	581 * with a minimum of 4 bytes of padding */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	582 padlen = blocksize - (writebuf->len) % blocksize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	583 if (padlen < 4) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	584 padlen += blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	585 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	586 /* check for min packet length */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	587 if (writebuf->len + padlen < MIN_PACKET_LEN) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	588 padlen += blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	589 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	590
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	591 buf_setpos(writebuf, 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	592 /* packet length excluding the packetlength uint32 */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	593 buf_putint(writebuf, writebuf->len + padlen - 4);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	594
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	595 /* padding len */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	596 buf_putbyte(writebuf, padlen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	597 /* actual padding */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	598 buf_setpos(writebuf, writebuf->len);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	599 buf_incrlen(writebuf, padlen);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	600 genrandom(buf_getptr(writebuf, padlen), padlen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	601
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	602 make_mac(ses.transseq, &ses.keys->trans, writebuf, writebuf->len, mac_bytes);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	603
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	604 /* do the actual encryption, in-place */
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	605 buf_setpos(writebuf, 0);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	606 /* encrypt it in-place*/
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	607 len = writebuf->len;
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	608 if (ses.keys->trans.crypt_mode->encrypt(
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	609 buf_getptr(writebuf, len),
528 378a6389f88e - Don't be dumb and encrypt/decrypt in a while() loop - why did I do this?? Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	610 buf_getwriteptr(writebuf, len),
378a6389f88e - Don't be dumb and encrypt/decrypt in a while() loop - why did I do this?? Matt Johnston <matt@ucc.asn.au> parents: 513 diff changeset	611 len,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	612 &ses.keys->trans.cipher_state) != CRYPT_OK) {
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 592 diff changeset	613 dropbear_exit("Error encrypting");
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	614 }
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	615 buf_incrpos(writebuf, len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	616
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	617 /* stick the MAC on it */
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	618 buf_putbytes(writebuf, mac_bytes, mac_size);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	619
592 afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	620 /* The last byte of the buffer stores the cleartext packet_type. It is not
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	621 * transmitted but is used for transmit timeout purposes */
afb089e70892 Don't reset last_packet_time when we're transmitting SSH_MSG_IGNORE packets Matt Johnston <matt@ucc.asn.au> parents: 568 diff changeset	622 buf_putbyte(writebuf, packet_type);
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	623 /* enqueue the packet for sending. It will get freed after transmission. */
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	624 buf_setpos(writebuf, 0);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	625 enqueue(&ses.writequeue, (void*)writebuf);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	626
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	627 /* Update counts */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	628 ses.kexstate.datatrans += writebuf->len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	629 ses.transseq++;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	630
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	631 now = monotonic_now();
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	632 ses.last_packet_time_any_sent = now;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	633 /* idle timeout shouldn't be affected by responses to keepalives.
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	634 send_msg_keepalive() itself also does tricks with
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	635 ses.last_packet_idle_time - read that if modifying this code */
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	636 if (packet_type != SSH_MSG_REQUEST_FAILURE
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	637 && packet_type != SSH_MSG_UNIMPLEMENTED
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	638 && packet_type != SSH_MSG_IGNORE) {
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	639 ses.last_packet_time_idle = now;
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	640
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	641 }
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	642
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	643 TRACE2(("leave encrypt_packet()"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	644 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	645
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	646
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	647 /* Create the packet mac, and append H(seqno\|clearbuf) to the output */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	648 /* output_mac must have ses.keys->trans.algo_mac->hashsize bytes. */
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	649 static void make_mac(unsigned int seqno, const struct key_context_directional * key_state,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	650 buffer * clear_buf, unsigned int clear_len,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	651 unsigned char *output_mac) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	652 unsigned char seqbuf[4];
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 194 diff changeset	653 unsigned long bufsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	654 hmac_state hmac;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	655
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	656 if (key_state->algo_mac->hashsize > 0) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	657 /* calculate the mac */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	658 if (hmac_init(&hmac,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	659 key_state->hash_index,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	660 key_state->mackey,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	661 key_state->algo_mac->keysize) != CRYPT_OK) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	662 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	663 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	664
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	665 /* sequence number */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	666 STORE32H(seqno, seqbuf);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	667 if (hmac_process(&hmac, seqbuf, 4) != CRYPT_OK) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	668 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	669 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	670
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	671 /* the actual contents */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	672 buf_setpos(clear_buf, 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	673 if (hmac_process(&hmac,
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	674 buf_getptr(clear_buf, clear_len),
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	675 clear_len) != CRYPT_OK) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	676 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	677 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	678
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	679 bufsize = MAX_MAC_LEN;
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	680 if (hmac_done(&hmac, output_mac, &bufsize) != CRYPT_OK) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	681 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	682 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	683 }
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	684 TRACE2(("leave writemac"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	685 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	686
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	687 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	688 /* compresses len bytes from src, outputting to dest (starting from the
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	689 * respective current positions. */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	690 static void buf_compress(buffer * dest, buffer * src, unsigned int len) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	691
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	692 unsigned int endpos = src->pos + len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	693 int result;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	694
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	695 TRACE2(("enter buf_compress"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	696
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	697 while (1) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	698
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	699 ses.keys->trans.zstream->avail_in = endpos - src->pos;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	700 ses.keys->trans.zstream->next_in =
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	701 buf_getptr(src, ses.keys->trans.zstream->avail_in);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	702
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	703 ses.keys->trans.zstream->avail_out = dest->size - dest->pos;
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	704 ses.keys->trans.zstream->next_out =
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	705 buf_getwriteptr(dest, ses.keys->trans.zstream->avail_out);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	706
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	707 result = deflate(ses.keys->trans.zstream, Z_SYNC_FLUSH);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	708
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	709 buf_setpos(src, endpos - ses.keys->trans.zstream->avail_in);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	710 buf_setlen(dest, dest->size - ses.keys->trans.zstream->avail_out);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	711 buf_setpos(dest, dest->len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	712
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	713 if (result != Z_OK) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	714 dropbear_exit("zlib error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	715 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	716
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	717 if (ses.keys->trans.zstream->avail_in == 0) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	718 break;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	719 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	720
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	721 dropbear_assert(ses.keys->trans.zstream->avail_out == 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	722
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	723 /* the buffer has been filled, we must extend. This only happens in
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	724 * unusual circumstances where the data grows in size after deflate(),
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	725 * but it is possible */
906 4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	726 buf_resize(dest, dest->size + ZLIB_COMPRESS_EXPANSION);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	727
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	728 }
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	729 TRACE2(("leave buf_compress"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	730 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	731 #endif

Mercurial > dropbear

annotate packet.c @ 1027:daf21fd50abf fastopen