From 8854f90badc0ca16e1de381f35e9e3d99af452c9 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Tue, 22 Mar 2016 20:37:46 +0200 Subject: [PATCH] mesh: Simplify wpa_auth_pmksa_set_to_sm() pmksa->pmk or pmksa->pmkid cannot be NULL since they are arrays. Remove the unnecessary NULL checks and use the provided pmksa pointer directly to simplify the implementation. (CID 138519) Signed-off-by: Jouni Malinen --- src/ap/wpa_auth.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c index 779a40dba..358708648 100644 --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c @@ -3393,13 +3393,9 @@ void wpa_auth_pmksa_set_to_sm(struct rsn_pmksa_cache_entry *pmksa, return; sm->pmksa = pmksa; - if (sm->pmksa->pmk) - os_memcpy(pmk, sm->pmksa->pmk, PMK_LEN); - if (sm->pmksa->pmkid) { - os_memcpy(pmkid, sm->pmksa->pmkid, PMKID_LEN); - os_memcpy(wpa_auth->dot11RSNAPMKIDUsed, - sm->pmksa->pmkid, PMKID_LEN); - } + os_memcpy(pmk, pmksa->pmk, PMK_LEN); + os_memcpy(pmkid, pmksa->pmkid, PMKID_LEN); + os_memcpy(wpa_auth->dot11RSNAPMKIDUsed, pmksa->pmkid, PMKID_LEN); }