From 60c44471bf25f9e84d8701afe1bbcbcc88e18c89 Mon Sep 17 00:00:00 2001 From: rpaulo Date: Sun, 13 Jun 2010 20:32:04 +0000 Subject: Import wpa_supplicant & hostapd 0.6.9. --- src/eap_common/.gitignore | 1 - src/eap_common/eap_defs.h | 2 +- src/eap_common/eap_fast_common.h | 12 ++++-------- src/eap_common/eap_tlv_common.h | 5 ++--- 4 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 src/eap_common/.gitignore (limited to 'src/eap_common') diff --git a/src/eap_common/.gitignore b/src/eap_common/.gitignore deleted file mode 100644 index a438335..0000000 --- a/src/eap_common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.d diff --git a/src/eap_common/eap_defs.h b/src/eap_common/eap_defs.h index 0ac95b5..0efe7ab 100644 --- a/src/eap_common/eap_defs.h +++ b/src/eap_common/eap_defs.h @@ -67,7 +67,7 @@ typedef enum { EAP_TYPE_SAKE = 48 /* RFC 4763 */, EAP_TYPE_IKEV2 = 49 /* RFC 5106 */, EAP_TYPE_AKA_PRIME = 50 /* draft-arkko-eap-aka-kdf-10.txt */, - EAP_TYPE_GPSK = 51 /* draft-ietf-emu-eap-gpsk-17.txt */, + EAP_TYPE_GPSK = 51 /* RFC 5433 */, EAP_TYPE_EXPANDED = 254 /* RFC 3748 */ } EapType; diff --git a/src/eap_common/eap_fast_common.h b/src/eap_common/eap_fast_common.h index 257123e..c85fd37 100644 --- a/src/eap_common/eap_fast_common.h +++ b/src/eap_common/eap_fast_common.h @@ -24,8 +24,7 @@ #define TLS_EXT_PAC_OPAQUE 35 /* - * draft-cam-winget-eap-fast-provisioning-04.txt: - * Section 4.2.1 - Formats for PAC TLV Attributes / Type Field + * RFC 5422: Section 4.2.1 - Formats for PAC TLV Attributes / Type Field * Note: bit 0x8000 (Mandatory) and bit 0x4000 (Reserved) are also defined * in the general PAC TLV format (Section 4.2). */ @@ -59,10 +58,7 @@ struct pac_tlv_hdr { #define EAP_FAST_PAC_KEY_LEN 32 -/* draft-cam-winget-eap-fast-provisioning-04.txt: 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 - */ +/* RFC 5422: 4.2.6 PAC-Type TLV */ #define PAC_TYPE_TUNNEL_PAC 1 /* Application Specific Short Lived PACs (only in volatile storage) */ /* User Authorization PAC */ @@ -73,8 +69,8 @@ struct pac_tlv_hdr { /* - * draft-cam-winget-eap-fast-provisioning-04.txt: - * Section 3.4 - Key Derivations Used in the EAP-FAST Provisioning Exchange + * RFC 5422: + * Section 3.3 - Key Derivations Used in the EAP-FAST Provisioning Exchange */ struct eap_fast_key_block_provisioning { /* Extra key material after TLS key_block */ diff --git a/src/eap_common/eap_tlv_common.h b/src/eap_common/eap_tlv_common.h index e3836d5..f86015d 100644 --- a/src/eap_common/eap_tlv_common.h +++ b/src/eap_common/eap_tlv_common.h @@ -24,8 +24,7 @@ #define EAP_TLV_URI_TLV 8 #define EAP_TLV_EAP_PAYLOAD_TLV 9 #define EAP_TLV_INTERMEDIATE_RESULT_TLV 10 -#define EAP_TLV_PAC_TLV 11 /* draft-cam-winget-eap-fast-provisioning-04.txt, - * Section 4.2 */ +#define EAP_TLV_PAC_TLV 11 /* RFC 5422, Section 4.2 */ #define EAP_TLV_CRYPTO_BINDING_TLV 12 #define EAP_TLV_CALLING_STATION_ID_TLV 13 #define EAP_TLV_CALLED_STATION_ID_TLV 14 @@ -99,7 +98,7 @@ struct eap_tlv_request_action_tlv { be16 action; } 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 { be16 tlv_type; /* PAC_TYPE_PAC_TYPE */ be16 length; -- cgit v1.1