WPS: Add option for forcing Registrar to use PSK format in Credential

[libeap.git] / hostapd / wpa_auth_ie.c

diff --git a/hostapd/wpa_auth_ie.c b/hostapd/wpa_auth_ie.c
index 3ac9d67..da37f82 100644 (file)
--- a/hostapd/wpa_auth_ie.c
+++ b/hostapd/wpa_auth_ie.c
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "config.h"
 #include "ieee802_11.h"
-#include "eapol_sm.h"
+#include "eapol_auth/eapol_auth_sm.h"
 #include "wpa.h"
 #include "pmksa_cache.h"
 #include "wpa_auth_ie.h"
@@ -215,8 +215,8 @@ int wpa_write_rsn_ie(struct wpa_auth_config *conf, u8 *buf, size_t len,
                capab |= WPA_CAPABILITY_PREAUTH;
        if (conf->peerkey)
                capab |= WPA_CAPABILITY_PEERKEY_ENABLED;
-       if (conf->wme_enabled) {
-               /* 4 PTKSA replay counters when using WME */
+       if (conf->wmm_enabled) {
+               /* 4 PTKSA replay counters when using WMM */
                capab |= (RSN_NUM_REPLAY_COUNTERS_16 << 2);
        }
 #ifdef CONFIG_IEEE80211W
@@ -670,8 +670,8 @@ int wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth,
        for (i = 0; i < data.num_pmkid; i++) {
                wpa_hexdump(MSG_DEBUG, "RSN IE: STA PMKID",
                            &data.pmkid[i * PMKID_LEN], PMKID_LEN);
-               sm->pmksa = pmksa_cache_get(wpa_auth->pmksa, sm->addr,
-                                           &data.pmkid[i * PMKID_LEN]);
+               sm->pmksa = pmksa_cache_auth_get(wpa_auth->pmksa, sm->addr,
+                                                &data.pmkid[i * PMKID_LEN]);
                if (sm->pmksa) {
                        pmkid = sm->pmksa->pmkid;
                        break;