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

Make EAPOL Authenticator buildable with Microsoft compiler

Browse source
This commit is contained in:
Jouni Malinen 2010-02-19 18:35:40 +02:00 committed by Jouni Malinen
parent c6611ed995
commit 6fa2ec2d2b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/ap/ieee802_1x.h
View file

@ -21,6 +21,10 @@ struct eapol_state_machine;
struct hostapd_config; struct hostapd_config;
struct hostapd_bss_config; struct hostapd_bss_config;
#ifdef _MSC_VER
#pragma pack(push, 1)
#endif /* _MSC_VER */
/* RFC 3580, 4. RC4 EAPOL-Key Frame */ /* RFC 3580, 4. RC4 EAPOL-Key Frame */
struct ieee802_1x_eapol_key { struct ieee802_1x_eapol_key {
@ -43,7 +47,11 @@ struct ieee802_1x_eapol_key {
* represents the number of least significant octets from * represents the number of least significant octets from
* MS-MPPE-Send-Key attribute to be used as the keying material; * MS-MPPE-Send-Key attribute to be used as the keying material;
* RC4 key used in encryption = Key-IV + MS-MPPE-Recv-Key */ * RC4 key used in encryption = Key-IV + MS-MPPE-Recv-Key */
} __attribute__ ((packed)); } STRUCT_PACKED;
#ifdef _MSC_VER
#pragma pack(pop)
#endif /* _MSC_VER */
void ieee802_1x_receive(struct hostapd_data *hapd, const u8 *sa, const u8 *buf, void ieee802_1x_receive(struct hostapd_data *hapd, const u8 *sa, const u8 *buf,

4
src/eapol_auth/eapol_auth_sm.c
View file

@ -1004,8 +1004,8 @@ static const char * eapol_sm_get_eap_req_id_text(void *ctx, size_t *len)
static struct eapol_callbacks eapol_cb = static struct eapol_callbacks eapol_cb =
{ {
.get_eap_user = eapol_sm_get_eap_user, eapol_sm_get_eap_user,
.get_eap_req_id_text = eapol_sm_get_eap_req_id_text, eapol_sm_get_eap_req_id_text
}; };