From 267c366f382405e5c42fb3d391efca5d0e2491d6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 19 Apr 2019 00:23:43 +0300 Subject: [PATCH] FT: Remove unused pmk argument from wpa_auth_derive_ptk_ft() FT rules for PTK derivation do not use PMK. Remove the unused argument to the PTK derivation function. Signed-off-by: Jouni Malinen --- src/ap/wpa_auth.c | 2 +- src/ap/wpa_auth_ft.c | 3 +-- src/ap/wpa_auth_i.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c index 4c7fe05b0..fe0f85d8e 100644 --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c @@ -2195,7 +2195,7 @@ static int wpa_derive_ptk(struct wpa_state_machine *sm, const u8 *snonce, #ifdef CONFIG_IEEE80211R_AP if (wpa_key_mgmt_ft(sm->wpa_key_mgmt)) - return wpa_auth_derive_ptk_ft(sm, pmk, ptk); + return wpa_auth_derive_ptk_ft(sm, ptk); #endif /* CONFIG_IEEE80211R_AP */ #ifdef CONFIG_DPP2 diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c index fdb7ebaa5..5fb41c450 100644 --- a/src/ap/wpa_auth_ft.c +++ b/src/ap/wpa_auth_ft.c @@ -2074,8 +2074,7 @@ int wpa_ft_store_pmk_fils(struct wpa_state_machine *sm, } -int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, const u8 *pmk, - struct wpa_ptk *ptk) +int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, struct wpa_ptk *ptk) { u8 pmk_r0[PMK_LEN_MAX], pmk_r0_name[WPA_PMK_NAME_LEN]; size_t pmk_r0_len = wpa_key_mgmt_sha384(sm->wpa_key_mgmt) ? diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h index 3dcf77aa9..15512368e 100644 --- a/src/ap/wpa_auth_i.h +++ b/src/ap/wpa_auth_i.h @@ -290,8 +290,7 @@ int wpa_write_ftie(struct wpa_auth_config *conf, int use_sha384, const u8 *anonce, const u8 *snonce, u8 *buf, size_t len, const u8 *subelem, size_t subelem_len); -int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, const u8 *pmk, - struct wpa_ptk *ptk); +int wpa_auth_derive_ptk_ft(struct wpa_state_machine *sm, struct wpa_ptk *ptk); struct wpa_ft_pmk_cache * wpa_ft_pmk_cache_init(void); void wpa_ft_pmk_cache_deinit(struct wpa_ft_pmk_cache *cache); void wpa_ft_install_ptk(struct wpa_state_machine *sm);