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