From 3ca4be1eaa972a8e3ec8158999f53f87c57af270 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 23 Nov 2017 20:24:37 +0200 Subject: [PATCH] DPP: Remove compiler warnings about signed/unsigned comparisons These timestamp comparisons did not use matching signedness. Signed-off-by: Jouni Malinen --- src/ap/dpp_hostapd.c | 4 ++-- wpa_supplicant/dpp_supplicant.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c index 0ec0ec7ea..7beb5ba5a 100644 --- a/src/ap/dpp_hostapd.c +++ b/src/ap/dpp_hostapd.c @@ -1065,7 +1065,7 @@ static void hostapd_dpp_rx_peer_disc_req(struct hostapd_data *hapd, os_get_time(&now); if (hapd->conf->dpp_netaccesskey_expiry && - hapd->conf->dpp_netaccesskey_expiry < now.sec) { + (os_time_t) hapd->conf->dpp_netaccesskey_expiry < now.sec) { wpa_printf(MSG_INFO, "DPP: Own netAccessKey expired"); return; } @@ -1106,7 +1106,7 @@ static void hostapd_dpp_rx_peer_disc_req(struct hostapd_data *hapd, return; } - if (!expire || hapd->conf->dpp_netaccesskey_expiry < expire) + if (!expire || (os_time_t) hapd->conf->dpp_netaccesskey_expiry < expire) expire = hapd->conf->dpp_netaccesskey_expiry; if (expire) expiration = expire - now.sec; diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c index 3f3fd027e..07f2e943e 100644 --- a/wpa_supplicant/dpp_supplicant.c +++ b/wpa_supplicant/dpp_supplicant.c @@ -2235,7 +2235,7 @@ int wpas_dpp_check_connect(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid, os_get_time(&now); if (ssid->dpp_netaccesskey_expiry && - ssid->dpp_netaccesskey_expiry < now.sec) { + (os_time_t) ssid->dpp_netaccesskey_expiry < now.sec) { wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_MISSING_CONNECTOR "netAccessKey expired"); return -1;