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

Fix wpa_supplicant build with IEEE8021X_EAPOL=y and CONFIG_NO_WPA=y

Browse source 
The PMKSA caching and RSN pre-authentication components were marked as
conditional on IEEE8021X_EAPOL. However, the empty wrappers are needed
also in a case IEEE8021X_EAPOL is defined with CONFIG_NO_WPA.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-01-15 20:04:41 +02:00 committed by Jouni Malinen
parent 5a38a7fe43
commit 6b418ce862
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/rsn_supp/pmksa_cache.c
View file

@ -15,7 +15,7 @@
#include "wpa_i.h" #include "wpa_i.h"
#include "pmksa_cache.h" #include "pmksa_cache.h"
#ifdef IEEE8021X_EAPOL #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA)
static const int pmksa_cache_max_entries = 32; static const int pmksa_cache_max_entries = 32;

2
src/rsn_supp/pmksa_cache.h
View file

@ -44,7 +44,7 @@ enum pmksa_free_reason {
PMKSA_EXPIRE, PMKSA_EXPIRE,
}; };
#ifdef IEEE8021X_EAPOL #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA)
struct rsn_pmksa_cache * struct rsn_pmksa_cache *
pmksa_cache_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry, pmksa_cache_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry,

4
src/rsn_supp/preauth.c
View file

@ -18,7 +18,7 @@
#include "wpa_i.h" #include "wpa_i.h"
#ifdef IEEE8021X_EAPOL #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA)
#define PMKID_CANDIDATE_PRIO_SCAN 1000 #define PMKID_CANDIDATE_PRIO_SCAN 1000
@ -538,4 +538,4 @@ int rsn_preauth_in_progress(struct wpa_sm *sm)
return sm->preauth_eapol != NULL; return sm->preauth_eapol != NULL;
} }
#endif /* IEEE8021X_EAPOL */ #endif /* IEEE8021X_EAPOL && !CONFIG_NO_WPA */

6
src/rsn_supp/preauth.h
View file

@ -11,7 +11,7 @@
struct wpa_scan_results; struct wpa_scan_results;
#ifdef IEEE8021X_EAPOL #if defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA)
void pmksa_candidate_free(struct wpa_sm *sm); void pmksa_candidate_free(struct wpa_sm *sm);
int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst, int rsn_preauth_init(struct wpa_sm *sm, const u8 *dst,
@ -27,7 +27,7 @@ int rsn_preauth_get_status(struct wpa_sm *sm, char *buf, size_t buflen,
int verbose); int verbose);
int rsn_preauth_in_progress(struct wpa_sm *sm); int rsn_preauth_in_progress(struct wpa_sm *sm);
#else /* IEEE8021X_EAPOL */ #else /* IEEE8021X_EAPOL && !CONFIG_NO_WPA */
static inline void pmksa_candidate_free(struct wpa_sm *sm) static inline void pmksa_candidate_free(struct wpa_sm *sm)
{ {
@ -74,6 +74,6 @@ static inline int rsn_preauth_in_progress(struct wpa_sm *sm)
return 0; return 0;
} }
#endif /* IEEE8021X_EAPOL */ #endif /* IEEE8021X_EAPOL && !CONFIG_NO_WPA */
#endif /* PREAUTH_H */ #endif /* PREAUTH_H */