]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
mesh: Simplify wpa_auth_pmksa_set_to_sm()
authorJouni Malinen <j@w1.fi>
Tue, 22 Mar 2016 18:37:46 +0000 (20:37 +0200)
committerJouni Malinen <j@w1.fi>
Tue, 22 Mar 2016 18:38:44 +0000 (20:38 +0200)
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 <j@w1.fi>
src/ap/wpa_auth.c

index 779a40dbaa44b9fd553cb62c896aacd1448695f8..358708648977e1ea8c6a52baa04601ae95e935d9 100644 (file)
@@ -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);
 }