comparison sysoptions.h @ 641:2b1bb792cd4d dropbear-tfm

- Update tfm changes to current default tip
author Matt Johnston <matt@ucc.asn.au>
date Mon, 21 Nov 2011 19:52:28 +0800
parents 3f12086c2ef2
children c015af8a71cf
comparison
equal deleted inserted replaced
640:76097ec1a29a 641:2b1bb792cd4d
2 * You shouldn't edit this file unless you know you need to. 2 * You shouldn't edit this file unless you know you need to.
3 * This file is only included from options.h 3 * This file is only included from options.h
4 *******************************************************************/ 4 *******************************************************************/
5 5
6 #ifndef DROPBEAR_VERSION 6 #ifndef DROPBEAR_VERSION
7 #define DROPBEAR_VERSION "0.52" 7 #define DROPBEAR_VERSION "2011.54"
8 #endif 8 #endif
9 9
10 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION 10 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION
11 #define PROGNAME "dropbear" 11 #define PROGNAME "dropbear"
12 12
58 #define DROPBEAR_SUCCESS 0 58 #define DROPBEAR_SUCCESS 0
59 #define DROPBEAR_FAILURE -1 59 #define DROPBEAR_FAILURE -1
60 60
61 /* various algorithm identifiers */ 61 /* various algorithm identifiers */
62 #define DROPBEAR_KEX_DH_GROUP1 0 62 #define DROPBEAR_KEX_DH_GROUP1 0
63 #define DROPBEAR_KEX_DH_GROUP14 1
63 64
64 #define DROPBEAR_SIGNKEY_ANY 0 65 #define DROPBEAR_SIGNKEY_ANY 0
65 #define DROPBEAR_SIGNKEY_RSA 1 66 #define DROPBEAR_SIGNKEY_RSA 1
66 #define DROPBEAR_SIGNKEY_DSS 2 67 #define DROPBEAR_SIGNKEY_DSS 2
67 #define DROPBEAR_SIGNKEY_NONE 3 68 #define DROPBEAR_SIGNKEY_NONE 3
96 for algos) but seems valid */ 97 for algos) but seems valid */
97 98
98 #define MAX_PROPOSED_ALGO 20 99 #define MAX_PROPOSED_ALGO 20
99 100
100 /* size/count limits */ 101 /* size/count limits */
102 /* From transport rfc */
101 #define MIN_PACKET_LEN 16 103 #define MIN_PACKET_LEN 16
102 104
103 #define RECV_MAX_PACKET_LEN (MAX(35000, ((RECV_MAX_PAYLOAD_LEN)+100))) 105 #define RECV_MAX_PACKET_LEN (MAX(35000, ((RECV_MAX_PAYLOAD_LEN)+100)))
104 106
105 /* for channel code */ 107 /* for channel code */
120 #define MAX_PUBKEY_SIZE 1700 122 #define MAX_PUBKEY_SIZE 1700
121 /* For a 4096 bit DSS key, empirically determined */ 123 /* For a 4096 bit DSS key, empirically determined */
122 #define MAX_PRIVKEY_SIZE 1700 124 #define MAX_PRIVKEY_SIZE 1700
123 125
124 /* The maximum size of the bignum portion of the kexhash buffer */ 126 /* The maximum size of the bignum portion of the kexhash buffer */
125 /* Sect. 8 of the transport draft, K_S + e + f + K */ 127 /* Sect. 8 of the transport rfc 4253, K_S + e + f + K */
126 #define KEXHASHBUF_MAX_INTS (1700 + 130 + 130 + 130) 128 #define KEXHASHBUF_MAX_INTS (1700 + 130 + 130 + 130)
127 129
128 #define DROPBEAR_MAX_SOCKS 2 /* IPv4, IPv6 are all we'll get for now. Revisit 130 #define DROPBEAR_MAX_SOCKS 2 /* IPv4, IPv6 are all we'll get for now. Revisit
129 in a few years time.... */ 131 in a few years time.... */
130 132
144 146
145 #ifndef ENABLE_X11FWD 147 #ifndef ENABLE_X11FWD
146 #define DISABLE_X11FWD 148 #define DISABLE_X11FWD
147 #endif 149 #endif
148 150
149 #ifndef ENABLE_AGENTFWD
150 #define DISABLE_AGENTFWD
151 #endif
152
153 #if defined(ENABLE_CLI_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD) 151 #if defined(ENABLE_CLI_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD)
154 #define ENABLE_CLI_ANYTCPFWD 152 #define ENABLE_CLI_ANYTCPFWD
155 #endif 153 #endif
156 154
157 #if defined(ENABLE_CLI_LOCALTCPFWD) || defined(ENABLE_SVR_REMOTETCPFWD) 155 #if defined(ENABLE_CLI_LOCALTCPFWD) || defined(ENABLE_SVR_REMOTETCPFWD)
158 #define DROPBEAR_TCP_ACCEPT 156 #define DROPBEAR_TCP_ACCEPT
159 #endif 157 #endif
160 158
161 #if defined(ENABLE_CLI_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD) || \ 159 #if defined(ENABLE_CLI_REMOTETCPFWD) || defined(ENABLE_CLI_LOCALTCPFWD) || \
162 defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_SVR_LOCALTCPFWD) || \ 160 defined(ENABLE_SVR_REMOTETCPFWD) || defined(ENABLE_SVR_LOCALTCPFWD) || \
163 defined(ENABLE_AGENTFWD) || defined(ENABLE_X11FWD) 161 defined(ENABLE_SVR_AGENTFWD) || defined(ENABLE_X11FWD)
164 #define USING_LISTENERS 162 #define USING_LISTENERS
163 #endif
164
165 #if defined(ENABLE_SVR_AGENTFWD) || defined(ENABLE_CLI_LOCALTCPFWD)
166 #define ENABLE_AGENTFWD
165 #endif 167 #endif
166 168
167 #if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) 169 #if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD)
168 #define ENABLE_CLI_MULTIHOP 170 #define ENABLE_CLI_MULTIHOP
169 #endif 171 #endif
170 172
173 #if defined(ENABLE_CLI_AGENTFWD) || defined(DROPBEAR_PRNGD_SOCKET)
174 #define ENABLE_CONNECT_UNIX
175 #endif
176
171 #if defined(DROPBEAR_CLIENT) || defined(ENABLE_SVR_PUBKEY_AUTH) 177 #if defined(DROPBEAR_CLIENT) || defined(ENABLE_SVR_PUBKEY_AUTH)
172 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */ 178 #define DROPBEAR_KEY_LINES /* ie we're using authorized_keys or known_hosts */
173 #endif 179 #endif
180
181 /* Changing this is inadvisable, it appears to have problems
182 * with flushing compressed data */
183 #define DROPBEAR_ZLIB_MEM_LEVEL 8
174 184
175 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH) 185 #if defined(ENABLE_SVR_PASSWORD_AUTH) && defined(ENABLE_SVR_PAM_AUTH)
176 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h" 186 #error "You can't turn on PASSWORD and PAM auth both at once. Fix it in options.h"
177 #endif 187 #endif
178 188
200 210
201 #define IS_DROPBEAR_SERVER 0 211 #define IS_DROPBEAR_SERVER 0
202 #define IS_DROPBEAR_CLIENT 1 212 #define IS_DROPBEAR_CLIENT 1
203 213
204 #else 214 #else
205 #error You must compiled with either DROPBEAR_CLIENT or DROPBEAR_SERVER selected 215 /* Just building key utils? */
206 #endif 216 #define IS_DROPBEAR_SERVER 0
217 #define IS_DROPBEAR_CLIENT 0
218
219 #endif