dropbear: packet.c annotate

annotate packet.c @ 1788:1fc0012b9c38

Fix handling of replies to global requests (#112) The current code assumes that all global requests want / need a reply. This isn't always true and the request itself indicates if it wants a reply or not. It causes a specific problem with [email protected] messages. These are sent by OpenSSH after authentication to inform the client of potential other host keys for the host. This can be used to add a new type of host key or to rotate host keys. The initial information message from the server is sent as a global request, but with want_reply set to false. This means that the server doesn't expect an answer to this message. Instead the client needs to send a prove request as a reply if it wants to receive proof of ownership for the host keys. The bug doesn't cause any current problems with due to how OpenSSH treats receiving the failure message. It instead treats it as a keepalive message and further ignores it. Arguably this is a protocol violation though of Dropbear and it is only accidental that it doesn't cause a problem with OpenSSH. The bug was found when adding host keys support to libssh, which is more strict protocol wise and treats the unexpected failure message an error, also see https://gitlab.com/libssh/libssh-mirror/-/merge_requests/145 for more information. The fix here is to honor the want_reply flag in the global request and to only send a reply if the other side expects a reply.

author	Dirkjan Bussink <d.bussink@gmail.com>
date	Thu, 10 Dec 2020 16:13:13 +0100
parents	3b9b427925a0
children

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"
1032 0da8ba489c23 Move generic network routines to netio.c Matt Johnston <matt@ucc.asn.au> parents: 1027 diff changeset	37 #include "netio.h"
1347 b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	38 #include "runopts.h"
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1250 diff changeset	40 static int read_packet_init(void);
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	41 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	42 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	43 unsigned char *output_mac);
1276 9169e4e7cbee fix empty C prototypes Francois Perrad <francois.perrad@gadz.org> parents: 1250 diff changeset	44 static int checkmac(void);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45
906 4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	46 /* 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	47 * 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	48 * 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	49 * exact multiple. */
4696755c4cac A few fixes for cases where compression increases payload sizes, and Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	50 #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	51 #define ZLIB_DECOMPRESS_INCR 1024
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	52 #ifndef DISABLE_ZLIB
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1276 diff changeset	53 static buffer* buf_decompress(const buffer* buf, unsigned int len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 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	55 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
531 164b7c2cd5df disapproval of revision 'a101cbd046507cf723e6362a49196dbd4b924042' Matt Johnston <matt@ucc.asn.au> parents: 529 diff changeset	57 /* non-blocking function writing out a current encrypted packet */
164b7c2cd5df disapproval of revision 'a101cbd046507cf723e6362a49196dbd4b924042' Matt Johnston <matt@ucc.asn.au> parents: 529 diff changeset	58 void write_packet() {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59
1024 aac0095dc3b4 work in progress for async connect Matt Johnston <matt@ucc.asn.au> parents: 990 diff changeset	60 ssize_t written;
1618 7bd7e95ad1f8 make writev #include consistent for variable declarations too Matt Johnston <matt@ucc.asn.au> parents: 1489 diff changeset	61 #if defined(HAVE_WRITEV) && (defined(IOV_MAX) \|\| defined(UIO_MAXIOV))
1072 686cd3e8e13e avoid malloc for iovec Matt Johnston <matt@ucc.asn.au> parents: 1057 diff changeset	62 /* 50 is somewhat arbitrary */
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	63 unsigned int iov_count = 50;
1072 686cd3e8e13e avoid malloc for iovec Matt Johnston <matt@ucc.asn.au> parents: 1057 diff changeset	64 struct iovec iov[50];
1079 acf444bcb115 Fix no-writev fallback Matt Johnston <matt@ucc.asn.au> parents: 1074 diff changeset	65 #else
acf444bcb115 Fix no-writev fallback Matt Johnston <matt@ucc.asn.au> parents: 1074 diff changeset	66 int len;
acf444bcb115 Fix no-writev fallback Matt Johnston <matt@ucc.asn.au> parents: 1074 diff changeset	67 buffer* writebuf;
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	68 #endif
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	70 TRACE2(("enter write_packet"))
531 164b7c2cd5df disapproval of revision 'a101cbd046507cf723e6362a49196dbd4b924042' Matt Johnston <matt@ucc.asn.au> parents: 529 diff changeset	71 dropbear_assert(!isempty(&ses.writequeue));
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
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	73 #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	74
1072 686cd3e8e13e avoid malloc for iovec Matt Johnston <matt@ucc.asn.au> parents: 1057 diff changeset	75 packet_queue_to_iovec(&ses.writequeue, iov, &iov_count);
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	76 /* This may return EAGAIN. The main loop sometimes
c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	77 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	78 it's likely to be necessary */
1558 2f64cb3d3007 - #if not #ifdef for DROPBEAR_FUZZ Matt Johnston <matt@ucc.asn.au> parents: 1511 diff changeset	79 #if DROPBEAR_FUZZ
1348 5c2899e35b63 fuzz harness Matt Johnston <matt@ucc.asn.au> parents: 1347 diff changeset	80 if (fuzz.fuzzing) {
1559 92c93b4a3646 Fix to be able to compile normal(ish) binaries with --enable-fuzz Matt Johnston <matt@ucc.asn.au> parents: 1558 diff changeset	81 /* pretend to write one packet at a time */
92c93b4a3646 Fix to be able to compile normal(ish) binaries with --enable-fuzz Matt Johnston <matt@ucc.asn.au> parents: 1558 diff changeset	82 /* TODO(fuzz): randomise amount written based on the fuzz input */
1347 b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	83 written = iov[0].iov_len;
b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	84 }
b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	85 else
b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	86 #endif
b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	87 {
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	88 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	89 if (written < 0) {
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	90 if (errno == EINTR \|\| errno == EAGAIN) {
1026 59a1146e8b9d generalise write iovec handling Matt Johnston <matt@ucc.asn.au> parents: 1025 diff changeset	91 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	92 return;
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	93 } else {
932 3873b39c4de6 Print errno information in write_packet Ronny Meeus <ronny.meeus@gmail.com> parents: 928 diff changeset	94 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	95 }
926 b8208506322e Use AUTH_TIMEOUT only before authdone != 1. Yousong Zhou <yszhou4tech@gmail.com> parents: 906 diff changeset	96 }
1347 b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	97 }
1026 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 packet_queue_consume(&ses.writequeue, written);
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	100 ses.writequeue_len -= written;
728 f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	101
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	102 if (written == 0) {
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	103 ses.remoteclosed();
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	104 }
f27058078d61 Try using writev() for writing packets out to tcp Matt Johnston <matt@ucc.asn.au> parents: 711 diff changeset	105
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	106 #else /* No writev () */
1558 2f64cb3d3007 - #if not #ifdef for DROPBEAR_FUZZ Matt Johnston <matt@ucc.asn.au> parents: 1511 diff changeset	107 #if DROPBEAR_FUZZ
1347 b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	108 _Static_assert(0, "No fuzzing code for no-writev writes");
b28624698130 copy over some fuzzing code from AFL branch Matt Johnston <matt@ucc.asn.au> parents: 1276 diff changeset	109 #endif
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 /* 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	111 writebuf = (buffer*)examine(&ses.writequeue);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112
1577 399d8eb961b5 get rid of unused packet_type in encrypted write queue Matt Johnston <matt@ucc.asn.au> parents: 1559 diff changeset	113 len = writebuf->len - writebuf->pos;
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 232 diff changeset	114 dropbear_assert(len > 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 /* 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	116 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	117
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 if (written < 0) {
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	119 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	120 TRACE2(("leave writepacket: EINTR"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 return;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 } else {
932 3873b39c4de6 Print errno information in write_packet Ronny Meeus <ronny.meeus@gmail.com> parents: 928 diff changeset	123 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	124 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 if (written == 0) {
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	128 ses.remoteclosed();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	131 ses.writequeue_len -= written;
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	132
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 if (written == len) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134 /* 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	135 dequeue(&ses.writequeue);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	136 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	137 writebuf = NULL;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138 } else {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 /* 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	140 buf_incrpos(writebuf, written);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 }
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	142 #endif /* writev */
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	144 TRACE2(("leave write_packet"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147 /* 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	148 * 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	149 * full portion if possible */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 void read_packet() {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 int len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 unsigned int maxlen;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 unsigned char blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	156 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	157 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	158
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159 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	160 int ret;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 /* In the first blocksize of a packet */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 /* 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	164 * 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	165 ret = read_packet_init();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	167 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	168 /* 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	169 TRACE2(("leave read_packet: packetinit done"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 return;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	174 /* 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	175 * mightn't be any available (EAGAIN) */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 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	177 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	178 /* 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	179 * 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	180 */
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	181 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	182 } 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	183 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	184
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	185 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	186 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	187 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188
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	189 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	190 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	191 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	192 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	193 } 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	194 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	195 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 }
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	197
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	198 buf_incrpos(ses.readbuf, len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 if ((unsigned int)len == maxlen) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 /* The whole packet has been read */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 decrypt_packet();
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 /* The main select() loop process_packet() to
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 * handle the packet contents... */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206 }
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	207 TRACE2(("leave read_packet"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 /* 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	211 * 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	212 /* 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	213 * DROPBEAR_FAILURE otherwise */
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	214 static int read_packet_init() {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 unsigned int maxlen;
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	217 int slen;
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	218 unsigned int len, plen;
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	219 unsigned int blocksize;
005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	220 unsigned int macsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	223 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	224 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	225
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 if (ses.readbuf == NULL) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 /* start of a new packet */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 ses.readbuf = buf_new(INIT_READBUF);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 maxlen = blocksize - ses.readbuf->pos;
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 /* read the rest of the packet if possible */
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	234 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	235 maxlen);
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	236 if (slen == 0) {
33 f789045062e6 Progressing client support Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	237 ses.remoteclosed();
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 }
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	239 if (slen < 0) {
957 c4f138dae2fd Test for EAGAIN too Matt Johnston <matt@ucc.asn.au> parents: 939 diff changeset	240 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	241 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	242 return DROPBEAR_FAILURE;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 }
594 a98a2138364a Improve capitalisation for all logged strings Matt Johnston <matt@ucc.asn.au> parents: 592 diff changeset	244 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	245 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	247 buf_incrwritepos(ses.readbuf, slen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	248
568 005530560594 Rearrange getaddrstring() etc Matt Johnston <matt@ucc.asn.au> parents: 556 diff changeset	249 if ((unsigned int)slen != maxlen) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 /* 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	251 return DROPBEAR_FAILURE;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 /* 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	255 * 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	256 buf_setpos(ses.readbuf, 0);
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	257 #if DROPBEAR_AEAD_MODE
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	258 if (ses.keys->recv.crypt_mode->aead_crypt) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	259 if (ses.keys->recv.crypt_mode->aead_getlength(ses.recvseq,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	260 buf_getptr(ses.readbuf, blocksize), &plen,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	261 blocksize,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	262 &ses.keys->recv.cipher_state) != CRYPT_OK) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	263 dropbear_exit("Error decrypting");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	264 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	265 len = plen + 4 + macsize;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	266 } else
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	267 #endif
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	268 {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	269 if (ses.keys->recv.crypt_mode->decrypt(buf_getptr(ses.readbuf, blocksize),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	270 buf_getwriteptr(ses.readbuf, blocksize),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	271 blocksize,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	272 &ses.keys->recv.cipher_state) != CRYPT_OK) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	273 dropbear_exit("Error decrypting");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	274 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	275 plen = buf_getint(ses.readbuf) + 4;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	276 len = plen + macsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278
990 e3614649b1f5 Integrity error (bad packet size %u) negative length Fedor Brunner <fedor.brunner@azet.sk> parents: 957 diff changeset	279 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	280
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	281
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	282 /* 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	283 if ((len > RECV_MAX_PACKET_LEN) \|\|
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	284 (plen < blocksize) \|\|
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	285 (plen % blocksize != 0)) {
990 e3614649b1f5 Integrity error (bad packet size %u) negative length Fedor Brunner <fedor.brunner@azet.sk> parents: 957 diff changeset	286 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	287 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	289 if (len > ses.readbuf->size) {
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	290 ses.readbuf = buf_resize(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	291 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 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	293 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	294 return DROPBEAR_SUCCESS;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	297 /* handle the received packet */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	298 void decrypt_packet() {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	299
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	300 unsigned char blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	301 unsigned char macsize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 unsigned int padlen;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 unsigned int len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	305 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	306 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	307 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	308
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 ses.kexstate.datarecv += ses.readbuf->len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	311 #if DROPBEAR_AEAD_MODE
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	312 if (ses.keys->recv.crypt_mode->aead_crypt) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	313 /* first blocksize is not decrypted yet */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	314 buf_setpos(ses.readbuf, 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	316 /* decrypt it in-place */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	317 len = ses.readbuf->len - macsize - ses.readbuf->pos;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	318 if (ses.keys->recv.crypt_mode->aead_crypt(ses.recvseq,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	319 buf_getptr(ses.readbuf, len + macsize),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	320 buf_getwriteptr(ses.readbuf, len),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	321 len, macsize,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	322 &ses.keys->recv.cipher_state, LTC_DECRYPT) != CRYPT_OK) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	323 dropbear_exit("Error decrypting");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	324 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	325 buf_incrpos(ses.readbuf, len);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	326 } else
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	327 #endif
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	328 {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	329 /* we've already decrypted the first blocksize in read_packet_init */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	330 buf_setpos(ses.readbuf, blocksize);
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	331
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	332 /* decrypt it in-place */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	333 len = ses.readbuf->len - macsize - ses.readbuf->pos;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	334 if (ses.keys->recv.crypt_mode->decrypt(
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	335 buf_getptr(ses.readbuf, len),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	336 buf_getwriteptr(ses.readbuf, len),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	337 len,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	338 &ses.keys->recv.cipher_state) != CRYPT_OK) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	339 dropbear_exit("Error decrypting");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	340 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	341 buf_incrpos(ses.readbuf, len);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	342
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	343 /* check the hmac */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	344 if (checkmac() != DROPBEAR_SUCCESS) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	345 dropbear_exit("Integrity error");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	346 }
1751 3b9b427925a0 Load password and key for client fuzzer. Matt Johnston <matt@ucc.asn.au> parents: 1672 diff changeset	347
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348 }
1751 3b9b427925a0 Load password and key for client fuzzer. Matt Johnston <matt@ucc.asn.au> parents: 1672 diff changeset	349
3b9b427925a0 Load password and key for client fuzzer. Matt Johnston <matt@ucc.asn.au> parents: 1672 diff changeset	350 #if DROPBEAR_FUZZ
3b9b427925a0 Load password and key for client fuzzer. Matt Johnston <matt@ucc.asn.au> parents: 1672 diff changeset	351 fuzz_dump(ses.readbuf->data, ses.readbuf->len);
3b9b427925a0 Load password and key for client fuzzer. Matt Johnston <matt@ucc.asn.au> parents: 1672 diff changeset	352 #endif
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354 /* 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	355 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	356 padlen = buf_getbyte(ses.readbuf);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	357
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	358 /* payload length */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	359 /* - 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	360 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	361 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	362 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	363 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	365 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	366
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 #ifndef DISABLE_ZLIB
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	368 if (is_compress_recv()) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 /* decompress */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	370 ses.payload = buf_decompress(ses.readbuf, len);
1055 4d7b4c5526c5 A bit of a bodge to avoid memcpy if zlib is disabled Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	371 buf_setpos(ses.payload, 0);
4d7b4c5526c5 A bit of a bodge to avoid memcpy if zlib is disabled Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	372 ses.payload_beginning = 0;
4d7b4c5526c5 A bit of a bodge to avoid memcpy if zlib is disabled Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	373 buf_free(ses.readbuf);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374 } else
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 {
1055 4d7b4c5526c5 A bit of a bodge to avoid memcpy if zlib is disabled Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	377 ses.payload = ses.readbuf;
4d7b4c5526c5 A bit of a bodge to avoid memcpy if zlib is disabled Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	378 ses.payload_beginning = ses.payload->pos;
4d7b4c5526c5 A bit of a bodge to avoid memcpy if zlib is disabled Matt Johnston <matt@ucc.asn.au> parents: 1032 diff changeset	379 buf_setlen(ses.payload, ses.payload->pos + len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 }
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	381 ses.readbuf = NULL;
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 ses.recvseq++;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	384
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	385 TRACE2(("leave decrypt_packet"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 }
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 /* 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	389 * 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	390 static int checkmac() {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	391
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	392 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	393 unsigned int mac_size, contents_len;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	394
752 24172f555f9c Fix MAC bug which would prevent asymmetric hashes Matt Johnston <matt@ucc.asn.au> parents: 731 diff changeset	395 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	396 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	397
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, 0);
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	399 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	400
1558 2f64cb3d3007 - #if not #ifdef for DROPBEAR_FUZZ Matt Johnston <matt@ucc.asn.au> parents: 1511 diff changeset	401 #if DROPBEAR_FUZZ
1357 08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	402 if (fuzz.fuzzing) {
1597 8f7b6f75aa58 fix uninitialised memory in fuzzer codepath Matt Johnston <matt@ucc.asn.au> parents: 1577 diff changeset	403 /* fail 1 in 2000 times to test error path. */
8f7b6f75aa58 fix uninitialised memory in fuzzer codepath Matt Johnston <matt@ucc.asn.au> parents: 1577 diff changeset	404 unsigned int value = 0;
8f7b6f75aa58 fix uninitialised memory in fuzzer codepath Matt Johnston <matt@ucc.asn.au> parents: 1577 diff changeset	405 if (mac_size > sizeof(value)) {
8f7b6f75aa58 fix uninitialised memory in fuzzer codepath Matt Johnston <matt@ucc.asn.au> parents: 1577 diff changeset	406 memcpy(&value, mac_bytes, sizeof(value));
8f7b6f75aa58 fix uninitialised memory in fuzzer codepath Matt Johnston <matt@ucc.asn.au> parents: 1577 diff changeset	407 }
1408 27e65d3aed5f fix checkmac always failing pre-kex Matt Johnston <matt@ucc.asn.au> parents: 1357 diff changeset	408 if (value % 2000 == 99) {
1357 08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	409 return DROPBEAR_FAILURE;
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	410 }
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	411 return DROPBEAR_SUCCESS;
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	412 }
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	413 #endif
08f4fa4dc6a0 closer to working Matt Johnston <matt@ucc.asn.au> parents: 1348 diff changeset	414
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 /* 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	416 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	417 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	418 return DROPBEAR_FAILURE;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419 } else {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 return DROPBEAR_SUCCESS;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421 }
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
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 /* returns a pointer to a newly created buffer */
1459 06d52bcb8094 Pointer parameter could be declared as pointing to const Francois Perrad <francois.perrad@gadz.org> parents: 1276 diff changeset	426 static buffer* buf_decompress(const buffer* buf, unsigned int len) {
27 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 int result;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 buffer * ret;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430 z_streamp zstream;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	432 zstream = ses.keys->recv.zstream;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	433 ret = buf_new(len);
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 zstream->avail_in = len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 zstream->next_in = buf_getptr(buf, len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 /* 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	439 while (1) {
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 zstream->avail_out = ret->size - ret->pos;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	442 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	443
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 result = inflate(zstream, Z_SYNC_FLUSH);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	445
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 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	447 buf_setpos(ret, ret->len);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 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	450 dropbear_exit("zlib error");
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 if (zstream->avail_in == 0 &&
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 (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	455 /* 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	456 * and there's no remaining input */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 return ret;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	458 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	460 if (zstream->avail_out == 0) {
791 0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	461 int new_size = 0;
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	462 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	463 /* 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	464 * yet didn't finish up the decompression */
791 0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	465 dropbear_exit("bad packet, oversized decompressed");
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	466 }
0bf76f54de6f Limit decompressed size Matt Johnston <matt@ucc.asn.au> parents: 753 diff changeset	467 new_size = MIN(RECV_MAX_PAYLOAD_LEN, ret->size + ZLIB_DECOMPRESS_INCR);
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	468 ret = buf_resize(ret, new_size);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	469 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	470 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	471 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	472 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	475 /* 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	476 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	477 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	478 return 0;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	479 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	480 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	481 return 0;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	482 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	483 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	484 /* 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	485 return 0;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	486 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	487 return 1;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	488 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489
452 4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	490 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	491 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	492 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	493 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	494
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	495 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	496 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	497 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	498
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	499 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	500 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	501 } else {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	502 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	503 }
456 f6c999ba31da Fix delayed packet queue handling Matt Johnston <matt@ucc.asn.au> parents: 454 diff changeset	504 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	505 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	506
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	507 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	508 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	509 if (!ses.dataallowed)
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	510 {
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	511 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	512 return;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	513 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	514
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	515 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	516 CHECKCLEARTOWRITE();
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	517 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	518 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	519
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	520 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	521 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	522 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	523 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	524 encrypt_packet();
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	525 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	526 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	527 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	528
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529 /* 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	530 * to put on the wire */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	531 void encrypt_packet() {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	532
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533 unsigned char padlen;
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	534 unsigned char blocksize, mac_size;
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	535 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	536 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	537 unsigned char packet_type;
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	538 unsigned int len, encrypt_buf_size;
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	539 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	540
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	541 time_t now;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	542
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	543 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	544
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	545 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	546 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	547 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	548
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	549 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	550
752 24172f555f9c Fix MAC bug which would prevent asymmetric hashes Matt Johnston <matt@ucc.asn.au> parents: 731 diff changeset	551 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	552 /* 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	553 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	554 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	555 enqueue_reply_packet();
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	556 return;
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	557 }
4cab61369879 Prevent invalid packets being sent during key-exchange, instead queue Matt Johnston <matt@ucc.asn.au> parents: 448 diff changeset	558
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	559 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	560 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	561
605 53c21d4ec98a - Don't allow setting memLevel since that doesn't work properly Matt Johnston <matt@ucc.asn.au> parents: 594 diff changeset	562 /* 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	563 * 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	564 * 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	565 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	566 + 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	567 /* 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	568 + 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	569 #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	570 /* 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	571 + 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	572 #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	573 /* 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	574 * 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	575 + 1;
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	576
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	577 writebuf = buf_new(encrypt_buf_size);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	578 buf_setlen(writebuf, PACKET_PAYLOAD_OFF);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	579 buf_setpos(writebuf, PACKET_PAYLOAD_OFF);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	580
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	581 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	582 /* compression */
501 d58c478bd399 Add support for [email protected] delayed compression. Matt Johnston <matt@ucc.asn.au> parents: 479 diff changeset	583 if (is_compress_trans()) {
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	584 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	585 } else
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	586 #endif
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	587 {
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	588 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	589 buf_getptr(ses.writepayload, ses.writepayload->len),
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	590 ses.writepayload->len);
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	591 buf_incrwritepos(writebuf, ses.writepayload->len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	592 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	593
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	594 /* finished with payload */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	595 buf_setpos(ses.writepayload, 0);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	596 buf_setlen(ses.writepayload, 0);
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	597
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	598 /* length of padding - packet length excluding the packetlength uint32
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	599 * field in aead mode must be a multiple of blocksize, with a minimum of
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	600 * 4 bytes of padding */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	601 len = writebuf->len;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	602 #if DROPBEAR_AEAD_MODE
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	603 if (ses.keys->trans.crypt_mode->aead_crypt) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	604 len -= 4;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	605 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	606 #endif
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	607 padlen = blocksize - len % blocksize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	608 if (padlen < 4) {
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	609 padlen += blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	610 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	611 /* check for min packet length */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	612 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	613 padlen += blocksize;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	614 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	615
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	616 buf_setpos(writebuf, 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	617 /* 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	618 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	619
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	620 /* padding len */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	621 buf_putbyte(writebuf, padlen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	622 /* actual padding */
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	623 buf_setpos(writebuf, writebuf->len);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	624 buf_incrlen(writebuf, padlen);
805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	625 genrandom(buf_getptr(writebuf, padlen), padlen);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	626
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	627 #if DROPBEAR_AEAD_MODE
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	628 if (ses.keys->trans.crypt_mode->aead_crypt) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	629 /* do the actual encryption, in-place */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	630 buf_setpos(writebuf, 0);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	631 /* encrypt it in-place*/
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	632 len = writebuf->len;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	633 buf_incrlen(writebuf, mac_size);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	634 if (ses.keys->trans.crypt_mode->aead_crypt(ses.transseq,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	635 buf_getptr(writebuf, len),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	636 buf_getwriteptr(writebuf, len + mac_size),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	637 len, mac_size,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	638 &ses.keys->trans.cipher_state, LTC_ENCRYPT) != CRYPT_OK) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	639 dropbear_exit("Error encrypting");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	640 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	641 buf_incrpos(writebuf, len + mac_size);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	642 } else
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	643 #endif
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	644 {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	645 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	646
1672 3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	647 /* do the actual encryption, in-place */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	648 buf_setpos(writebuf, 0);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	649 /* encrypt it in-place*/
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	650 len = writebuf->len;
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	651 if (ses.keys->trans.crypt_mode->encrypt(
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	652 buf_getptr(writebuf, len),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	653 buf_getwriteptr(writebuf, len),
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	654 len,
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	655 &ses.keys->trans.cipher_state) != CRYPT_OK) {
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	656 dropbear_exit("Error encrypting");
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	657 }
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	658 buf_incrpos(writebuf, len);
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	659
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	660 /* stick the MAC on it */
3a97f14c0235 Add Chacha20-Poly1305, AES128-GCM and AES256-GCM support (#93) Vladislav Grishenko <themiron@users.noreply.github.com> parents: 1632 diff changeset	661 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	662 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	663
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	664 /* Update counts */
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	665 ses.kexstate.datatrans += writebuf->len;
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	666
1577 399d8eb961b5 get rid of unused packet_type in encrypted write queue Matt Johnston <matt@ucc.asn.au> parents: 1559 diff changeset	667 writebuf_enqueue(writebuf);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	668
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	669 /* Update counts */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	670 ses.transseq++;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	671
939 a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	672 now = monotonic_now();
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	673 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	674 /* 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	675 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	676 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	677 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	678 && packet_type != SSH_MSG_UNIMPLEMENTED
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	679 && packet_type != SSH_MSG_IGNORE) {
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	680 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	681
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 diff changeset	682 }
a0819ecfee0b Make -K keepalive behave like OpenSSH's ServerAliveInterval Matt Johnston <matt@ucc.asn.au> parents: 934 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 encrypt_packet()"))
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
1577 399d8eb961b5 get rid of unused packet_type in encrypted write queue Matt Johnston <matt@ucc.asn.au> parents: 1559 diff changeset	687 void writebuf_enqueue(buffer * writebuf) {
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	688 /* enqueue the packet for sending. It will get freed after transmission. */
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	689 buf_setpos(writebuf, 0);
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	690 enqueue(&ses.writequeue, (void*)writebuf);
1577 399d8eb961b5 get rid of unused packet_type in encrypted write queue Matt Johnston <matt@ucc.asn.au> parents: 1559 diff changeset	691 ses.writequeue_len += writebuf->len;
1074 10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	692 }
10f198d4a308 Make main socket nonblocking. Limit writequeue size. Matt Johnston <matt@ucc.asn.au> parents: 1072 diff changeset	693
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	694
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	695 /* 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	696 /* 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	697 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	698 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	699 unsigned char *output_mac) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	700 unsigned char seqbuf[4];
228 5e4110bb753a - Fixed twofish algorithm naming so it actually works. Matt Johnston <matt@ucc.asn.au> parents: 194 diff changeset	701 unsigned long bufsize;
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	702 hmac_state hmac;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	703
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	704 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	705 /* calculate the mac */
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	706 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	707 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	708 key_state->mackey,
0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	709 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	710 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	711 }
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 /* sequence number */
534 0431915df79f - Get rid of decryptreadbuf, just decrypt in-place with readbuf Matt Johnston <matt@ucc.asn.au> parents: 533 diff changeset	714 STORE32H(seqno, seqbuf);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	715 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	716 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	717 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	718
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	719 /* 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	720 buf_setpos(clear_buf, 0);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	721 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	722 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	723 clear_len) != CRYPT_OK) {
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	724 dropbear_exit("HMAC error");
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	725 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	726
1249 c6346c63281b refactor indentation with hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1079 diff changeset	727 bufsize = MAX_MAC_LEN;
533 805ae74ec024 Encrypt in-place, avoid an extra malloc Matt Johnston <matt@ucc.asn.au> parents: 532 diff changeset	728 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	729 dropbear_exit("HMAC error");
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 }
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	732 TRACE2(("leave writemac"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	733 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	734
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	735 #ifndef DISABLE_ZLIB
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	736 /* compresses len bytes from src, outputting to dest (starting from the
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	737 * respective current positions. dest must have sufficient space,
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	738 * len+ZLIB_COMPRESS_EXPANSION */
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	739 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	740
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	741 unsigned int endpos = src->pos + len;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	742 int result;
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	743
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	744 TRACE2(("enter buf_compress"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	745
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	746 dropbear_assert(dest->size - dest->pos >= len+ZLIB_COMPRESS_EXPANSION);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	747
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	748 ses.keys->trans.zstream->avail_in = endpos - src->pos;
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	749 ses.keys->trans.zstream->next_in =
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	750 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	751
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	752 ses.keys->trans.zstream->avail_out = dest->size - dest->pos;
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	753 ses.keys->trans.zstream->next_out =
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	754 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	755
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	756 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	757
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	758 buf_setpos(src, endpos - ses.keys->trans.zstream->avail_in);
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	759 buf_setlen(dest, dest->size - ses.keys->trans.zstream->avail_out);
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	760 buf_setpos(dest, dest->len);
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	761
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	762 if (result != Z_OK) {
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	763 dropbear_exit("zlib error");
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	764 }
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	765
1057 16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	766 /* fails if destination buffer wasn't large enough */
16584026a1f0 allocate buffer and data in a single allocation Matt Johnston <matt@ucc.asn.au> parents: 1055 diff changeset	767 dropbear_assert(ses.keys->trans.zstream->avail_in == 0);
731 9a5438271556 Move the more verbose TRACE() statements into TRACE2() Matt Johnston <matt@ucc.asn.au> parents: 728 diff changeset	768 TRACE2(("leave buf_compress"))
27 08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	769 }
08da099e8337 - Rename common-packet.c to packet.c Matt Johnston <matt@ucc.asn.au> parents: diff changeset	770 #endif

Mercurial > dropbear

annotate packet.c @ 1788:1fc0012b9c38