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

rsn_supp: Do not track expiration time

Browse source 
The eloop already tracks the expiration/lifetime, and the expiration
isn't really used, so remove it. It should otherwise have used monotonic
time, but since it's not actually used, we can remove it instead.

Signed-hostap: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2013-12-16 21:08:31 +01:00 committed by Jouni Malinen
parent 587071765d
commit e05f0605bf
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/rsn_supp/peerkey.c
View file

@ -516,7 +516,6 @@ static int wpa_supplicant_process_smk_m45(
struct wpa_peerkey *peerkey; struct wpa_peerkey *peerkey;
struct wpa_eapol_ie_parse kde; struct wpa_eapol_ie_parse kde;
u32 lifetime; u32 lifetime;
struct os_time now;
if (!sm->peerkey_enabled || sm->proto != WPA_PROTO_RSN) { if (!sm->peerkey_enabled || sm->proto != WPA_PROTO_RSN) {
wpa_printf(MSG_DEBUG, "RSN: SMK handshake not allowed for " wpa_printf(MSG_DEBUG, "RSN: SMK handshake not allowed for "
@ -568,10 +567,8 @@ static int wpa_supplicant_process_smk_m45(
lifetime = WPA_GET_BE32(kde.lifetime); lifetime = WPA_GET_BE32(kde.lifetime);
wpa_printf(MSG_DEBUG, "RSN: SMK lifetime %u seconds", lifetime); wpa_printf(MSG_DEBUG, "RSN: SMK lifetime %u seconds", lifetime);
if (lifetime > 1000000000) if (lifetime > 1000000000)
lifetime = 1000000000; /* avoid overflowing expiration time */ lifetime = 1000000000; /* avoid overflowing eloop time */
peerkey->lifetime = lifetime; peerkey->lifetime = lifetime;
os_get_time(&now);
peerkey->expiration = now.sec + lifetime;
eloop_register_timeout(lifetime, 0, wpa_supplicant_smk_timeout, eloop_register_timeout(lifetime, 0, wpa_supplicant_smk_timeout,
sm, peerkey); sm, peerkey);
@ -736,7 +733,6 @@ static void wpa_supplicant_update_smk_lifetime(struct wpa_sm *sm,
struct wpa_eapol_ie_parse *kde) struct wpa_eapol_ie_parse *kde)
{ {
u32 lifetime; u32 lifetime;
struct os_time now;
if (kde->lifetime == NULL || kde->lifetime_len < sizeof(lifetime)) if (kde->lifetime == NULL || kde->lifetime_len < sizeof(lifetime))
return; return;
@ -755,8 +751,6 @@ static void wpa_supplicant_update_smk_lifetime(struct wpa_sm *sm,
lifetime, peerkey->lifetime); lifetime, peerkey->lifetime);
peerkey->lifetime = lifetime; peerkey->lifetime = lifetime;
os_get_time(&now);
peerkey->expiration = now.sec + lifetime;
eloop_cancel_timeout(wpa_supplicant_smk_timeout, sm, peerkey); eloop_cancel_timeout(wpa_supplicant_smk_timeout, sm, peerkey);
eloop_register_timeout(lifetime, 0, wpa_supplicant_smk_timeout, eloop_register_timeout(lifetime, 0, wpa_supplicant_smk_timeout,
sm, peerkey); sm, peerkey);

1
src/rsn_supp/peerkey.h
View file

@ -24,7 +24,6 @@ struct wpa_peerkey {
int smk_complete; int smk_complete;
u8 smkid[PMKID_LEN]; u8 smkid[PMKID_LEN];
u32 lifetime; u32 lifetime;
os_time_t expiration;
int cipher; /* Selected cipher (WPA_CIPHER_*) */ int cipher; /* Selected cipher (WPA_CIPHER_*) */
u8 replay_counter[WPA_REPLAY_COUNTER_LEN]; u8 replay_counter[WPA_REPLAY_COUNTER_LEN];
int replay_counter_set; int replay_counter_set;