Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-24 16:28:23 -05:00
Code Issues Projects Releases Wiki Activity

DPP2: Copy received ppKey into wpa_supplicant network profile

Browse Source 
Store the received privacy protection key from Connector into
wpa_supplicant network profile and indicate it through the control
interface similarly to C-sign-key.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-10-13 20:29:27 +03:00 committed by Jouni Malinen
parent a8ee2292bd
commit 37df40845a
5 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/wpa_ctrl.h
View File

@ -184,6 +184,7 @@ extern "C" {
#define DPP_EVENT_CONFOBJ_PSK "DPP-CONFOBJ-PSK " #define DPP_EVENT_CONFOBJ_PSK "DPP-CONFOBJ-PSK "
#define DPP_EVENT_CONNECTOR "DPP-CONNECTOR " #define DPP_EVENT_CONNECTOR "DPP-CONNECTOR "
#define DPP_EVENT_C_SIGN_KEY "DPP-C-SIGN-KEY " #define DPP_EVENT_C_SIGN_KEY "DPP-C-SIGN-KEY "
#define DPP_EVENT_PP_KEY "DPP-PP-KEY "
#define DPP_EVENT_NET_ACCESS_KEY "DPP-NET-ACCESS-KEY " #define DPP_EVENT_NET_ACCESS_KEY "DPP-NET-ACCESS-KEY "
#define DPP_EVENT_SERVER_NAME "DPP-SERVER-NAME " #define DPP_EVENT_SERVER_NAME "DPP-SERVER-NAME "
#define DPP_EVENT_CERTBAG "DPP-CERTBAG " #define DPP_EVENT_CERTBAG "DPP-CERTBAG "

2
wpa_supplicant/config.c
View File

@ -2573,6 +2573,7 @@ static const struct parse_data ssid_fields[] = {
{ STR_LEN(dpp_netaccesskey) }, { STR_LEN(dpp_netaccesskey) },
{ INT(dpp_netaccesskey_expiry) }, { INT(dpp_netaccesskey_expiry) },
{ STR_LEN(dpp_csign) }, { STR_LEN(dpp_csign) },
{ STR_LEN(dpp_pp_key) },
{ INT_RANGE(dpp_pfs, 0, 2) }, { INT_RANGE(dpp_pfs, 0, 2) },
#endif /* CONFIG_DPP */ #endif /* CONFIG_DPP */
{ INT_RANGE(owe_group, 0, 65535) }, { INT_RANGE(owe_group, 0, 65535) },
@ -2776,6 +2777,7 @@ void wpa_config_free_ssid(struct wpa_ssid *ssid)
os_free(ssid->dpp_connector); os_free(ssid->dpp_connector);
bin_clear_free(ssid->dpp_netaccesskey, ssid->dpp_netaccesskey_len); bin_clear_free(ssid->dpp_netaccesskey, ssid->dpp_netaccesskey_len);
os_free(ssid->dpp_csign); os_free(ssid->dpp_csign);
os_free(ssid->dpp_pp_key);
while ((psk = dl_list_first(&ssid->psk_list, struct psk_list_entry, while ((psk = dl_list_first(&ssid->psk_list, struct psk_list_entry,
list))) { list))) {
dl_list_del(&psk->list); dl_list_del(&psk->list);

1
wpa_supplicant/config_file.c
View File

@ -928,6 +928,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
STR(dpp_netaccesskey); STR(dpp_netaccesskey);
INT(dpp_netaccesskey_expiry); INT(dpp_netaccesskey_expiry);
STR(dpp_csign); STR(dpp_csign);
STR(dpp_pp_key);
INT(dpp_pfs); INT(dpp_pfs);
#endif /* CONFIG_DPP */ #endif /* CONFIG_DPP */
INT(owe_group); INT(owe_group);

10
wpa_supplicant/config_ssid.h
View File

@ -1023,6 +1023,16 @@ struct wpa_ssid {
*/ */
size_t dpp_csign_len; size_t dpp_csign_len;
/**
* dpp_pp_key - ppKey (Configurator privacy protection public key)
*/
u8 *dpp_pp_key;
/**
* dpp_pp_key_len - ppKey length in octets
*/
size_t dpp_pp_key_len;
/** /**
* dpp_pfs - DPP PFS * dpp_pfs - DPP PFS
* 0: allow PFS to be used or not used * 0: allow PFS to be used or not used

23
wpa_supplicant/dpp_supplicant.c
View File

@ -1192,6 +1192,15 @@ static struct wpa_ssid * wpas_dpp_add_network(struct wpa_supplicant *wpa_s,
ssid->dpp_csign_len = wpabuf_len(conf->c_sign_key); ssid->dpp_csign_len = wpabuf_len(conf->c_sign_key);
} }
if (conf->pp_key) {
ssid->dpp_pp_key = os_malloc(wpabuf_len(conf->pp_key));
if (!ssid->dpp_pp_key)
goto fail;
os_memcpy(ssid->dpp_pp_key, wpabuf_head(conf->pp_key),
wpabuf_len(conf->pp_key));
ssid->dpp_pp_key_len = wpabuf_len(conf->pp_key);
}
if (auth->net_access_key) { if (auth->net_access_key) {
ssid->dpp_netaccesskey = ssid->dpp_netaccesskey =
os_malloc(wpabuf_len(auth->net_access_key)); os_malloc(wpabuf_len(auth->net_access_key));
@ -1429,6 +1438,20 @@ static int wpas_dpp_handle_config_obj(struct wpa_supplicant *wpa_s,
os_free(hex); os_free(hex);
} }
} }
if (conf->pp_key) {
char *hex;
size_t hexlen;
hexlen = 2 * wpabuf_len(conf->pp_key) + 1;
hex = os_malloc(hexlen);
if (hex) {
wpa_snprintf_hex(hex, hexlen,
wpabuf_head(conf->pp_key),
wpabuf_len(conf->pp_key));
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_PP_KEY "%s", hex);
os_free(hex);
}
}
if (auth->net_access_key) { if (auth->net_access_key) {
char *hex; char *hex;
size_t hexlen; size_t hexlen;