DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Simplify eapol_sm_notify_pmkid_attempt()

Browse source 
Drop the unneeded 'attempt' argument. This was originally used for
indicating an aborted PMKID caching attempt, but a fix in 2006 removed
the only such user and since that time, only attempt == 1 has been used.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-01-28 01:26:14 +02:00
parent a08fdb17aa
commit ba4226130e
5 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/eapol_supp/eapol_supp_sm.c
View file

@ -1634,21 +1634,15 @@ void eapol_sm_notify_cached(struct eapol_sm *sm)
/** /**
* eapol_sm_notify_pmkid_attempt - Notification of PMKSA caching * eapol_sm_notify_pmkid_attempt - Notification of PMKSA caching
* @sm: Pointer to EAPOL state machine allocated with eapol_sm_init() * @sm: Pointer to EAPOL state machine allocated with eapol_sm_init()
* @attempt: Whether PMKSA caching is tried
* *
* Notify EAPOL state machines whether PMKSA caching is used. * Notify EAPOL state machines if PMKSA caching is used.
*/ */
void eapol_sm_notify_pmkid_attempt(struct eapol_sm *sm, int attempt) void eapol_sm_notify_pmkid_attempt(struct eapol_sm *sm)
{ {
if (sm == NULL) if (sm == NULL)
return; return;
if (attempt) { wpa_printf(MSG_DEBUG, "RSN: Trying to use cached PMKSA");
wpa_printf(MSG_DEBUG, "RSN: Trying to use cached PMKSA"); sm->cached_pmk = TRUE;
sm->cached_pmk = TRUE;
} else {
wpa_printf(MSG_DEBUG, "RSN: Do not try to use cached PMKSA");
sm->cached_pmk = FALSE;
}
} }

6
src/eapol_supp/eapol_supp_sm.h
View file

@ -307,7 +307,7 @@ int eapol_sm_get_key(struct eapol_sm *sm, u8 *key, size_t len);
const u8 * eapol_sm_get_session_id(struct eapol_sm *sm, size_t *len); const u8 * eapol_sm_get_session_id(struct eapol_sm *sm, size_t *len);
void eapol_sm_notify_logoff(struct eapol_sm *sm, Boolean logoff); void eapol_sm_notify_logoff(struct eapol_sm *sm, Boolean logoff);
void eapol_sm_notify_cached(struct eapol_sm *sm); void eapol_sm_notify_cached(struct eapol_sm *sm);
void eapol_sm_notify_pmkid_attempt(struct eapol_sm *sm, int attempt); void eapol_sm_notify_pmkid_attempt(struct eapol_sm *sm);
void eapol_sm_register_scard_ctx(struct eapol_sm *sm, void *ctx); void eapol_sm_register_scard_ctx(struct eapol_sm *sm, void *ctx);
void eapol_sm_notify_portControl(struct eapol_sm *sm, PortControl portControl); void eapol_sm_notify_portControl(struct eapol_sm *sm, PortControl portControl);
void eapol_sm_notify_ctrl_attached(struct eapol_sm *sm); void eapol_sm_notify_ctrl_attached(struct eapol_sm *sm);
@ -391,7 +391,9 @@ static inline void eapol_sm_notify_logoff(struct eapol_sm *sm, Boolean logoff)
static inline void eapol_sm_notify_cached(struct eapol_sm *sm) static inline void eapol_sm_notify_cached(struct eapol_sm *sm)
{ {
} }
#define eapol_sm_notify_pmkid_attempt(sm, attempt) do { } while (0) static inline void eapol_sm_notify_pmkid_attempt(struct eapol_sm *sm)
{
}
#define eapol_sm_register_scard_ctx(sm, ctx) do { } while (0) #define eapol_sm_register_scard_ctx(sm, ctx) do { } while (0)
static inline void eapol_sm_notify_portControl(struct eapol_sm *sm, static inline void eapol_sm_notify_portControl(struct eapol_sm *sm,
PortControl portControl) PortControl portControl)

2
wpa_supplicant/events.c
View file

@ -240,7 +240,7 @@ static void wpa_find_assoc_pmkid(struct wpa_supplicant *wpa_s)
ie.pmkid + i * PMKID_LEN, ie.pmkid + i * PMKID_LEN,
NULL, NULL, 0); NULL, NULL, 0);
if (pmksa_set == 0) { if (pmksa_set == 0) {
eapol_sm_notify_pmkid_attempt(wpa_s->eapol, 1); eapol_sm_notify_pmkid_attempt(wpa_s->eapol);
break; break;
} }
} }

2
wpa_supplicant/sme.c
View file

@ -297,7 +297,7 @@ static void sme_send_authentication(struct wpa_supplicant *wpa_s,
if (pmksa_cache_set_current(wpa_s->wpa, NULL, bss->bssid, if (pmksa_cache_set_current(wpa_s->wpa, NULL, bss->bssid,
wpa_s->current_ssid, wpa_s->current_ssid,
try_opportunistic) == 0) try_opportunistic) == 0)
eapol_sm_notify_pmkid_attempt(wpa_s->eapol, 1); eapol_sm_notify_pmkid_attempt(wpa_s->eapol);
wpa_s->sme.assoc_req_ie_len = sizeof(wpa_s->sme.assoc_req_ie); wpa_s->sme.assoc_req_ie_len = sizeof(wpa_s->sme.assoc_req_ie);
if (wpa_supplicant_set_suites(wpa_s, bss, ssid, if (wpa_supplicant_set_suites(wpa_s, bss, ssid,
wpa_s->sme.assoc_req_ie, wpa_s->sme.assoc_req_ie,

2
wpa_supplicant/wpa_supplicant.c
View file

@ -1906,7 +1906,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
(ssid->proto & WPA_PROTO_RSN); (ssid->proto & WPA_PROTO_RSN);
if (pmksa_cache_set_current(wpa_s->wpa, NULL, bss->bssid, if (pmksa_cache_set_current(wpa_s->wpa, NULL, bss->bssid,
ssid, try_opportunistic) == 0) ssid, try_opportunistic) == 0)
eapol_sm_notify_pmkid_attempt(wpa_s->eapol, 1); eapol_sm_notify_pmkid_attempt(wpa_s->eapol);
wpa_ie_len = sizeof(wpa_ie); wpa_ie_len = sizeof(wpa_ie);
if (wpa_supplicant_set_suites(wpa_s, bss, ssid, if (wpa_supplicant_set_suites(wpa_s, bss, ssid,
wpa_ie, &wpa_ie_len)) { wpa_ie, &wpa_ie_len)) {