Move EAPOL authenticator state machine into src/eapol_auth

This is now completely independent from hostapd-specific code, so
it can be moved to be under the src tree.
This commit is contained in:
Jouni Malinen 2009-11-29 20:03:28 +02:00
parent a2befd37cc
commit 281c950be4
12 changed files with 19 additions and 14 deletions

View file

@ -38,6 +38,9 @@ driver is used.
\dir src/eap_server EAP server \dir src/eap_server EAP server
\dir src/eapol_auth EAPOL authenticator
\dir src/eapol_supp EAPOL supplicant \dir src/eapol_supp EAPOL supplicant

View file

@ -37,7 +37,7 @@ CFLAGS += -DCONFIG_NATIVE_WINDOWS
LIBS += -lws2_32 LIBS += -lws2_32
endif endif
OBJS = hostapd.o main.o ieee802_1x.o eapol_sm.o \ OBJS = hostapd.o main.o ieee802_1x.o \
config.o ieee802_11_auth.o \ config.o ieee802_11_auth.o \
sta_info.o wpa.o \ sta_info.o wpa.o \
preauth.o pmksa_cache.o \ preauth.o pmksa_cache.o \
@ -63,6 +63,8 @@ OBJS += ../src/utils/ip_addr.o
OBJS += ../src/common/ieee802_11_common.o OBJS += ../src/common/ieee802_11_common.o
OBJS += ../src/common/wpa_common.o OBJS += ../src/common/wpa_common.o
OBJS += ../src/eapol_auth/eapol_auth_sm.o
ifdef CONFIG_NO_RADIUS ifdef CONFIG_NO_RADIUS
CFLAGS += -DCONFIG_NO_RADIUS CFLAGS += -DCONFIG_NO_RADIUS
CONFIG_NO_ACCOUNTING=y CONFIG_NO_ACCOUNTING=y

View file

@ -21,7 +21,7 @@
#include "beacon.h" #include "beacon.h"
#include "hw_features.h" #include "hw_features.h"
#include "accounting.h" #include "accounting.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "iapp.h" #include "iapp.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "ieee802_11_auth.h" #include "ieee802_11_auth.h"

View file

@ -20,7 +20,7 @@
#include "accounting.h" #include "accounting.h"
#include "radius/radius.h" #include "radius/radius.h"
#include "radius/radius_client.h" #include "radius/radius_client.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "md5.h" #include "md5.h"
#include "crypto.h" #include "crypto.h"
#include "eloop.h" #include "eloop.h"

View file

@ -21,7 +21,7 @@
#include "eloop.h" #include "eloop.h"
#include "sha1.h" #include "sha1.h"
#include "sha256.h" #include "sha256.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "pmksa_cache.h" #include "pmksa_cache.h"

View file

@ -25,7 +25,7 @@
#include "sta_flags.h" #include "sta_flags.h"
#include "sta_info.h" #include "sta_info.h"
#include "common/wpa_common.h" #include "common/wpa_common.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "wpa.h" #include "wpa.h"
#include "preauth.h" #include "preauth.h"

View file

@ -18,7 +18,7 @@
#include "common.h" #include "common.h"
#include "config.h" #include "config.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "wpa.h" #include "wpa.h"
#include "sha1.h" #include "sha1.h"
#include "sha256.h" #include "sha256.h"

View file

@ -17,7 +17,7 @@
#include "common.h" #include "common.h"
#include "config.h" #include "config.h"
#include "ieee802_11.h" #include "ieee802_11.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "wpa.h" #include "wpa.h"
#include "pmksa_cache.h" #include "pmksa_cache.h"
#include "wpa_auth_ie.h" #include "wpa_auth_ie.h"

View file

@ -24,7 +24,7 @@
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
#include "sta_flags.h" #include "sta_flags.h"
#include "sta_info.h" #include "sta_info.h"
#include "eapol_sm.h" #include "eapol_auth/eapol_auth_sm.h"
#include "wps/wps.h" #include "wps/wps.h"
#include "wps/wps_defs.h" #include "wps/wps_defs.h"
#include "wps/wps_dev_attr.h" #include "wps/wps_dev_attr.h"

View file

@ -15,7 +15,7 @@
#include "includes.h" #include "includes.h"
#include "common.h" #include "common.h"
#include "eapol_sm.h" #include "eapol_auth_sm.h"
#include "eloop.h" #include "eloop.h"
#include "common/eapol_common.h" #include "common/eapol_common.h"
#include "eap_server/eap.h" #include "eap_server/eap.h"

View file

@ -12,8 +12,8 @@
* See README and COPYING for more details. * See README and COPYING for more details.
*/ */
#ifndef EAPOL_SM_H #ifndef EAPOL_AUTH_SM_H
#define EAPOL_SM_H #define EAPOL_AUTH_SM_H
#include "common/defs.h" #include "common/defs.h"
#include "radius/radius.h" #include "radius/radius.h"
@ -251,4 +251,4 @@ void eapol_auth_dump_state(FILE *f, const char *prefix,
struct eapol_state_machine *sm); struct eapol_state_machine *sm);
int eapol_auth_eap_pending_cb(struct eapol_state_machine *sm, void *ctx); int eapol_auth_eap_pending_cb(struct eapol_state_machine *sm, void *ctx);
#endif /* EAPOL_SM_H */ #endif /* EAPOL_AUTH_SM_H */

View file

@ -589,7 +589,7 @@ OBJS += ../hostapd/wpa_auth_ie.o
OBJS += ../hostapd/tkip_countermeasures.o OBJS += ../hostapd/tkip_countermeasures.o
OBJS += ../hostapd/mlme.o OBJS += ../hostapd/mlme.o
OBJS += ../hostapd/ieee802_1x.o OBJS += ../hostapd/ieee802_1x.o
OBJS += ../hostapd/eapol_sm.o OBJS += ../src/eapol_auth/eapol_auth_sm.o
OBJS += ../hostapd/ieee802_11_auth.o OBJS += ../hostapd/ieee802_11_auth.o
OBJS += ../hostapd/drv_callbacks.o OBJS += ../hostapd/drv_callbacks.o
ifdef CONFIG_CTRL_IFACE ifdef CONFIG_CTRL_IFACE
@ -636,7 +636,7 @@ OBJS_h += ../src/radius/radius_client.o
endif endif
ifdef CONFIG_AUTHENTICATOR ifdef CONFIG_AUTHENTICATOR
OBJS_h += ../hostapd/eapol_sm.o OBJS_h += ../eapol_auth/eapol_auth_sm.o
OBJS_h += ../hostapd/ieee802_1x.o OBJS_h += ../hostapd/ieee802_1x.o
endif endif