projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated to hostap_2_6
[mech_eap.git]
/
libeap
/
src
/
rsn_supp
/
preauth.c
diff --git
a/libeap/src/rsn_supp/preauth.c
b/libeap/src/rsn_supp/preauth.c
index
c6534af
..
4c9a4fb
100644
(file)
--- a/
libeap/src/rsn_supp/preauth.c
+++ b/
libeap/src/rsn_supp/preauth.c
@@
-18,7
+18,7
@@
#include "wpa_i.h"
#include "wpa_i.h"
-#if
def IEEE8021X_EAPOL
+#if
defined(IEEE8021X_EAPOL) && !defined(CONFIG_NO_WPA)
#define PMKID_CANDIDATE_PRIO_SCAN 1000
#define PMKID_CANDIDATE_PRIO_SCAN 1000
@@
-93,7
+93,7
@@
static void rsn_preauth_eapol_cb(struct eapol_sm *eapol,
wpa_hexdump_key(MSG_DEBUG, "RSN: PMK from pre-auth",
pmk, pmk_len);
sm->pmk_len = pmk_len;
wpa_hexdump_key(MSG_DEBUG, "RSN: PMK from pre-auth",
pmk, pmk_len);
sm->pmk_len = pmk_len;
- pmksa_cache_add(sm->pmksa, pmk, pmk_len,
+ pmksa_cache_add(sm->pmksa, pmk, pmk_len,
NULL,
NULL, 0,
sm->preauth_bssid, sm->own_addr,
sm->network_ctx,
NULL, 0,
sm->preauth_bssid, sm->own_addr,
sm->network_ctx,
@@
-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
*/