DPP: Remove compiler warnings about signed/unsigned comparisons

These timestamp comparisons did not use matching signedness.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/src/ap/dpp_hostapd.c b/src/ap/dpp_hostapd.c
index 0ec0ec7ea11e5b6d062c137a248448c5dc8ceffd..7beb5ba5a04f94baa83794a5a12be4f26b2e336b 100644 (file)
--- 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 3f3fd027e99b38b574b5acf11b55660e38cdbdaf..07f2e943ee84579580e71e74e0dd334d7efdca76 100644 (file)
--- 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;