aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2010-02-19 16:35:40 (GMT)
committerJouni Malinen <j@w1.fi>2010-02-19 16:35:40 (GMT)
commit6fa2ec2d2b7afa5347af0c4fa9beb8a147e897cf (patch)
treefda6294b09e39d0c0000b8225e426164b3752ac5 /src
parentc6611ed995cfbbb0759fedf1fd7960a4cceb5da7 (diff)
downloadhostap-6fa2ec2d2b7afa5347af0c4fa9beb8a147e897cf.zip
hostap-6fa2ec2d2b7afa5347af0c4fa9beb8a147e897cf.tar.gz
hostap-6fa2ec2d2b7afa5347af0c4fa9beb8a147e897cf.tar.bz2
Make EAPOL Authenticator buildable with Microsoft compiler
Diffstat (limited to 'src')
-rw-r--r--src/ap/ieee802_1x.h10
-rw-r--r--src/eapol_auth/eapol_auth_sm.c4
2 files changed, 11 insertions, 3 deletions
diff --git a/src/ap/ieee802_1x.h b/src/ap/ieee802_1x.h
index e7be41b..1a4d2eb 100644
--- a/src/ap/ieee802_1x.h
+++ b/src/ap/ieee802_1x.h
@@ -21,6 +21,10 @@ struct eapol_state_machine;
struct hostapd_config;
struct hostapd_bss_config;
+#ifdef _MSC_VER
+#pragma pack(push, 1)
+#endif /* _MSC_VER */
+
/* RFC 3580, 4. RC4 EAPOL-Key Frame */
struct ieee802_1x_eapol_key {
@@ -43,7 +47,11 @@ struct ieee802_1x_eapol_key {
* represents the number of least significant octets from
* MS-MPPE-Send-Key attribute to be used as the keying material;
* 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,
diff --git a/src/eapol_auth/eapol_auth_sm.c b/src/eapol_auth/eapol_auth_sm.c
index ec5bc39..ca956eb 100644
--- a/src/eapol_auth/eapol_auth_sm.c
+++ b/src/eapol_auth/eapol_auth_sm.c
@@ -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 =
{
- .get_eap_user = eapol_sm_get_eap_user,
- .get_eap_req_id_text = eapol_sm_get_eap_req_id_text,
+ eapol_sm_get_eap_user,
+ eapol_sm_get_eap_req_id_text
};