DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

OWE: PMKSA caching in AP mode

Browse source 
This extends OWE support in hostapd to allow PMKSA caching to be used.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-10-09 12:08:12 +03:00 committed by Jouni Malinen
parent 8b5579e17a
commit d90f10fa41
5 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ap/ieee802_11.c
View file

@ -2128,7 +2128,8 @@ static u16 check_ext_capab(struct hostapd_data *hapd, struct sta_info *sta,
#ifdef CONFIG_OWE #ifdef CONFIG_OWE
static u16 owe_process_assoc_req(struct sta_info *sta, const u8 *owe_dh, static u16 owe_process_assoc_req(struct hostapd_data *hapd,
struct sta_info *sta, const u8 *owe_dh,
u8 owe_dh_len) u8 owe_dh_len)
{ {
struct wpabuf *secret, *pub, *hkey; struct wpabuf *secret, *pub, *hkey;
@ -2140,6 +2141,11 @@ static u16 owe_process_assoc_req(struct sta_info *sta, const u8 *owe_dh,
u16 group; u16 group;
size_t hash_len, prime_len; size_t hash_len, prime_len;
if (wpa_auth_sta_get_pmksa(sta->wpa_sm)) {
wpa_printf(MSG_DEBUG, "OWE: Using PMKSA caching");
return WLAN_STATUS_SUCCESS;
}
group = WPA_GET_LE16(owe_dh); group = WPA_GET_LE16(owe_dh);
if (group == 19) if (group == 19)
prime_len = 32; prime_len = 32;
@ -2254,7 +2260,8 @@ static u16 owe_process_assoc_req(struct sta_info *sta, const u8 *owe_dh,
wpa_hexdump_key(MSG_DEBUG, "OWE: PMK", sta->owe_pmk, sta->owe_pmk_len); wpa_hexdump_key(MSG_DEBUG, "OWE: PMK", sta->owe_pmk, sta->owe_pmk_len);
wpa_hexdump(MSG_DEBUG, "OWE: PMKID", pmkid, PMKID_LEN); wpa_hexdump(MSG_DEBUG, "OWE: PMKID", pmkid, PMKID_LEN);
/* TODO: Add PMKSA cache entry */ wpa_auth_pmksa_add2(hapd->wpa_auth, sta->addr, sta->owe_pmk,
sta->owe_pmk_len, pmkid, 0, WPA_KEY_MGMT_OWE);
return WLAN_STATUS_SUCCESS; return WLAN_STATUS_SUCCESS;
} }
@ -2477,7 +2484,7 @@ static u16 check_assoc_ies(struct hostapd_data *hapd, struct sta_info *sta,
if ((hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_OWE) && if ((hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_OWE) &&
wpa_auth_sta_key_mgmt(sta->wpa_sm) == WPA_KEY_MGMT_OWE && wpa_auth_sta_key_mgmt(sta->wpa_sm) == WPA_KEY_MGMT_OWE &&
elems.owe_dh) { elems.owe_dh) {
resp = owe_process_assoc_req(sta, elems.owe_dh, resp = owe_process_assoc_req(hapd, sta, elems.owe_dh,
elems.owe_dh_len); elems.owe_dh_len);
if (resp != WLAN_STATUS_SUCCESS) if (resp != WLAN_STATUS_SUCCESS)
return resp; return resp;

1
src/ap/pmksa_cache_auth.h
View file

@ -35,6 +35,7 @@ struct rsn_pmksa_cache_entry {
}; };
struct rsn_pmksa_cache; struct rsn_pmksa_cache;
struct radius_das_attrs;
struct rsn_pmksa_cache * struct rsn_pmksa_cache *
pmksa_cache_auth_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry, pmksa_cache_auth_init(void (*free_cb)(struct rsn_pmksa_cache_entry *entry,

1
src/ap/wpa_auth.c
View file

@ -2068,6 +2068,7 @@ SM_STATE(WPA_PTK, PTKSTART)
*/ */
if (sm->wpa == WPA_VERSION_WPA2 && if (sm->wpa == WPA_VERSION_WPA2 &&
(wpa_key_mgmt_wpa_ieee8021x(sm->wpa_key_mgmt) || (wpa_key_mgmt_wpa_ieee8021x(sm->wpa_key_mgmt) ||
(sm->wpa_key_mgmt == WPA_KEY_MGMT_OWE && sm->pmksa) ||
wpa_key_mgmt_sae(sm->wpa_key_mgmt)) && wpa_key_mgmt_sae(sm->wpa_key_mgmt)) &&
sm->wpa_key_mgmt != WPA_KEY_MGMT_OSEN) { sm->wpa_key_mgmt != WPA_KEY_MGMT_OSEN) {
pmkid = buf; pmkid = buf;

11
src/ap/wpa_auth_glue.c
View file

@ -27,6 +27,7 @@
#include "tkip_countermeasures.h" #include "tkip_countermeasures.h"
#include "ap_drv_ops.h" #include "ap_drv_ops.h"
#include "ap_config.h" #include "ap_config.h"
#include "pmksa_cache_auth.h"
#include "wpa_auth.h" #include "wpa_auth.h"
#include "wpa_auth_glue.h" #include "wpa_auth_glue.h"
@ -267,6 +268,16 @@ static const u8 * hostapd_wpa_auth_get_psk(void *ctx, const u8 *addr,
*psk_len = sta->owe_pmk_len; *psk_len = sta->owe_pmk_len;
return sta->owe_pmk; return sta->owe_pmk;
} }
if ((hapd->conf->wpa_key_mgmt & WPA_KEY_MGMT_OWE) && sta) {
struct rsn_pmksa_cache_entry *sa;
sa = wpa_auth_sta_get_pmksa(sta->wpa_sm);
if (sa && sa->akmp == WPA_KEY_MGMT_OWE) {
if (psk_len)
*psk_len = sa->pmk_len;
return sa->pmk;
}
}
#endif /* CONFIG_OWE */ #endif /* CONFIG_OWE */
psk = hostapd_get_psk(hapd->conf, addr, p2p_dev_addr, prev_psk); psk = hostapd_get_psk(hapd->conf, addr, p2p_dev_addr, prev_psk);

3
src/ap/wpa_auth_ie.c
View file

@ -1051,7 +1051,8 @@ u8 * wpa_auth_write_assoc_resp_owe(struct wpa_state_machine *sm,
{ {
int res; int res;
res = wpa_write_rsn_ie(&sm->wpa_auth->conf, pos, max_len, NULL); res = wpa_write_rsn_ie(&sm->wpa_auth->conf, pos, max_len,
sm->pmksa ? sm->pmksa->pmkid : NULL);
if (res < 0) if (res < 0)
return pos; return pos;
return pos + res; return pos + res;