jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update draft-cam-winget-eap-fast-provisioning references to RFC 5422

Browse source
This commit is contained in:
Jouni Malinen 2009-03-14 10:30:14 +02:00
parent bffc384cbf
commit c590cb67d4
3 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/eap_common/eap_fast_common.h
View file

@ -24,8 +24,7 @@
#define TLS_EXT_PAC_OPAQUE 35 #define TLS_EXT_PAC_OPAQUE 35
/* /*
* draft-cam-winget-eap-fast-provisioning-04.txt: * RFC 5422: Section 4.2.1 - Formats for PAC TLV Attributes / Type Field
* Section 4.2.1 - Formats for PAC TLV Attributes / Type Field
* Note: bit 0x8000 (Mandatory) and bit 0x4000 (Reserved) are also defined * Note: bit 0x8000 (Mandatory) and bit 0x4000 (Reserved) are also defined
* in the general PAC TLV format (Section 4.2). * in the general PAC TLV format (Section 4.2).
*/ */
@ -59,10 +58,7 @@ struct pac_tlv_hdr {
#define EAP_FAST_PAC_KEY_LEN 32 #define EAP_FAST_PAC_KEY_LEN 32
/* draft-cam-winget-eap-fast-provisioning-04.txt: 4.2.6 PAC-Type TLV /* RFC 5422: 4.2.6 PAC-Type TLV */
* Note: Machine Authentication PAC and User Authorization PAC were removed in
* draft-cam-winget-eap-fast-provisioning-03.txt
*/
#define PAC_TYPE_TUNNEL_PAC 1 #define PAC_TYPE_TUNNEL_PAC 1
/* Application Specific Short Lived PACs (only in volatile storage) */ /* Application Specific Short Lived PACs (only in volatile storage) */
/* User Authorization PAC */ /* User Authorization PAC */
@ -73,8 +69,8 @@ struct pac_tlv_hdr {
/* /*
* draft-cam-winget-eap-fast-provisioning-04.txt: * RFC 5422:
* Section 3.4 - Key Derivations Used in the EAP-FAST Provisioning Exchange * Section 3.3 - Key Derivations Used in the EAP-FAST Provisioning Exchange
*/ */
struct eap_fast_key_block_provisioning { struct eap_fast_key_block_provisioning {
/* Extra key material after TLS key_block */ /* Extra key material after TLS key_block */

5
src/eap_common/eap_tlv_common.h
View file

@ -24,8 +24,7 @@
#define EAP_TLV_URI_TLV 8 #define EAP_TLV_URI_TLV 8
#define EAP_TLV_EAP_PAYLOAD_TLV 9 #define EAP_TLV_EAP_PAYLOAD_TLV 9
#define EAP_TLV_INTERMEDIATE_RESULT_TLV 10 #define EAP_TLV_INTERMEDIATE_RESULT_TLV 10
#define EAP_TLV_PAC_TLV 11 /* draft-cam-winget-eap-fast-provisioning-04.txt, #define EAP_TLV_PAC_TLV 11 /* RFC 5422, Section 4.2 */
* Section 4.2 */
#define EAP_TLV_CRYPTO_BINDING_TLV 12 #define EAP_TLV_CRYPTO_BINDING_TLV 12
#define EAP_TLV_CALLING_STATION_ID_TLV 13 #define EAP_TLV_CALLING_STATION_ID_TLV 13
#define EAP_TLV_CALLED_STATION_ID_TLV 14 #define EAP_TLV_CALLED_STATION_ID_TLV 14
@ -99,7 +98,7 @@ struct eap_tlv_request_action_tlv {
be16 action; be16 action;
} STRUCT_PACKED; } STRUCT_PACKED;
/* draft-cam-winget-eap-fast-provisiong-04.txt, Section 4.2.6 - PAC-Type TLV */ /* RFC 5422, Section 4.2.6 - PAC-Type TLV */
struct eap_tlv_pac_type_tlv { struct eap_tlv_pac_type_tlv {
be16 tlv_type; /* PAC_TYPE_PAC_TYPE */ be16 tlv_type; /* PAC_TYPE_PAC_TYPE */
be16 length; be16 length;

7
src/eap_peer/eap_fast.c
View file

@ -918,10 +918,7 @@ static int eap_fast_parse_pac_info(struct eap_fast_pac *entry, int type,
entry->a_id_info_len = len; entry->a_id_info_len = len;
break; break;
case PAC_TYPE_PAC_TYPE: case PAC_TYPE_PAC_TYPE:
/* /* RFC 5422, Section 4.2.6 - PAC-Type TLV */
* draft-cam-winget-eap-fast-provisioning-04.txt,
* Section 4.2.6 - PAC-Type TLV
*/
if (len != 2) { if (len != 2) {
wpa_printf(MSG_INFO, "EAP-FAST: Invalid PAC-Type " wpa_printf(MSG_INFO, "EAP-FAST: Invalid PAC-Type "
"length %lu (expected 2)", "length %lu (expected 2)",
@ -961,7 +958,7 @@ static int eap_fast_process_pac_info(struct eap_fast_pac *entry)
size_t left, len; size_t left, len;
int type; int type;
/* draft-cam-winget-eap-fast-provisioning-04.txt, Section 4.2.4 */ /* RFC 5422, Section 4.2.4 */
/* PAC-Type defaults to Tunnel PAC (Type 1) */ /* PAC-Type defaults to Tunnel PAC (Type 1) */
entry->pac_type = PAC_TYPE_TUNNEL_PAC; entry->pac_type = PAC_TYPE_TUNNEL_PAC;