Renamed PMKSA cache functions to avoid duplicate symbols with supplicant

This allows hostapd/pmksa_cache.c and src/rsn_supp/pmksa_cache.c to be
linked into the same program.

diff --git a/hostapd/pmksa_cache.c b/hostapd/pmksa_cache.c
index 2de0219e7577458e7f7d7c7e12550a2da3904df3..f330f98fee688cefe899ff1b8714eed1b704822e 100644 (file)
--- a/hostapd/pmksa_cache.c
+++ b/hostapd/pmksa_cache.c
@@ -211,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
@@ -228,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)
 {
@@ -257,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);
 
@@ -312,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;
@@ -337,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;
 
@@ -366,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
@@ -396,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;
 

diff --git a/hostapd/pmksa_cache.h b/hostapd/pmksa_cache.h
index 1c984a28973e4c0c6246a6948d0f5362f6986e41..41ba61de8fa830f87c63cdeb865b530f4be4224b 100644 (file)
--- a/hostapd/pmksa_cache.h
+++ b/hostapd/pmksa_cache.h
@@ -38,18 +38,20 @@ struct rsn_pmksa_cache_entry {
 struct rsn_pmksa_cache;
 
 struct rsn_pmksa_cache *
-pmksa_cache_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry,
-                                void *ctx), void *ctx);
-void pmksa_cache_deinit(struct rsn_pmksa_cache *pmksa);
-struct rsn_pmksa_cache_entry * pmksa_cache_get(struct rsn_pmksa_cache *pmksa,
-                                              const u8 *spa, const u8 *pmkid);
+pmksa_cache_auth_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry,
+                                     void *ctx), void *ctx);
+void pmksa_cache_auth_deinit(struct rsn_pmksa_cache *pmksa);
+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 * pmksa_cache_get_okc(
        struct rsn_pmksa_cache *pmksa, const u8 *spa, const u8 *aa,
        const u8 *pmkid);
 struct rsn_pmksa_cache_entry *
-pmksa_cache_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);
+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);
 struct rsn_pmksa_cache_entry *
 pmksa_cache_add_okc(struct rsn_pmksa_cache *pmksa,
                    const struct rsn_pmksa_cache_entry *old_entry,

diff --git a/hostapd/wpa.c b/hostapd/wpa.c
index cf285b6fd6fea4990fcc42e9ab9d1d36fb8ab075..b1f29df8c2213f776beec842975ecde6d787e570 100644 (file)
--- a/hostapd/wpa.c
+++ b/hostapd/wpa.c
@@ -374,7 +374,8 @@ struct wpa_authenticator * wpa_init(const u8 *addr,
                return NULL;
        }
 
-       wpa_auth->pmksa = pmksa_cache_init(wpa_auth_pmksa_free_cb, wpa_auth);
+       wpa_auth->pmksa = pmksa_cache_auth_init(wpa_auth_pmksa_free_cb,
+                                               wpa_auth);
        if (wpa_auth->pmksa == NULL) {
                wpa_printf(MSG_ERROR, "PMKSA cache initialization failed.");
                os_free(wpa_auth->wpa_ie);
@@ -387,7 +388,7 @@ struct wpa_authenticator * wpa_init(const u8 *addr,
        if (wpa_auth->ft_pmk_cache == NULL) {
                wpa_printf(MSG_ERROR, "FT PMK cache initialization failed.");
                os_free(wpa_auth->wpa_ie);
-               pmksa_cache_deinit(wpa_auth->pmksa);
+               pmksa_cache_auth_deinit(wpa_auth->pmksa);
                os_free(wpa_auth);
                return NULL;
        }
@@ -423,7 +424,7 @@ void wpa_deinit(struct wpa_authenticator *wpa_auth)
                wpa_stsl_remove(wpa_auth, wpa_auth->stsl_negotiations);
 #endif /* CONFIG_PEERKEY */
 
-       pmksa_cache_deinit(wpa_auth->pmksa);
+       pmksa_cache_auth_deinit(wpa_auth->pmksa);
 
 #ifdef CONFIG_IEEE80211R
        wpa_ft_pmk_cache_deinit(wpa_auth->ft_pmk_cache);
@@ -2367,9 +2368,9 @@ int wpa_auth_pmksa_add(struct wpa_state_machine *sm, const u8 *pmk,
        if (sm == NULL || sm->wpa != WPA_VERSION_WPA2)
                return -1;
 
-       if (pmksa_cache_add(sm->wpa_auth->pmksa, pmk, PMK_LEN,
-                           sm->wpa_auth->addr, sm->addr, session_timeout,
-                           eapol, sm->wpa_key_mgmt))
+       if (pmksa_cache_auth_add(sm->wpa_auth->pmksa, pmk, PMK_LEN,
+                                sm->wpa_auth->addr, sm->addr, session_timeout,
+                                eapol, sm->wpa_key_mgmt))
                return 0;
 
        return -1;
@@ -2384,9 +2385,9 @@ int wpa_auth_pmksa_add_preauth(struct wpa_authenticator *wpa_auth,
        if (wpa_auth == NULL)
                return -1;
 
-       if (pmksa_cache_add(wpa_auth->pmksa, pmk, len, wpa_auth->addr,
-                           sta_addr, session_timeout, eapol,
-                           WPA_KEY_MGMT_IEEE8021X))
+       if (pmksa_cache_auth_add(wpa_auth->pmksa, pmk, len, wpa_auth->addr,
+                                sta_addr, session_timeout, eapol,
+                                WPA_KEY_MGMT_IEEE8021X))
                return 0;
 
        return -1;

diff --git a/hostapd/wpa_auth_ie.c b/hostapd/wpa_auth_ie.c
index 3ac9d67344b46695f00c520efce6290504dad38f..df656d48c5200c0e1d412afbe3882f565154ba3f 100644 (file)
--- a/hostapd/wpa_auth_ie.c
+++ b/hostapd/wpa_auth_ie.c
@@ -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;