projects / openwrt / staging / yousong.git / blob
? search:


8a46bc8bc1946dbf4b9fa6f559a368bb9d9f3f55
[openwrt/staging/yousong.git] / package / ppp / patches / 201-mppe_mppc_1.1.patch
1 diff -Naur ppp-2.4.4.orig/include/linux/ppp-comp.h ppp-2.4.4/include/linux/ppp-comp.h
2 --- ppp-2.4.4.orig/include/linux/ppp-comp.h 2009-05-09 03:44:09.000000000 -0400
3 +++ ppp-2.4.4/include/linux/ppp-comp.h 2009-05-09 03:45:52.000000000 -0400
4 @@ -36,7 +36,7 @@
5 */
6
7 /*
8 - * ==FILEVERSION 20020319==
9 + * ==FILEVERSION 20020715==
10 *
11 * NOTE TO MAINTAINERS:
12 * If you modify this file at all, please set the above date.
13 @@ -86,7 +86,7 @@
14
15 /* Compress a packet */
16 int (*compress) (void *state, unsigned char *rptr,
17 - unsigned char *obuf, int isize, int osize);
18 + unsigned char *obuf, int isize, int osize);
19
20 /* Return compression statistics */
21 void (*comp_stat) (void *state, struct compstat *stats);
22 @@ -107,7 +107,7 @@
23
24 /* Decompress a packet. */
25 int (*decompress) (void *state, unsigned char *ibuf, int isize,
26 - unsigned char *obuf, int osize);
27 + unsigned char *obuf, int osize);
28
29 /* Update state for an incompressible packet received */
30 void (*incomp) (void *state, unsigned char *ibuf, int icnt);
31 @@ -288,6 +288,33 @@
32 opts |= MPPE_OPT_UNKNOWN; \
33 } while (/* CONSTCOND */ 0)
34
35 +/* MPPE/MPPC definitions by J.D.*/
36 +#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */
37 +#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */
38 +#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */
39 +#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */
40 +#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */
41 +
42 +/*
43 + * Definitions for Stac LZS.
44 + */
45 +
46 +#define CI_LZS 17 /* config option for Stac LZS */
47 +#define CILEN_LZS 5 /* length of config option */
48 +
49 +#define LZS_OVHD 4 /* max. LZS overhead */
50 +#define LZS_HIST_LEN 2048 /* LZS history size */
51 +#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */
52 +
53 +#define LZS_MODE_NONE 0
54 +#define LZS_MODE_LCB 1
55 +#define LZS_MODE_CRC 2
56 +#define LZS_MODE_SEQ 3
57 +#define LZS_MODE_EXT 4
58 +
59 +#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */
60 +#define LZS_EXT_BIT_COMP 0x20 /* bit C */
61 +
62 /*
63 * Definitions for other, as yet unsupported, compression methods.
64 */
65 diff -Naur ppp-2.4.4.orig/include/net/ppp-comp.h ppp-2.4.4/include/net/ppp-comp.h
66 --- ppp-2.4.4.orig/include/net/ppp-comp.h 2009-05-09 03:44:09.000000000 -0400
67 +++ ppp-2.4.4/include/net/ppp-comp.h 2009-05-09 03:45:52.000000000 -0400
68 @@ -255,6 +255,33 @@
69 opts |= MPPE_OPT_UNKNOWN; \
70 } while (/* CONSTCOND */ 0)
71
72 +/* MPPE/MPPC definitions by J.D.*/
73 +#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */
74 +#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */
75 +#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */
76 +#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */
77 +#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */
78 +
79 +/*
80 + * Definitions for Stac LZS.
81 + */
82 +
83 +#define CI_LZS 17 /* config option for Stac LZS */
84 +#define CILEN_LZS 5 /* length of config option */
85 +
86 +#define LZS_OVHD 4 /* max. LZS overhead */
87 +#define LZS_HIST_LEN 2048 /* LZS history size */
88 +#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */
89 +
90 +#define LZS_MODE_NONE 0
91 +#define LZS_MODE_LCB 1
92 +#define LZS_MODE_CRC 2
93 +#define LZS_MODE_SEQ 3
94 +#define LZS_MODE_EXT 4
95 +
96 +#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */
97 +#define LZS_EXT_BIT_COMP 0x20 /* bit C */
98 +
99 /*
100 * Definitions for other, as yet unsupported, compression methods.
101 */
102 diff -Naur ppp-2.4.4.orig/pppd/ccp.c ppp-2.4.4/pppd/ccp.c
103 --- ppp-2.4.4.orig/pppd/ccp.c 2009-05-09 03:44:09.000000000 -0400
104 +++ ppp-2.4.4/pppd/ccp.c 2009-05-09 03:45:52.000000000 -0400
105 @@ -62,12 +62,10 @@
106 static char bsd_value[8];
107 static char deflate_value[8];
108
109 -/*
110 - * Option variables.
111 - */
112 #ifdef MPPE
113 -bool refuse_mppe_stateful = 1; /* Allow stateful mode? */
114 -#endif
115 +static int setmppe(char **);
116 +static int setnomppe(void);
117 +#endif /* MPPE */
118
119 static option_t ccp_option_list[] = {
120 { "noccp", o_bool, &ccp_protent.enabled_flag,
121 @@ -108,54 +106,36 @@
122 "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
123 &ccp_allowoptions[0].predictor_1 },
124
125 + { "lzs", o_bool, &ccp_wantoptions[0].lzs,
126 + "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_PRIO },
127 + { "+lzs", o_bool, &ccp_wantoptions[0].lzs,
128 + "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_ALIAS | OPT_PRIO },
129 + { "nolzs", o_bool, &ccp_wantoptions[0].lzs,
130 + "don't allow Stac LZS", OPT_PRIOSUB | OPT_A2CLR,
131 + &ccp_allowoptions[0].lzs },
132 + { "-lzs", o_bool, &ccp_wantoptions[0].lzs,
133 + "don't allow Stac LZS", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
134 + &ccp_allowoptions[0].lzs },
135 +
136 #ifdef MPPE
137 - /* MPPE options are symmetrical ... we only set wantoptions here */
138 - { "require-mppe", o_bool, &ccp_wantoptions[0].mppe,
139 - "require MPPE encryption",
140 - OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 },
141 - { "+mppe", o_bool, &ccp_wantoptions[0].mppe,
142 - "require MPPE encryption",
143 - OPT_ALIAS | OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 },
144 - { "nomppe", o_bool, &ccp_wantoptions[0].mppe,
145 - "don't allow MPPE encryption", OPT_PRIO },
146 - { "-mppe", o_bool, &ccp_wantoptions[0].mppe,
147 - "don't allow MPPE encryption", OPT_ALIAS | OPT_PRIO },
148 -
149 - /* We use ccp_allowoptions[0].mppe as a junk var ... it is reset later */
150 - { "require-mppe-40", o_bool, &ccp_allowoptions[0].mppe,
151 - "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40,
152 - &ccp_wantoptions[0].mppe },
153 - { "+mppe-40", o_bool, &ccp_allowoptions[0].mppe,
154 - "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40,
155 - &ccp_wantoptions[0].mppe },
156 - { "nomppe-40", o_bool, &ccp_allowoptions[0].mppe,
157 - "don't allow MPPE 40-bit encryption",
158 - OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, &ccp_wantoptions[0].mppe },
159 - { "-mppe-40", o_bool, &ccp_allowoptions[0].mppe,
160 - "don't allow MPPE 40-bit encryption",
161 - OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40,
162 - &ccp_wantoptions[0].mppe },
163 -
164 - { "require-mppe-128", o_bool, &ccp_allowoptions[0].mppe,
165 - "require MPPE 128-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_128,
166 - &ccp_wantoptions[0].mppe },
167 - { "+mppe-128", o_bool, &ccp_allowoptions[0].mppe,
168 - "require MPPE 128-bit encryption",
169 - OPT_ALIAS | OPT_PRIO | OPT_A2OR | MPPE_OPT_128,
170 - &ccp_wantoptions[0].mppe },
171 - { "nomppe-128", o_bool, &ccp_allowoptions[0].mppe,
172 - "don't allow MPPE 128-bit encryption",
173 - OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, &ccp_wantoptions[0].mppe },
174 - { "-mppe-128", o_bool, &ccp_allowoptions[0].mppe,
175 - "don't allow MPPE 128-bit encryption",
176 - OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128,
177 - &ccp_wantoptions[0].mppe },
178 -
179 - /* strange one; we always request stateless, but will we allow stateful? */
180 - { "mppe-stateful", o_bool, &refuse_mppe_stateful,
181 - "allow MPPE stateful mode", OPT_PRIO },
182 - { "nomppe-stateful", o_bool, &refuse_mppe_stateful,
183 - "disallow MPPE stateful mode", OPT_PRIO | 1 },
184 + { "mppc", o_bool, &ccp_wantoptions[0].mppc,
185 + "request MPPC compression", 1, &ccp_allowoptions[0].mppc },
186 + { "+mppc", o_bool, &ccp_wantoptions[0].mppc,
187 + "request MPPC compression", 1, &ccp_allowoptions[0].mppc, OPT_ALIAS },
188 + { "nomppc", o_bool, &ccp_wantoptions[0].mppc,
189 + "don't allow MPPC compression", OPT_PRIOSUB | OPT_A2CLR,
190 + &ccp_allowoptions[0].mppc },
191 + { "-mppc", o_bool, &ccp_wantoptions[0].mppc,
192 + "don't allow MPPC compression", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR,
193 + &ccp_allowoptions[0].mppc },
194 + { "mppe", o_special, (void *)setmppe,
195 + "request MPPE encryption" },
196 + { "+mppe", o_special, (void *)setmppe,
197 + "request MPPE encryption" },
198 + { "nomppe", o_special_noarg, (void *)setnomppe,
199 + "don't allow MPPE encryption" },
200 + { "-mppe", o_special_noarg, (void *)setnomppe,
201 + "don't allow MPPE encryption" },
202 #endif /* MPPE */
203
204 { NULL }
205 @@ -241,7 +221,7 @@
206 */
207 #define ANY_COMPRESS(opt) ((opt).deflate || (opt).bsd_compress \
208 || (opt).predictor_1 || (opt).predictor_2 \
209 - || (opt).mppe)
210 + || (opt).lzs || (opt).mppc || (opt).mppe)
211
212 /*
213 * Local state (mainly for handling reset-reqs and reset-acks).
214 @@ -344,6 +324,100 @@
215 return 1;
216 }
217
218 +#ifdef MPPE
219 +/*
220 + * Functions called from config options
221 + */
222 +/*
223 + MPPE suboptions:
224 + required - require MPPE; disconnect if peer doesn't support it
225 + stateless - use stateless mode
226 + no40 - disable 40 bit keys
227 + no56 - disable 56 bit keys
228 + no128 - disable 128 bit keys
229 +*/
230 +int setmppe(char **argv)
231 +{
232 + int i;
233 + char *str, cmdbuf[16];
234 +
235 + ccp_allowoptions[0].mppe = 1;
236 + ccp_allowoptions[0].mppe_40 = 1;
237 + ccp_allowoptions[0].mppe_56 = 1;
238 + ccp_allowoptions[0].mppe_128 = 1;
239 + ccp_allowoptions[0].mppe_stateless = 0;
240 + ccp_wantoptions[0].mppe = 0;
241 +
242 + str = *argv;
243 +
244 + while (1) {
245 + i = 0;
246 + memset(cmdbuf, '\0', 16);
247 + while ((i < 16) && (*str != ',') && (*str != '\0'))
248 + cmdbuf[i++] = *str++;
249 + cmdbuf[i] = '\0';
250 + if (!strncasecmp(cmdbuf, "no40", strlen("no40"))) {
251 + ccp_allowoptions[0].mppe_40 = 0;
252 + goto next_param;
253 + } else if (!strncasecmp(cmdbuf, "no56", strlen("no56"))) {
254 + ccp_allowoptions[0].mppe_56 = 0;
255 + goto next_param;
256 + } else if (!strncasecmp(cmdbuf, "no128", strlen("no128"))) {
257 + ccp_allowoptions[0].mppe_128 = 0;
258 + goto next_param;
259 + } else if (!strncasecmp(cmdbuf, "stateless", strlen("stateless"))) {
260 + ccp_allowoptions[0].mppe_stateless = 1;
261 + goto next_param;
262 + } else if (!strncasecmp(cmdbuf, "required", strlen("required"))) {
263 + ccp_wantoptions[0].mppe = 1;
264 + goto next_param;
265 + } else {
266 + option_error("invalid parameter '%s' for mppe option", cmdbuf);
267 + return 0;
268 + }
269 +
270 + next_param:
271 + if (*str == ',') {
272 + str++;
273 + continue;
274 + }
275 + if (*str == '\0') {
276 + if (!(ccp_allowoptions[0].mppe_40 || ccp_allowoptions[0].mppe_56 ||
277 + ccp_allowoptions[0].mppe_128)) {
278 + if (ccp_wantoptions[0].mppe == 1) {
279 + option_error("You require MPPE but you have switched off "
280 + "all encryption key lengths.");
281 + return 0;
282 + }
283 + ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0;
284 + ccp_wantoptions[0].mppe_stateless =
285 + ccp_allowoptions[0].mppe_stateless = 0;
286 + } else {
287 + ccp_allowoptions[0].mppe = 1;
288 + ccp_wantoptions[0].mppe_stateless =
289 + ccp_allowoptions[0].mppe_stateless;
290 + if (ccp_wantoptions[0].mppe == 1) {
291 + ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40;
292 + ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56;
293 + ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128;
294 + }
295 + }
296 + return 1;
297 + }
298 + }
299 +}
300 +
301 +int setnomppe(void)
302 +{
303 + ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0;
304 + ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40 = 0;
305 + ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56 = 0;
306 + ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128 = 0;
307 + ccp_wantoptions[0].mppe_stateless = ccp_allowoptions[0].mppe_stateless = 0;
308 + return 1;
309 +}
310 +#endif /* MPPE */
311 +
312 /*
313 * ccp_init - initialize CCP.
314 */
315 @@ -378,6 +452,30 @@
316 ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS;
317
318 ccp_allowoptions[0].predictor_1 = 1;
319 +
320 + ccp_wantoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */
321 + ccp_wantoptions[0].lzs_mode = LZS_MODE_SEQ;
322 + ccp_wantoptions[0].lzs_hists = 1;
323 + ccp_allowoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */
324 + ccp_allowoptions[0].lzs_mode = LZS_MODE_SEQ;
325 + ccp_allowoptions[0].lzs_hists = 1;
326 +
327 +#ifdef MPPE
328 + /* by default allow and request MPPC... */
329 + ccp_wantoptions[0].mppc = ccp_allowoptions[0].mppc = 1;
330 +
331 + /* ... and allow but don't request MPPE */
332 + ccp_allowoptions[0].mppe = 1;
333 + ccp_allowoptions[0].mppe_40 = 1;
334 + ccp_allowoptions[0].mppe_56 = 1;
335 + ccp_allowoptions[0].mppe_128 = 1;
336 + ccp_allowoptions[0].mppe_stateless = 1;
337 + ccp_wantoptions[0].mppe = 0;
338 + ccp_wantoptions[0].mppe_40 = 0;
339 + ccp_wantoptions[0].mppe_56 = 0;
340 + ccp_wantoptions[0].mppe_128 = 0;
341 + ccp_wantoptions[0].mppe_stateless = 0;
342 +#endif /* MPPE */
343 }
344
345 /*
346 @@ -455,11 +553,11 @@
347 if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) {
348 notice("Compression disabled by peer.");
349 #ifdef MPPE
350 - if (ccp_gotoptions[unit].mppe) {
351 + if (ccp_wantoptions[unit].mppe) {
352 error("MPPE disabled, closing LCP");
353 lcp_close(unit, "MPPE disabled by peer");
354 }
355 -#endif
356 +#endif /* MPPE */
357 }
358
359 /*
360 @@ -487,6 +585,15 @@
361 break;
362 /* send a reset-ack, which the transmitter will see and
363 reset its compression state. */
364 +
365 + /* In case of MPPE/MPPC or LZS we shouldn't send CCP_RESETACK,
366 + but we do it in order to reset compressor; CCP_RESETACK is
367 + then silently discarded. See functions ppp_send_frame and
368 + ppp_ccp_peek in ppp_generic.c (Linux only !!!). All the
369 + confusion is caused by the fact that CCP code is splited
370 + into two parts - one part is handled by pppd, the other one
371 + is handled by kernel. */
372 +
373 fsm_sdata(f, CCP_RESETACK, id, NULL, 0);
374 break;
375
376 @@ -515,12 +622,11 @@
377 fsm_lowerdown(&ccp_fsm[unit]);
378
379 #ifdef MPPE
380 - if (ccp_gotoptions[unit].mppe) {
381 + if (ccp_wantoptions[unit].mppe) {
382 error("MPPE required but peer negotiation failed");
383 lcp_close(unit, "MPPE required but peer negotiation failed");
384 }
385 -#endif
386 -
387 +#endif /* MPPE */
388 }
389
390 /*
391 @@ -537,7 +643,7 @@
392 all_rejected[f->unit] = 0;
393
394 #ifdef MPPE
395 - if (go->mppe) {
396 + if (go->mppe || go->mppc) {
397 ccp_options *ao = &ccp_allowoptions[f->unit];
398 int auth_mschap_bits = auth_done[f->unit];
399 int numbits;
400 @@ -551,80 +657,109 @@
401 * NB: If MPPE is required, all other compression opts are invalid.
402 * So, we return right away if we can't do it.
403 */
404 + if (ccp_wantoptions[f->unit].mppe) {
405 + /* Leave only the mschap auth bits set */
406 + auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER |
407 + CHAP_MS2_WITHPEER | CHAP_MS2_PEER);
408 + /* Count the mschap auths */
409 + auth_mschap_bits >>= CHAP_MS_SHIFT;
410 + numbits = 0;
411 + do {
412 + numbits += auth_mschap_bits & 1;
413 + auth_mschap_bits >>= 1;
414 + } while (auth_mschap_bits);
415 + if (numbits > 1) {
416 + error("MPPE required, but auth done in both directions.");
417 + lcp_close(f->unit, "MPPE required but not available");
418 + return;
419 + }
420 + if (!numbits) {
421 + error("MPPE required, but MS-CHAP[v2] auth not performed.");
422 + lcp_close(f->unit, "MPPE required but not available");
423 + return;
424 + }
425
426 - /* Leave only the mschap auth bits set */
427 - auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER |
428 - CHAP_MS2_WITHPEER | CHAP_MS2_PEER);
429 - /* Count the mschap auths */
430 - auth_mschap_bits >>= CHAP_MS_SHIFT;
431 - numbits = 0;
432 - do {
433 - numbits += auth_mschap_bits & 1;
434 - auth_mschap_bits >>= 1;
435 - } while (auth_mschap_bits);
436 - if (numbits > 1) {
437 - error("MPPE required, but auth done in both directions.");
438 - lcp_close(f->unit, "MPPE required but not available");
439 - return;
440 - }
441 - if (!numbits) {
442 - error("MPPE required, but MS-CHAP[v2] auth not performed.");
443 - lcp_close(f->unit, "MPPE required but not available");
444 - return;
445 - }
446 -
447 - /* A plugin (eg radius) may not have obtained key material. */
448 - if (!mppe_keys_set) {
449 - error("MPPE required, but keys are not available. "
450 - "Possible plugin problem?");
451 - lcp_close(f->unit, "MPPE required but not available");
452 - return;
453 - }
454 -
455 - /* LM auth not supported for MPPE */
456 - if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) {
457 - /* This might be noise */
458 - if (go->mppe & MPPE_OPT_40) {
459 - notice("Disabling 40-bit MPPE; MS-CHAP LM not supported");
460 - go->mppe &= ~MPPE_OPT_40;
461 - ccp_wantoptions[f->unit].mppe &= ~MPPE_OPT_40;
462 + /* A plugin (eg radius) may not have obtained key material. */
463 + if (!mppe_keys_set) {
464 + error("MPPE required, but keys are not available. "
465 + "Possible plugin problem?");
466 + lcp_close(f->unit, "MPPE required but not available");
467 + return;
468 }
469 }
470
471 - /* Last check: can we actually negotiate something? */
472 - if (!(go->mppe & (MPPE_OPT_40 | MPPE_OPT_128))) {
473 - /* Could be misconfig, could be 40-bit disabled above. */
474 - error("MPPE required, but both 40-bit and 128-bit disabled.");
475 - lcp_close(f->unit, "MPPE required but not available");
476 - return;
477 + /*
478 + * Check whether the kernel knows about the various
479 + * compression methods we might request. Key material
480 + * unimportant here.
481 + */
482 + if (go->mppc) {
483 + opt_buf[0] = CI_MPPE;
484 + opt_buf[1] = CILEN_MPPE;
485 + opt_buf[2] = 0;
486 + opt_buf[3] = 0;
487 + opt_buf[4] = 0;
488 + opt_buf[5] = MPPE_MPPC;
489 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 0) <= 0)
490 + go->mppc = 0;
491 + }
492 + if (go->mppe_40) {
493 + opt_buf[0] = CI_MPPE;
494 + opt_buf[1] = CILEN_MPPE;
495 + opt_buf[2] = MPPE_STATELESS;
496 + opt_buf[3] = 0;
497 + opt_buf[4] = 0;
498 + opt_buf[5] = MPPE_40BIT;
499 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
500 + go->mppe_40 = 0;
501 + }
502 + if (go->mppe_56) {
503 + opt_buf[0] = CI_MPPE;
504 + opt_buf[1] = CILEN_MPPE;
505 + opt_buf[2] = MPPE_STATELESS;
506 + opt_buf[3] = 0;
507 + opt_buf[4] = 0;
508 + opt_buf[5] = MPPE_56BIT;
509 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
510 + go->mppe_56 = 0;
511 + }
512 + if (go->mppe_128) {
513 + opt_buf[0] = CI_MPPE;
514 + opt_buf[1] = CILEN_MPPE;
515 + opt_buf[2] = MPPE_STATELESS;
516 + opt_buf[3] = 0;
517 + opt_buf[4] = 0;
518 + opt_buf[5] = MPPE_128BIT;
519 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0)
520 + go->mppe_128 = 0;
521 + }
522 + if (!go->mppe_40 && !go->mppe_56 && !go->mppe_128) {
523 + if (ccp_wantoptions[f->unit].mppe) {
524 + error("MPPE required, but kernel has no support.");
525 + lcp_close(f->unit, "MPPE required but not available");
526 + }
527 + go->mppe = go->mppe_stateless = 0;
528 + } else {
529 + /* MPPE is not compatible with other compression types */
530 + if (ccp_wantoptions[f->unit].mppe) {
531 + ao->bsd_compress = go->bsd_compress = 0;
532 + ao->predictor_1 = go->predictor_1 = 0;
533 + ao->predictor_2 = go->predictor_2 = 0;
534 + ao->deflate = go->deflate = 0;
535 + ao->lzs = go->lzs = 0;
536 + }
537 }
538 -
539 - /* sync options */
540 - ao->mppe = go->mppe;
541 - /* MPPE is not compatible with other compression types */
542 - ao->bsd_compress = go->bsd_compress = 0;
543 - ao->predictor_1 = go->predictor_1 = 0;
544 - ao->predictor_2 = go->predictor_2 = 0;
545 - ao->deflate = go->deflate = 0;
546 }
547 #endif /* MPPE */
548 -
549 - /*
550 - * Check whether the kernel knows about the various
551 - * compression methods we might request.
552 - */
553 -#ifdef MPPE
554 - if (go->mppe) {
555 - opt_buf[0] = CI_MPPE;
556 - opt_buf[1] = CILEN_MPPE;
557 - MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
558 - /* Key material unimportant here. */
559 - if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) {
560 - error("MPPE required, but kernel has no support.");
561 - lcp_close(f->unit, "MPPE required but not available");
562 - }
563 + if (go->lzs) {
564 + opt_buf[0] = CI_LZS;
565 + opt_buf[1] = CILEN_LZS;
566 + opt_buf[2] = go->lzs_hists >> 8;
567 + opt_buf[3] = go->lzs_hists & 0xff;
568 + opt_buf[4] = LZS_MODE_SEQ;
569 + if (ccp_test(f->unit, opt_buf, CILEN_LZS, 0) <= 0)
570 + go->lzs = 0;
571 }
572 -#endif
573 if (go->bsd_compress) {
574 opt_buf[0] = CI_BSD_COMPRESS;
575 opt_buf[1] = CILEN_BSD_COMPRESS;
576 @@ -679,7 +814,8 @@
577 + (go->deflate? CILEN_DEFLATE: 0)
578 + (go->predictor_1? CILEN_PREDICTOR_1: 0)
579 + (go->predictor_2? CILEN_PREDICTOR_2: 0)
580 - + (go->mppe? CILEN_MPPE: 0);
581 + + (go->lzs? CILEN_LZS: 0)
582 + + ((go->mppe || go->mppc)? CILEN_MPPE: 0);
583 }
584
585 /*
586 @@ -693,6 +829,8 @@
587 {
588 int res;
589 ccp_options *go = &ccp_gotoptions[f->unit];
590 + ccp_options *ao = &ccp_allowoptions[f->unit];
591 + ccp_options *wo = &ccp_wantoptions[f->unit];
592 u_char *p0 = p;
593
594 /*
595 @@ -701,22 +839,43 @@
596 * in case it gets Acked.
597 */
598 #ifdef MPPE
599 - if (go->mppe) {
600 + if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) {
601 u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
602
603 - p[0] = opt_buf[0] = CI_MPPE;
604 - p[1] = opt_buf[1] = CILEN_MPPE;
605 - MPPE_OPTS_TO_CI(go->mppe, &p[2]);
606 - MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
607 + p[0] = CI_MPPE;
608 + p[1] = CILEN_MPPE;
609 + p[2] = (go->mppe_stateless ? MPPE_STATELESS : 0);
610 + p[3] = 0;
611 + p[4] = 0;
612 + p[5] = (go->mppe_40 ? MPPE_40BIT : 0) | (go->mppe_56 ? MPPE_56BIT : 0) |
613 + (go->mppe_128 ? MPPE_128BIT : 0) | (go->mppc ? MPPE_MPPC : 0);
614 +
615 + BCOPY(p, opt_buf, CILEN_MPPE);
616 BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN);
617 res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0);
618 - if (res > 0)
619 + if (res > 0) {
620 p += CILEN_MPPE;
621 - else
622 + } else {
623 /* This shouldn't happen, we've already tested it! */
624 - lcp_close(f->unit, "MPPE required but not available in kernel");
625 + go->mppe = go->mppe_40 = go->mppe_56 = go->mppe_128 =
626 + go->mppe_stateless = go->mppc = 0;
627 + if (ccp_wantoptions[f->unit].mppe)
628 + lcp_close(f->unit, "MPPE required but not available in kernel");
629 + }
630 + }
631 +#endif /* MPPE */
632 + if (go->lzs) {
633 + p[0] = CI_LZS;
634 + p[1] = CILEN_LZS;
635 + p[2] = go->lzs_hists >> 8;
636 + p[3] = go->lzs_hists & 0xff;
637 + p[4] = LZS_MODE_SEQ;
638 + res = ccp_test(f->unit, p, CILEN_LZS, 0);
639 + if (res > 0) {
640 + p += CILEN_LZS;
641 + } else
642 + go->lzs = 0;
643 }
644 -#endif
645 if (go->deflate) {
646 p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT;
647 p[1] = CILEN_DEFLATE;
648 @@ -802,7 +961,7 @@
649
650 /*
651 * ccp_ackci - process a received configure-ack, and return
652 - * 1 iff the packet was OK.
653 + * 1 if the packet was OK.
654 */
655 static int
656 ccp_ackci(f, p, len)
657 @@ -811,24 +970,44 @@
658 int len;
659 {
660 ccp_options *go = &ccp_gotoptions[f->unit];
661 + ccp_options *ao = &ccp_allowoptions[f->unit];
662 + ccp_options *wo = &ccp_wantoptions[f->unit];
663 u_char *p0 = p;
664
665 #ifdef MPPE
666 - if (go->mppe) {
667 - u_char opt_buf[CILEN_MPPE];
668 -
669 - opt_buf[0] = CI_MPPE;
670 - opt_buf[1] = CILEN_MPPE;
671 - MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]);
672 - if (len < CILEN_MPPE || memcmp(opt_buf, p, CILEN_MPPE))
673 + if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) {
674 + if (len < CILEN_MPPE
675 + || p[1] != CILEN_MPPE || p[0] != CI_MPPE
676 + || p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0)
677 + || p[3] != 0
678 + || p[4] != 0
679 + || (p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) |
680 + (go->mppc ? MPPE_MPPC : 0))
681 + && p[5] != ((go->mppe_56 ? MPPE_56BIT : 0) |
682 + (go->mppc ? MPPE_MPPC : 0))
683 + && p[5] != ((go->mppe_128 ? MPPE_128BIT : 0) |
684 + (go->mppc ? MPPE_MPPC : 0))))
685 return 0;
686 + if (go->mppe_40 || go->mppe_56 || go->mppe_128)
687 + go->mppe = 1;
688 p += CILEN_MPPE;
689 len -= CILEN_MPPE;
690 + /* Cope with first/fast ack */
691 + if (p == p0 && len == 0)
692 + return 1;
693 + }
694 +#endif /* MPPE */
695 + if (go->lzs) {
696 + if (len < CILEN_LZS || p[0] != CI_LZS || p[1] != CILEN_LZS
697 + || p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff)
698 + || p[4] != LZS_MODE_SEQ)
699 + return 0;
700 + p += CILEN_LZS;
701 + len -= CILEN_LZS;
702 /* XXX Cope with first/fast ack */
703 - if (len == 0)
704 + if (p == p0 && len == 0)
705 return 1;
706 }
707 -#endif
708 if (go->deflate) {
709 if (len < CILEN_DEFLATE
710 || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
711 @@ -891,7 +1070,7 @@
712
713 /*
714 * ccp_nakci - process received configure-nak.
715 - * Returns 1 iff the nak was OK.
716 + * Returns 1 if the nak was OK.
717 */
718 static int
719 ccp_nakci(f, p, len, treat_as_reject)
720 @@ -901,6 +1080,8 @@
721 int treat_as_reject;
722 {
723 ccp_options *go = &ccp_gotoptions[f->unit];
724 + ccp_options *ao = &ccp_allowoptions[f->unit];
725 + ccp_options *wo = &ccp_wantoptions[f->unit];
726 ccp_options no; /* options we've seen already */
727 ccp_options try; /* options to ask for next time */
728
729 @@ -908,28 +1089,100 @@
730 try = *go;
731
732 #ifdef MPPE
733 - if (go->mppe && len >= CILEN_MPPE
734 - && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
735 - no.mppe = 1;
736 - /*
737 - * Peer wants us to use a different strength or other setting.
738 - * Fail if we aren't willing to use his suggestion.
739 - */
740 - MPPE_CI_TO_OPTS(&p[2], try.mppe);
741 - if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful) {
742 - error("Refusing MPPE stateful mode offered by peer");
743 - try.mppe = 0;
744 - } else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe) {
745 - /* Peer must have set options we didn't request (suggest) */
746 - try.mppe = 0;
747 - }
748 + if ((go->mppe || go->mppc || (!wo->mppe && ao->mppe)) &&
749 + len >= CILEN_MPPE && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
750
751 - if (!try.mppe) {
752 - error("MPPE required but peer negotiation failed");
753 - lcp_close(f->unit, "MPPE required but peer negotiation failed");
754 + if (go->mppc) {
755 + no.mppc = 1;
756 + if (!(p[5] & MPPE_MPPC))
757 + try.mppc = 0;
758 + }
759 +
760 + if (go->mppe)
761 + no.mppe = 1;
762 + if (go->mppe_40)
763 + no.mppe_40 = 1;
764 + if (go->mppe_56)
765 + no.mppe_56 = 1;
766 + if (go->mppe_128)
767 + no.mppe_128 = 1;
768 + if (go->mppe_stateless)
769 + no.mppe_stateless = 1;
770 +
771 + if (ao->mppe_40) {
772 + if ((p[5] & MPPE_40BIT))
773 + try.mppe_40 = 1;
774 + else
775 + try.mppe_40 = (p[5] == 0) ? 1 : 0;
776 + }
777 + if (ao->mppe_56) {
778 + if ((p[5] & MPPE_56BIT))
779 + try.mppe_56 = 1;
780 + else
781 + try.mppe_56 = (p[5] == 0) ? 1 : 0;
782 + }
783 + if (ao->mppe_128) {
784 + if ((p[5] & MPPE_128BIT))
785 + try.mppe_128 = 1;
786 + else
787 + try.mppe_128 = (p[5] == 0) ? 1 : 0;
788 + }
789 +
790 + if (ao->mppe_stateless) {
791 + if ((p[2] & MPPE_STATELESS) || wo->mppe_stateless)
792 + try.mppe_stateless = 1;
793 + else
794 + try.mppe_stateless = 0;
795 + }
796 +
797 + if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) {
798 + try.mppe = try.mppe_stateless = 0;
799 + if (wo->mppe) {
800 + /* we require encryption, but peer doesn't support it
801 + so we close connection */
802 + wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
803 + wo->mppe_56 = wo->mppe_128 = 0;
804 + lcp_close(f->unit, "MPPE required but cannot negotiate MPPE "
805 + "key length");
806 + }
807 + }
808 + if (wo->mppe && (wo->mppe_40 != try.mppe_40) &&
809 + (wo->mppe_56 != try.mppe_56) && (wo->mppe_128 != try.mppe_128)) {
810 + /* cannot negotiate key length */
811 + wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
812 + wo->mppe_56 = wo->mppe_128 = 0;
813 + lcp_close(f->unit, "Cannot negotiate MPPE key length");
814 }
815 + if (try.mppe_40 && try.mppe_56 && try.mppe_128)
816 + try.mppe_40 = try.mppe_56 = 0;
817 + else
818 + if (try.mppe_56 && try.mppe_128)
819 + try.mppe_56 = 0;
820 + else
821 + if (try.mppe_40 && try.mppe_128)
822 + try.mppe_40 = 0;
823 + else
824 + if (try.mppe_40 && try.mppe_56)
825 + try.mppe_40 = 0;
826 +
827 + p += CILEN_MPPE;
828 + len -= CILEN_MPPE;
829 }
830 #endif /* MPPE */
831 +
832 + if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) {
833 + no.lzs = 1;
834 + if (((p[2]<<8)|p[3]) > 1 || (p[4] != LZS_MODE_SEQ &&
835 + p[4] != LZS_MODE_EXT))
836 + try.lzs = 0;
837 + else {
838 + try.lzs_mode = p[4];
839 + try.lzs_hists = (p[2] << 8) | p[3];
840 + }
841 + p += CILEN_LZS;
842 + len -= CILEN_LZS;
843 + }
844 +
845 if (go->deflate && len >= CILEN_DEFLATE
846 && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT)
847 && p[1] == CILEN_DEFLATE) {
848 @@ -1002,14 +1255,50 @@
849 return -1;
850
851 #ifdef MPPE
852 - if (go->mppe && len >= CILEN_MPPE
853 + if ((go->mppe || go->mppc) && len >= CILEN_MPPE
854 && p[0] == CI_MPPE && p[1] == CILEN_MPPE) {
855 - error("MPPE required but peer refused");
856 - lcp_close(f->unit, "MPPE required but peer refused");
857 + ccp_options *wo = &ccp_wantoptions[f->unit];
858 + if (p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) ||
859 + p[3] != 0 ||
860 + p[4] != 0 ||
861 + p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) |
862 + (go->mppe_56 ? MPPE_56BIT : 0) |
863 + (go->mppe_128 ? MPPE_128BIT : 0) |
864 + (go->mppc ? MPPE_MPPC : 0)))
865 + return 0;
866 + if (go->mppc)
867 + try.mppc = 0;
868 + if (go->mppe) {
869 + try.mppe = 0;
870 + if (go->mppe_40)
871 + try.mppe_40 = 0;
872 + if (go->mppe_56)
873 + try.mppe_56 = 0;
874 + if (go->mppe_128)
875 + try.mppe_128 = 0;
876 + if (go->mppe_stateless)
877 + try.mppe_stateless = 0;
878 + if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128)
879 + try.mppe = try.mppe_stateless = 0;
880 + if (wo->mppe) { /* we want MPPE but cannot negotiate key length */
881 + wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 =
882 + wo->mppe_56 = wo->mppe_128 = 0;
883 + lcp_close(f->unit, "MPPE required but cannot negotiate MPPE "
884 + "key length");
885 + }
886 + }
887 p += CILEN_MPPE;
888 len -= CILEN_MPPE;
889 }
890 -#endif
891 +#endif /* MPPE */
892 + if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) {
893 + if (p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff)
894 + || p[4] != go->lzs_mode)
895 + return 0;
896 + try.lzs = 0;
897 + p += CILEN_LZS;
898 + len -= CILEN_LZS;
899 + }
900 if (go->deflate_correct && len >= CILEN_DEFLATE
901 && p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) {
902 if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size)
903 @@ -1073,14 +1362,15 @@
904 int dont_nak;
905 {
906 int ret, newret, res;
907 - u_char *p0, *retp;
908 + u_char *p0, *retp, p2, p5;
909 int len, clen, type, nb;
910 ccp_options *ho = &ccp_hisoptions[f->unit];
911 ccp_options *ao = &ccp_allowoptions[f->unit];
912 + ccp_options *wo = &ccp_wantoptions[f->unit];
913 #ifdef MPPE
914 - bool rej_for_ci_mppe = 1; /* Are we rejecting based on a bad/missing */
915 - /* CI_MPPE, or due to other options? */
916 -#endif
917 + u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
918 +/* int mtu; */
919 +#endif /* MPPE */
920
921 ret = CONFACK;
922 retp = p0 = p;
923 @@ -1103,106 +1393,302 @@
924 switch (type) {
925 #ifdef MPPE
926 case CI_MPPE:
927 - if (!ao->mppe || clen != CILEN_MPPE) {
928 + if ((!ao->mppc && !ao->mppe) || clen != CILEN_MPPE) {
929 newret = CONFREJ;
930 break;
931 }
932 - MPPE_CI_TO_OPTS(&p[2], ho->mppe);
933 -
934 - /* Nak if anything unsupported or unknown are set. */
935 - if (ho->mppe & MPPE_OPT_UNSUPPORTED) {
936 + p2 = p[2];
937 + p5 = p[5];
938 + /* not sure what they want, tell 'em what we got */
939 + if (((p[2] & ~MPPE_STATELESS) != 0 || p[3] != 0 || p[4] != 0 ||
940 + (p[5] & ~(MPPE_40BIT | MPPE_56BIT | MPPE_128BIT |
941 + MPPE_MPPC)) != 0 || p[5] == 0) ||
942 + (p[2] == 0 && p[3] == 0 && p[4] == 0 && p[5] == 0)) {
943 newret = CONFNAK;
944 - ho->mppe &= ~MPPE_OPT_UNSUPPORTED;
945 - }
946 - if (ho->mppe & MPPE_OPT_UNKNOWN) {
947 - newret = CONFNAK;
948 - ho->mppe &= ~MPPE_OPT_UNKNOWN;
949 - }
950 -
951 - /* Check state opt */
952 - if (ho->mppe & MPPE_OPT_STATEFUL) {
953 - /*
954 - * We can Nak and request stateless, but it's a
955 - * lot easier to just assume the peer will request
956 - * it if he can do it; stateful mode is bad over
957 - * the Internet -- which is where we expect MPPE.
958 - */
959 - if (refuse_mppe_stateful) {
960 - error("Refusing MPPE stateful mode offered by peer");
961 - newret = CONFREJ;
962 - break;
963 + p[2] = (wo->mppe_stateless ? MPPE_STATELESS : 0);
964 + p[3] = 0;
965 + p[4] = 0;
966 + p[5] = (wo->mppe_40 ? MPPE_40BIT : 0) |
967 + (wo->mppe_56 ? MPPE_56BIT : 0) |
968 + (wo->mppe_128 ? MPPE_128BIT : 0) |
969 + (wo->mppc ? MPPE_MPPC : 0);
970 + break;
971 + }
972 +
973 + if ((p[5] & MPPE_MPPC)) {
974 + if (ao->mppc) {
975 + ho->mppc = 1;
976 + BCOPY(p, opt_buf, CILEN_MPPE);
977 + opt_buf[2] = opt_buf[3] = opt_buf[4] = 0;
978 + opt_buf[5] = MPPE_MPPC;
979 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 1) <= 0) {
980 + ho->mppc = 0;
981 + p[5] &= ~MPPE_MPPC;
982 + newret = CONFNAK;
983 + }
984 + } else {
985 + newret = CONFREJ;
986 + if (wo->mppe || ao->mppe) {
987 + p[5] &= ~MPPE_MPPC;
988 + newret = CONFNAK;
989 + }
990 }
991 }
992 -
993 - /* Find out which of {S,L} are set. */
994 - if ((ho->mppe & MPPE_OPT_128)
995 - && (ho->mppe & MPPE_OPT_40)) {
996 - /* Both are set, negotiate the strongest. */
997 - newret = CONFNAK;
998 - if (ao->mppe & MPPE_OPT_128)
999 - ho->mppe &= ~MPPE_OPT_40;
1000 - else if (ao->mppe & MPPE_OPT_40)
1001 - ho->mppe &= ~MPPE_OPT_128;
1002 - else {
1003 - newret = CONFREJ;
1004 - break;
1005 - }
1006 - } else if (ho->mppe & MPPE_OPT_128) {
1007 - if (!(ao->mppe & MPPE_OPT_128)) {
1008 - newret = CONFREJ;
1009 - break;
1010 - }
1011 - } else if (ho->mppe & MPPE_OPT_40) {
1012 - if (!(ao->mppe & MPPE_OPT_40)) {
1013 - newret = CONFREJ;
1014 - break;
1015 - }
1016 + if (ao->mppe)
1017 + ho->mppe = 1;
1018 +
1019 + if ((p[2] & MPPE_STATELESS)) {
1020 + if (ao->mppe_stateless) {
1021 + if (wo->mppe_stateless)
1022 + ho->mppe_stateless = 1;
1023 + else {
1024 + newret = CONFNAK;
1025 + if (!dont_nak)
1026 + p[2] &= ~MPPE_STATELESS;
1027 + }
1028 + } else {
1029 + newret = CONFNAK;
1030 + if (!dont_nak)
1031 + p[2] &= ~MPPE_STATELESS;
1032 + }
1033 + } else {
1034 + if (wo->mppe_stateless && !dont_nak) {
1035 + wo->mppe_stateless = 0;
1036 + newret = CONFNAK;
1037 + p[2] |= MPPE_STATELESS;
1038 + }
1039 + }
1040 +
1041 + if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT|MPPE_128BIT)) {
1042 + newret = CONFNAK;
1043 + if (ao->mppe_128) {
1044 + ho->mppe_128 = 1;
1045 + p[5] &= ~(MPPE_40BIT|MPPE_56BIT);
1046 + BCOPY(p, opt_buf, CILEN_MPPE);
1047 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1048 + MPPE_MAX_KEY_LEN);
1049 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1050 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1051 + ho->mppe_128 = 0;
1052 + p[5] |= (MPPE_40BIT|MPPE_56BIT);
1053 + p[5] &= ~MPPE_128BIT;
1054 + goto check_mppe_56_40;
1055 + }
1056 + goto check_mppe;
1057 + }
1058 + p[5] &= ~MPPE_128BIT;
1059 + goto check_mppe_56_40;
1060 + }
1061 + if ((p[5] & ~MPPE_MPPC) == (MPPE_56BIT|MPPE_128BIT)) {
1062 + newret = CONFNAK;
1063 + if (ao->mppe_128) {
1064 + ho->mppe_128 = 1;
1065 + p[5] &= ~MPPE_56BIT;
1066 + BCOPY(p, opt_buf, CILEN_MPPE);
1067 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1068 + MPPE_MAX_KEY_LEN);
1069 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1070 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1071 + ho->mppe_128 = 0;
1072 + p[5] |= MPPE_56BIT;
1073 + p[5] &= ~MPPE_128BIT;
1074 + goto check_mppe_56;
1075 + }
1076 + goto check_mppe;
1077 + }
1078 + p[5] &= ~MPPE_128BIT;
1079 + goto check_mppe_56;
1080 + }
1081 + if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_128BIT)) {
1082 + newret = CONFNAK;
1083 + if (ao->mppe_128) {
1084 + ho->mppe_128 = 1;
1085 + p[5] &= ~MPPE_40BIT;
1086 + BCOPY(p, opt_buf, CILEN_MPPE);
1087 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1088 + MPPE_MAX_KEY_LEN);
1089 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1090 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1091 + ho->mppe_128 = 0;
1092 + p[5] |= MPPE_40BIT;
1093 + p[5] &= ~MPPE_128BIT;
1094 + goto check_mppe_40;
1095 + }
1096 + goto check_mppe;
1097 + }
1098 + p[5] &= ~MPPE_128BIT;
1099 + goto check_mppe_40;
1100 + }
1101 + if ((p[5] & ~MPPE_MPPC) == MPPE_128BIT) {
1102 + if (ao->mppe_128) {
1103 + ho->mppe_128 = 1;
1104 + BCOPY(p, opt_buf, CILEN_MPPE);
1105 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1106 + MPPE_MAX_KEY_LEN);
1107 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1108 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1109 + ho->mppe_128 = 0;
1110 + p[5] &= ~MPPE_128BIT;
1111 + newret = CONFNAK;
1112 + }
1113 + goto check_mppe;
1114 + }
1115 + p[5] &= ~MPPE_128BIT;
1116 + newret = CONFNAK;
1117 + goto check_mppe;
1118 + }
1119 + check_mppe_56_40:
1120 + if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT)) {
1121 + newret = CONFNAK;
1122 + if (ao->mppe_56) {
1123 + ho->mppe_56 = 1;
1124 + p[5] &= ~MPPE_40BIT;
1125 + BCOPY(p, opt_buf, CILEN_MPPE);
1126 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1127 + MPPE_MAX_KEY_LEN);
1128 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1129 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1130 + ho->mppe_56 = 0;
1131 + p[5] |= MPPE_40BIT;
1132 + p[5] &= ~MPPE_56BIT;
1133 + newret = CONFNAK;
1134 + goto check_mppe_40;
1135 + }
1136 + goto check_mppe;
1137 + }
1138 + p[5] &= ~MPPE_56BIT;
1139 + goto check_mppe_40;
1140 + }
1141 + check_mppe_56:
1142 + if ((p[5] & ~MPPE_MPPC) == MPPE_56BIT) {
1143 + if (ao->mppe_56) {
1144 + ho->mppe_56 = 1;
1145 + BCOPY(p, opt_buf, CILEN_MPPE);
1146 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1147 + MPPE_MAX_KEY_LEN);
1148 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1149 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1150 + ho->mppe_56 = 0;
1151 + p[5] &= ~MPPE_56BIT;
1152 + newret = CONFNAK;
1153 + }
1154 + goto check_mppe;
1155 + }
1156 + p[5] &= ~MPPE_56BIT;
1157 + newret = CONFNAK;
1158 + goto check_mppe;
1159 + }
1160 + check_mppe_40:
1161 + if ((p[5] & ~MPPE_MPPC) == MPPE_40BIT) {
1162 + if (ao->mppe_40) {
1163 + ho->mppe_40 = 1;
1164 + BCOPY(p, opt_buf, CILEN_MPPE);
1165 + BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1166 + MPPE_MAX_KEY_LEN);
1167 + if (ccp_test(f->unit, opt_buf, CILEN_MPPE +
1168 + MPPE_MAX_KEY_LEN, 1) <= 0) {
1169 + ho->mppe_40 = 0;
1170 + p[5] &= ~MPPE_40BIT;
1171 + newret = CONFNAK;
1172 + }
1173 + goto check_mppe;
1174 + }
1175 + p[5] &= ~MPPE_40BIT;
1176 + }
1177 +
1178 + check_mppe:
1179 + if (!ho->mppe_40 && !ho->mppe_56 && !ho->mppe_128) {
1180 + if (wo->mppe_40 || wo->mppe_56 || wo->mppe_128) {
1181 + newret = CONFNAK;
1182 + p[2] |= (wo->mppe_stateless ? MPPE_STATELESS : 0);
1183 + p[5] |= (wo->mppe_40 ? MPPE_40BIT : 0) |
1184 + (wo->mppe_56 ? MPPE_56BIT : 0) |
1185 + (wo->mppe_128 ? MPPE_128BIT : 0) |
1186 + (wo->mppc ? MPPE_MPPC : 0);
1187 + } else {
1188 + ho->mppe = ho->mppe_stateless = 0;
1189 + }
1190 } else {
1191 - /* Neither are set. */
1192 - /* We cannot accept this. */
1193 - newret = CONFNAK;
1194 - /* Give the peer our idea of what can be used,
1195 - so it can choose and confirm */
1196 - ho->mppe = ao->mppe;
1197 - }
1198 -
1199 - /* rebuild the opts */
1200 - MPPE_OPTS_TO_CI(ho->mppe, &p[2]);
1201 - if (newret == CONFACK) {
1202 - u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN];
1203 - int mtu;
1204 -
1205 - BCOPY(p, opt_buf, CILEN_MPPE);
1206 - BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE],
1207 - MPPE_MAX_KEY_LEN);
1208 - if (ccp_test(f->unit, opt_buf,
1209 - CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) {
1210 - /* This shouldn't happen, we've already tested it! */
1211 - error("MPPE required, but kernel has no support.");
1212 - lcp_close(f->unit, "MPPE required but not available");
1213 - newret = CONFREJ;
1214 - break;
1215 - }
1216 - /*
1217 - * We need to decrease the interface MTU by MPPE_PAD
1218 - * because MPPE frames **grow**. The kernel [must]
1219 - * allocate MPPE_PAD extra bytes in xmit buffers.
1220 - */
1221 - mtu = netif_get_mtu(f->unit);
1222 - if (mtu)
1223 - netif_set_mtu(f->unit, mtu - MPPE_PAD);
1224 - else
1225 - newret = CONFREJ;
1226 - }
1227 -
1228 - /*
1229 - * We have accepted MPPE or are willing to negotiate
1230 - * MPPE parameters. A CONFREJ is due to subsequent
1231 - * (non-MPPE) processing.
1232 - */
1233 - rej_for_ci_mppe = 0;
1234 - break;
1235 -#endif /* MPPE */
1236 + /* MPPE is not compatible with other compression types */
1237 + if (wo->mppe) {
1238 + ao->bsd_compress = 0;
1239 + ao->predictor_1 = 0;
1240 + ao->predictor_2 = 0;
1241 + ao->deflate = 0;
1242 + ao->lzs = 0;
1243 + }
1244 + }
1245 + if ((!ho->mppc || !ao->mppc) && !ho->mppe) {
1246 + p[2] = p2;
1247 + p[5] = p5;
1248 + newret = CONFREJ;
1249 + break;
1250 + }
1251 +
1252 + /*
1253 + * I have commented the code below because according to RFC1547
1254 + * MTU is only information for higher level protocols about
1255 + * "the maximum allowable length for a packet (q.v.) transmitted
1256 + * over a point-to-point link without incurring network layer
1257 + * fragmentation." Of course a PPP implementation should be able
1258 + * to handle overhead added by MPPE - in our case apropriate code
1259 + * is located in drivers/net/ppp_generic.c in the kernel sources.
1260 + *
1261 + * According to RFC1661:
1262 + * - when negotiated MRU is less than 1500 octets, a PPP
1263 + * implementation must still be able to receive at least 1500
1264 + * octets,
1265 + * - when PFC is negotiated, a PPP implementation is still
1266 + * required to receive frames with uncompressed protocol field.
1267 + *
1268 + * So why not to handle MPPE overhead without changing MTU value?
1269 + * I am sure that RFC3078, unfortunately silently, assumes that.
1270 + */
1271 +
1272 + /*
1273 + * We need to decrease the interface MTU by MPPE_PAD
1274 + * because MPPE frames **grow**. The kernel [must]
1275 + * allocate MPPE_PAD extra bytes in xmit buffers.
1276 + */
1277 + /*
1278 + mtu = netif_get_mtu(f->unit);
1279 + if (mtu) {
1280 + netif_set_mtu(f->unit, mtu - MPPE_PAD);
1281 + } else {
1282 + newret = CONFREJ;
1283 + if (ccp_wantoptions[f->unit].mppe) {
1284 + error("Cannot adjust MTU needed by MPPE.");
1285 + lcp_close(f->unit, "Cannot adjust MTU needed by MPPE.");
1286 + }
1287 + }
1288 + */
1289 + break;
1290 + #endif /* MPPE */
1291 +
1292 + case CI_LZS:
1293 + if (!ao->lzs || clen != CILEN_LZS) {
1294 + newret = CONFREJ;
1295 + break;
1296 + }
1297 +
1298 + ho->lzs = 1;
1299 + ho->lzs_hists = (p[2] << 8) | p[3];
1300 + ho->lzs_mode = p[4];
1301 + if ((ho->lzs_hists != ao->lzs_hists) ||
1302 + (ho->lzs_mode != ao->lzs_mode)) {
1303 + newret = CONFNAK;
1304 + if (!dont_nak) {
1305 + p[2] = ao->lzs_hists >> 8;
1306 + p[3] = ao->lzs_hists & 0xff;
1307 + p[4] = ao->lzs_mode;
1308 + } else
1309 + break;
1310 + }
1311 +
1312 + if (p == p0 && ccp_test(f->unit, p, CILEN_LZS, 1) <= 0) {
1313 + newret = CONFREJ;
1314 + }
1315 + break;
1316 case CI_DEFLATE:
1317 case CI_DEFLATE_DRAFT:
1318 if (!ao->deflate || clen != CILEN_DEFLATE
1319 @@ -1344,12 +1830,6 @@
1320 else
1321 *lenp = retp - p0;
1322 }
1323 -#ifdef MPPE
1324 - if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) {
1325 - error("MPPE required but peer negotiation failed");
1326 - lcp_close(f->unit, "MPPE required but peer negotiation failed");
1327 - }
1328 -#endif
1329 return ret;
1330 }
1331
1332 @@ -1371,24 +1851,35 @@
1333 char *p = result;
1334 char *q = result + sizeof(result); /* 1 past result */
1335
1336 - slprintf(p, q - p, "MPPE ");
1337 - p += 5;
1338 - if (opt->mppe & MPPE_OPT_128) {
1339 - slprintf(p, q - p, "128-bit ");
1340 - p += 8;
1341 - }
1342 - if (opt->mppe & MPPE_OPT_40) {
1343 - slprintf(p, q - p, "40-bit ");
1344 - p += 7;
1345 - }
1346 - if (opt->mppe & MPPE_OPT_STATEFUL)
1347 - slprintf(p, q - p, "stateful");
1348 - else
1349 - slprintf(p, q - p, "stateless");
1350 -
1351 + if (opt->mppe) {
1352 + if (opt->mppc) {
1353 + slprintf(p, q - p, "MPPC/MPPE ");
1354 + p += 10;
1355 + } else {
1356 + slprintf(p, q - p, "MPPE ");
1357 + p += 5;
1358 + }
1359 + if (opt->mppe_128) {
1360 + slprintf(p, q - p, "128-bit ");
1361 + p += 8;
1362 + } else if (opt->mppe_56) {
1363 + slprintf(p, q - p, "56-bit ");
1364 + p += 7;
1365 + } else if (opt->mppe_40) {
1366 + slprintf(p, q - p, "40-bit ");
1367 + p += 7;
1368 + }
1369 + if (opt->mppe_stateless)
1370 + slprintf(p, q - p, "stateless");
1371 + else
1372 + slprintf(p, q - p, "stateful");
1373 + } else if (opt->mppc)
1374 + slprintf(p, q - p, "MPPC");
1375 break;
1376 }
1377 -#endif
1378 +#endif /* MPPE */
1379 + case CI_LZS:
1380 + return "Stac LZS";
1381 case CI_DEFLATE:
1382 case CI_DEFLATE_DRAFT:
1383 if (opt2 != NULL && opt2->deflate_size != opt->deflate_size)
1384 @@ -1444,12 +1935,12 @@
1385 } else if (ANY_COMPRESS(*ho))
1386 notice("%s transmit compression enabled", method_name(ho, NULL));
1387 #ifdef MPPE
1388 - if (go->mppe) {
1389 + if (go->mppe || go->mppc) {
1390 BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN);
1391 BZERO(mppe_send_key, MPPE_MAX_KEY_LEN);
1392 continue_networks(f->unit); /* Bring up IP et al */
1393 }
1394 -#endif
1395 +#endif /* MPPE */
1396 }
1397
1398 /*
1399 @@ -1472,7 +1963,7 @@
1400 lcp_close(f->unit, "MPPE disabled");
1401 }
1402 }
1403 -#endif
1404 +#endif /* MPPE */
1405 }
1406
1407 /*
1408 @@ -1532,24 +2023,28 @@
1409 #ifdef MPPE
1410 case CI_MPPE:
1411 if (optlen >= CILEN_MPPE) {
1412 - u_char mppe_opts;
1413 -
1414 - MPPE_CI_TO_OPTS(&p[2], mppe_opts);
1415 - printer(arg, "mppe %s %s %s %s %s %s%s",
1416 - (p[2] & MPPE_H_BIT)? "+H": "-H",
1417 - (p[5] & MPPE_M_BIT)? "+M": "-M",
1418 - (p[5] & MPPE_S_BIT)? "+S": "-S",
1419 - (p[5] & MPPE_L_BIT)? "+L": "-L",
1420 + printer(arg, "mppe %s %s %s %s %s %s",
1421 + (p[2] & MPPE_STATELESS)? "+H": "-H",
1422 + (p[5] & MPPE_56BIT)? "+M": "-M",
1423 + (p[5] & MPPE_128BIT)? "+S": "-S",
1424 + (p[5] & MPPE_40BIT)? "+L": "-L",
1425 (p[5] & MPPE_D_BIT)? "+D": "-D",
1426 - (p[5] & MPPE_C_BIT)? "+C": "-C",
1427 - (mppe_opts & MPPE_OPT_UNKNOWN)? " +U": "");
1428 - if (mppe_opts & MPPE_OPT_UNKNOWN)
1429 + (p[5] & MPPE_MPPC)? "+C": "-C");
1430 + if ((p[5] & ~(MPPE_56BIT | MPPE_128BIT | MPPE_40BIT |
1431 + MPPE_D_BIT | MPPE_MPPC)) ||
1432 + (p[2] & ~MPPE_STATELESS))
1433 printer(arg, " (%.2x %.2x %.2x %.2x)",
1434 p[2], p[3], p[4], p[5]);
1435 p += CILEN_MPPE;
1436 }
1437 break;
1438 -#endif
1439 +#endif /* MPPE */
1440 + case CI_LZS:
1441 + if (optlen >= CILEN_LZS) {
1442 + printer(arg, "lzs %.2x %.2x %.2x", p[2], p[3], p[4]);
1443 + p += CILEN_LZS;
1444 + }
1445 + break;
1446 case CI_DEFLATE:
1447 case CI_DEFLATE_DRAFT:
1448 if (optlen >= CILEN_DEFLATE) {
1449 @@ -1635,6 +2130,7 @@
1450 error("Lost compression sync: disabling compression");
1451 ccp_close(unit, "Lost compression sync");
1452 #ifdef MPPE
1453 + /* My module dosn't need this. J.D., 2003-07-06 */
1454 /*
1455 * If we were doing MPPE, we must also take the link down.
1456 */
1457 @@ -1642,9 +2138,18 @@
1458 error("Too many MPPE errors, closing LCP");
1459 lcp_close(unit, "Too many MPPE errors");
1460 }
1461 -#endif
1462 +#endif /* MPPE */
1463 } else {
1464 /*
1465 + * When LZS or MPPE/MPPC is negotiated we just send CCP_RESETREQ
1466 + * and don't wait for CCP_RESETACK
1467 + */
1468 + if ((ccp_gotoptions[f->unit].method == CI_LZS) ||
1469 + (ccp_gotoptions[f->unit].method == CI_MPPE)) {
1470 + fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0);
1471 + return;
1472 + }
1473 + /*
1474 * Send a reset-request to reset the peer's compressor.
1475 * We don't do that if we are still waiting for an
1476 * acknowledgement to a previous reset-request.
1477 @@ -1675,4 +2180,3 @@
1478 } else
1479 ccp_localstate[f->unit] &= ~RACK_PENDING;
1480 }
1481 -
1482 diff -Naur ppp-2.4.4.orig/pppd/ccp.h ppp-2.4.4/pppd/ccp.h
1483 --- ppp-2.4.4.orig/pppd/ccp.h 2009-05-09 03:44:09.000000000 -0400
1484 +++ ppp-2.4.4/pppd/ccp.h 2009-05-09 03:45:52.000000000 -0400
1485 @@ -37,9 +37,17 @@
1486 bool predictor_2; /* do Predictor-2? */
1487 bool deflate_correct; /* use correct code for deflate? */
1488 bool deflate_draft; /* use draft RFC code for deflate? */
1489 + bool lzs; /* do Stac LZS? */
1490 + bool mppc; /* do MPPC? */
1491 bool mppe; /* do MPPE? */
1492 + bool mppe_40; /* allow 40 bit encryption? */
1493 + bool mppe_56; /* allow 56 bit encryption? */
1494 + bool mppe_128; /* allow 128 bit encryption? */
1495 + bool mppe_stateless; /* allow stateless encryption */
1496 u_short bsd_bits; /* # bits/code for BSD Compress */
1497 u_short deflate_size; /* lg(window size) for Deflate */
1498 + u_short lzs_mode; /* LZS check mode */
1499 + u_short lzs_hists; /* number of LZS histories */
1500 short method; /* code for chosen compression method */
1501 } ccp_options;
1502
1503 diff -Naur ppp-2.4.4.orig/pppd/chap_ms.c ppp-2.4.4/pppd/chap_ms.c
1504 --- ppp-2.4.4.orig/pppd/chap_ms.c 2009-05-09 03:45:07.000000000 -0400
1505 +++ ppp-2.4.4/pppd/chap_ms.c 2009-05-09 03:45:52.000000000 -0400
1506 @@ -897,13 +897,17 @@
1507 /*
1508 * Disable undesirable encryption types. Note that we don't ENABLE
1509 * any encryption types, to avoid overriding manual configuration.
1510 + *
1511 + * It seems that 56 bit keys are unsupported in MS-RADIUS (see RFC 2548)
1512 */
1513 switch(types) {
1514 case MPPE_ENC_TYPES_RC4_40:
1515 - ccp_wantoptions[0].mppe &= ~MPPE_OPT_128; /* disable 128-bit */
1516 + ccp_wantoptions[0].mppe_128 = 0; /* disable 128-bit */
1517 + ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */
1518 break;
1519 case MPPE_ENC_TYPES_RC4_128:
1520 - ccp_wantoptions[0].mppe &= ~MPPE_OPT_40; /* disable 40-bit */
1521 + ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */
1522 + ccp_wantoptions[0].mppe_40 = 0; /* disable 40-bit */
1523 break;
1524 default:
1525 break;
Yousong Zhou staging tree