diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-05-01 09:53:34 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-05-01 09:53:34 -0700 |
| commit | d1c753ef9cb780f24f7b8000c3540ab1452bc7a9 (patch) | |
| tree | 8cbfb1d5d458629ca3bddc1454082c51d1509efd /src/eap_server | |
| parent | 5c69fc8677c2e4e98950d46411ace3fa779421a0 (diff) | |
| parent | 1d755d025b206e22b06aeb322e25a79f98ca7777 (diff) | |
| download | android_external_wpa_supplicant_8-d1c753ef9cb780f24f7b8000c3540ab1452bc7a9.tar.gz android_external_wpa_supplicant_8-d1c753ef9cb780f24f7b8000c3540ab1452bc7a9.tar.bz2 android_external_wpa_supplicant_8-d1c753ef9cb780f24f7b8000c3540ab1452bc7a9.zip | |
Merge commit '1d755d0' into master_merge
Diffstat (limited to 'src/eap_server')
| -rw-r--r-- | src/eap_server/Makefile | 19 | ||||
| -rw-r--r-- | src/eap_server/eap.h | 2 | ||||
| -rw-r--r-- | src/eap_server/eap_i.h | 2 | ||||
| -rw-r--r-- | src/eap_server/eap_server.c | 2 |
4 files changed, 19 insertions, 6 deletions
diff --git a/src/eap_server/Makefile b/src/eap_server/Makefile index adfd3dfd..1172b724 100644 --- a/src/eap_server/Makefile +++ b/src/eap_server/Makefile @@ -1,8 +1,21 @@ -all: - @echo Nothing to be made. +all: libeap_server.a clean: - rm -f *~ *.o *.d *.gcno *.gcda *.gcov + rm -f *~ *.o *.d *.gcno *.gcda *.gcov libeap_server.a install: @echo Nothing to be made. + +include ../lib.rules + +CFLAGS += -DCONFIG_HS20 + +LIB_OBJS= \ + eap_server.o \ + eap_server_identity.o \ + eap_server_methods.o + +libeap_server.a: $(LIB_OBJS) + $(AR) crT $@ $? + +-include $(OBJS:%.o=%.d) diff --git a/src/eap_server/eap.h b/src/eap_server/eap.h index b825e18f..09be5818 100644 --- a/src/eap_server/eap.h +++ b/src/eap_server/eap.h @@ -139,7 +139,7 @@ struct eap_config { struct eap_sm * eap_server_sm_init(void *eapol_ctx, - struct eapol_callbacks *eapol_cb, + const struct eapol_callbacks *eapol_cb, struct eap_config *eap_conf); void eap_server_sm_deinit(struct eap_sm *sm); int eap_server_sm_step(struct eap_sm *sm); diff --git a/src/eap_server/eap_i.h b/src/eap_server/eap_i.h index 7d723091..978c8794 100644 --- a/src/eap_server/eap_i.h +++ b/src/eap_server/eap_i.h @@ -155,7 +155,7 @@ struct eap_sm { /* not defined in RFC 4137 */ Boolean changed; void *eapol_ctx, *msg_ctx; - struct eapol_callbacks *eapol_cb; + const struct eapol_callbacks *eapol_cb; void *eap_method_priv; u8 *identity; size_t identity_len; diff --git a/src/eap_server/eap_server.c b/src/eap_server/eap_server.c index 693debe8..1f38d78b 100644 --- a/src/eap_server/eap_server.c +++ b/src/eap_server/eap_server.c @@ -1802,7 +1802,7 @@ static void eap_user_free(struct eap_user *user) * This function allocates and initializes an EAP state machine. */ struct eap_sm * eap_server_sm_init(void *eapol_ctx, - struct eapol_callbacks *eapol_cb, + const struct eapol_callbacks *eapol_cb, struct eap_config *conf) { struct eap_sm *sm; |