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

wps_registrar: Use monotonic time for PIN timeout

Browse source 
If the PIN expires, then a timeout is given, so that monotonic
time should be used.

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

10
src/wps/wps_registrar.c
View file

@ -82,7 +82,7 @@ struct wps_uuid_pin {
#define PIN_LOCKED BIT(0) #define PIN_LOCKED BIT(0)
#define PIN_EXPIRES BIT(1) #define PIN_EXPIRES BIT(1)
int flags; int flags;
struct os_time expiration; struct os_reltime expiration;
u8 enrollee_addr[ETH_ALEN]; u8 enrollee_addr[ETH_ALEN];
}; };
@ -748,7 +748,7 @@ int wps_registrar_add_pin(struct wps_registrar *reg, const u8 *addr,
if (timeout) { if (timeout) {
p->flags |= PIN_EXPIRES; p->flags |= PIN_EXPIRES;
os_get_time(&p->expiration); os_get_reltime(&p->expiration);
p->expiration.sec += timeout; p->expiration.sec += timeout;
} }
@ -797,13 +797,13 @@ static void wps_registrar_remove_pin(struct wps_registrar *reg,
static void wps_registrar_expire_pins(struct wps_registrar *reg) static void wps_registrar_expire_pins(struct wps_registrar *reg)
{ {
struct wps_uuid_pin *pin, *prev; struct wps_uuid_pin *pin, *prev;
struct os_time now; struct os_reltime now;
os_get_time(&now); os_get_reltime(&now);
dl_list_for_each_safe(pin, prev, &reg->pins, struct wps_uuid_pin, list) dl_list_for_each_safe(pin, prev, &reg->pins, struct wps_uuid_pin, list)
{ {
if ((pin->flags & PIN_EXPIRES) && if ((pin->flags & PIN_EXPIRES) &&
os_time_before(&pin->expiration, &now)) { os_reltime_before(&pin->expiration, &now)) {
wpa_hexdump(MSG_DEBUG, "WPS: Expired PIN for UUID", wpa_hexdump(MSG_DEBUG, "WPS: Expired PIN for UUID",
pin->uuid, WPS_UUID_LEN); pin->uuid, WPS_UUID_LEN);
wps_registrar_remove_pin(reg, pin); wps_registrar_remove_pin(reg, pin);