Deleted Added
full compact
eap_fast.c (209158) eap_fast.c (214734)
1/*
2 * EAP peer method: EAP-FAST (RFC 4851)
3 * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation.
8 *
9 * Alternatively, this software may be distributed under the terms of BSD
10 * license.
11 *
12 * See README and COPYING for more details.
13 */
14
15#include "includes.h"
16
17#include "common.h"
1/*
2 * EAP peer method: EAP-FAST (RFC 4851)
3 * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
4 *
5 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 2 as
7 * published by the Free Software Foundation.
8 *
9 * Alternatively, this software may be distributed under the terms of BSD
10 * license.
11 *
12 * See README and COPYING for more details.
13 */
14
15#include "includes.h"
16
17#include "common.h"
18#include "crypto/tls.h"
19#include "crypto/sha1.h"
20#include "eap_common/eap_tlv_common.h"
18#include "eap_i.h"
19#include "eap_tls_common.h"
20#include "eap_config.h"
21#include "eap_i.h"
22#include "eap_tls_common.h"
23#include "eap_config.h"
21#include "tls.h"
22#include "eap_common/eap_tlv_common.h"
23#include "sha1.h"
24#include "eap_fast_pac.h"
25
26#ifdef EAP_FAST_DYNAMIC
27#include "eap_fast_pac.c"
28#endif /* EAP_FAST_DYNAMIC */
29
30/* TODO:
31 * - test session resumption and enable it if it interoperates

--- 1408 unchanged lines hidden (view full) ---

1440 struct eap_fast_data *data, u8 flags,
1441 const u8 *pos, size_t left)
1442{
1443 const u8 *a_id;
1444 size_t a_id_len;
1445
1446 /* EAP-FAST Version negotiation (section 3.1) */
1447 wpa_printf(MSG_DEBUG, "EAP-FAST: Start (server ver=%d, own ver=%d)",
24#include "eap_fast_pac.h"
25
26#ifdef EAP_FAST_DYNAMIC
27#include "eap_fast_pac.c"
28#endif /* EAP_FAST_DYNAMIC */
29
30/* TODO:
31 * - test session resumption and enable it if it interoperates

--- 1408 unchanged lines hidden (view full) ---

1440 struct eap_fast_data *data, u8 flags,
1441 const u8 *pos, size_t left)
1442{
1443 const u8 *a_id;
1444 size_t a_id_len;
1445
1446 /* EAP-FAST Version negotiation (section 3.1) */
1447 wpa_printf(MSG_DEBUG, "EAP-FAST: Start (server ver=%d, own ver=%d)",
1448 flags & EAP_PEAP_VERSION_MASK, data->fast_version);
1449 if ((flags & EAP_PEAP_VERSION_MASK) < data->fast_version)
1450 data->fast_version = flags & EAP_PEAP_VERSION_MASK;
1448 flags & EAP_TLS_VERSION_MASK, data->fast_version);
1449 if ((flags & EAP_TLS_VERSION_MASK) < data->fast_version)
1450 data->fast_version = flags & EAP_TLS_VERSION_MASK;
1451 wpa_printf(MSG_DEBUG, "EAP-FAST: Using FAST version %d",
1452 data->fast_version);
1453
1454 a_id = eap_fast_get_a_id(pos, left, &a_id_len);
1455 eap_fast_select_pac(data, a_id, a_id_len);
1456
1457 if (data->resuming && data->current_pac) {
1458 wpa_printf(MSG_DEBUG, "EAP-FAST: Trying to resume session - "

--- 254 unchanged lines hidden ---
1451 wpa_printf(MSG_DEBUG, "EAP-FAST: Using FAST version %d",
1452 data->fast_version);
1453
1454 a_id = eap_fast_get_a_id(pos, left, &a_id_len);
1455 eap_fast_select_pac(data, a_id, a_id_len);
1456
1457 if (data->resuming && data->current_pac) {
1458 wpa_printf(MSG_DEBUG, "EAP-FAST: Trying to resume session - "

--- 254 unchanged lines hidden ---