Fix couple of forgotten wpa_hw_modes -> hostapd_hw_modes

[wpasupplicant] / hostapd / pmksa_cache.c

diff --git a/hostapd/pmksa_cache.c b/hostapd/pmksa_cache.c
index 152a4cb..b815e58 100644 (file)
--- a/hostapd/pmksa_cache.c
+++ b/hostapd/pmksa_cache.c
@@ -15,7 +15,7 @@
 #include "includes.h"
 
 #include "common.h"
-#include "ap.h"
+#include "sta_info.h"
 #include "config.h"
 #include "common.h"
 #include "eloop.h"
@@ -40,40 +40,6 @@ struct rsn_pmksa_cache {
 };
 
 
-/**
- * rsn_pmkid - Calculate PMK identifier
- * @pmk: Pairwise master key
- * @pmk_len: Length of pmk in bytes
- * @aa: Authenticator address
- * @spa: Supplicant address
- * @pmkid: Buffer for PMKID
- * @use_sha256: Whether to use SHA256-based KDF
- *
- * IEEE Std 802.11i-2004 - 8.5.1.2 Pairwise key hierarchy
- * PMKID = HMAC-SHA1-128(PMK, "PMK Name" || AA || SPA)
- */
-void rsn_pmkid(const u8 *pmk, size_t pmk_len, const u8 *aa, const u8 *spa,
-              u8 *pmkid, int use_sha256)
-{
-       char *title = "PMK Name";
-       const u8 *addr[3];
-       const size_t len[3] = { 8, ETH_ALEN, ETH_ALEN };
-       unsigned char hash[SHA256_MAC_LEN];
-
-       addr[0] = (u8 *) title;
-       addr[1] = aa;
-       addr[2] = spa;
-
-#ifdef CONFIG_IEEE80211W
-       if (use_sha256)
-               hmac_sha256_vector(pmk, pmk_len, 3, addr, len, hash);
-       else
-#endif /* CONFIG_IEEE80211W */
-               hmac_sha1_vector(pmk, pmk_len, 3, addr, len, hash);
-       os_memcpy(pmkid, hash, PMKID_LEN);
-}
-
-
 static void pmksa_cache_set_expiration(struct rsn_pmksa_cache *pmksa);
 
 
@@ -245,8 +211,8 @@ static void pmksa_cache_link_entry(struct rsn_pmksa_cache *pmksa,
 
 
 /**
- * pmksa_cache_add - Add a PMKSA cache entry
- * @pmksa: Pointer to PMKSA cache data from pmksa_cache_init()
+ * pmksa_cache_auth_add - Add a PMKSA cache entry
+ * @pmksa: Pointer to PMKSA cache data from pmksa_cache_auth_init()
  * @pmk: The new pairwise master key
  * @pmk_len: PMK length in bytes, usually PMK_LEN (32)
  * @aa: Authenticator address
@@ -262,7 +228,8 @@ static void pmksa_cache_link_entry(struct rsn_pmksa_cache *pmksa,
  * based on the PMK.
  */
 struct rsn_pmksa_cache_entry *
-pmksa_cache_add(struct rsn_pmksa_cache *pmksa, const u8 *pmk, size_t pmk_len,
+pmksa_cache_auth_add(struct rsn_pmksa_cache *pmksa,
+                    const u8 *pmk, size_t pmk_len,
                const u8 *aa, const u8 *spa, int session_timeout,
                struct eapol_state_machine *eapol, int akmp)
 {
@@ -291,7 +258,7 @@ pmksa_cache_add(struct rsn_pmksa_cache *pmksa, const u8 *pmk, size_t pmk_len,
 
        /* Replace an old entry for the same STA (if found) with the new entry
         */
-       pos = pmksa_cache_get(pmksa, spa, NULL);
+       pos = pmksa_cache_auth_get(pmksa, spa, NULL);
        if (pos)
                pmksa_cache_free_entry(pmksa, pos);
 
@@ -346,10 +313,10 @@ pmksa_cache_add_okc(struct rsn_pmksa_cache *pmksa,
 
 
 /**
- * pmksa_cache_deinit - Free all entries in PMKSA cache
- * @pmksa: Pointer to PMKSA cache data from pmksa_cache_init()
+ * pmksa_cache_auth_deinit - Free all entries in PMKSA cache
+ * @pmksa: Pointer to PMKSA cache data from pmksa_cache_auth_init()
  */
-void pmksa_cache_deinit(struct rsn_pmksa_cache *pmksa)
+void pmksa_cache_auth_deinit(struct rsn_pmksa_cache *pmksa)
 {
        struct rsn_pmksa_cache_entry *entry, *prev;
        int i;
@@ -371,14 +338,15 @@ void pmksa_cache_deinit(struct rsn_pmksa_cache *pmksa)
 
 
 /**
- * pmksa_cache_get - Fetch a PMKSA cache entry
- * @pmksa: Pointer to PMKSA cache data from pmksa_cache_init()
+ * pmksa_cache_auth_get - Fetch a PMKSA cache entry
+ * @pmksa: Pointer to PMKSA cache data from pmksa_cache_auth_init()
  * @spa: Supplicant address or %NULL to match any
  * @pmkid: PMKID or %NULL to match any
  * Returns: Pointer to PMKSA cache entry or %NULL if no match was found
  */
-struct rsn_pmksa_cache_entry * pmksa_cache_get(struct rsn_pmksa_cache *pmksa,
-                                              const u8 *spa, const u8 *pmkid)
+struct rsn_pmksa_cache_entry *
+pmksa_cache_auth_get(struct rsn_pmksa_cache *pmksa,
+                    const u8 *spa, const u8 *pmkid)
 {
        struct rsn_pmksa_cache_entry *entry;
 
@@ -400,7 +368,7 @@ struct rsn_pmksa_cache_entry * pmksa_cache_get(struct rsn_pmksa_cache *pmksa,
 
 /**
  * pmksa_cache_get_okc - Fetch a PMKSA cache entry using OKC
- * @pmksa: Pointer to PMKSA cache data from pmksa_cache_init()
+ * @pmksa: Pointer to PMKSA cache data from pmksa_cache_auth_init()
  * @aa: Authenticator address
  * @spa: Supplicant address
  * @pmkid: PMKID
@@ -430,14 +398,14 @@ struct rsn_pmksa_cache_entry * pmksa_cache_get_okc(
 
 
 /**
- * pmksa_cache_init - Initialize PMKSA cache
+ * pmksa_cache_auth_init - Initialize PMKSA cache
  * @free_cb: Callback function to be called when a PMKSA cache entry is freed
  * @ctx: Context pointer for free_cb function
  * Returns: Pointer to PMKSA cache data or %NULL on failure
  */
 struct rsn_pmksa_cache *
-pmksa_cache_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry,
-                                void *ctx), void *ctx)
+pmksa_cache_auth_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry,
+                                     void *ctx), void *ctx)
 {
        struct rsn_pmksa_cache *pmksa;