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

DPP: Support for provisioning SAE password identifiers (Enrollee)

Browse source 
DPP supports provisioning of SAE password identifiers to uniquely
identify a password if the enrollee indicates support for them. Indicate
Enrollee support for that and add the received value into the network
profile.

I put everything under defines for CONFIG_DPP3 as this is a bleeding
edge feature in DPP.

This was tested against my DPP reference implementation acting as the
Configurator.

Signed-off-by: Dan Harkins <dharkins@lounge.org>
This commit is contained in:
Dan Harkins 2024-08-23 10:50:36 -07:00 committed by Jouni Malinen
parent de40e08f70
commit 782c89c359
4 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/dpp.c
View file

@ -1035,6 +1035,10 @@ struct wpabuf * dpp_build_conf_req_helper(struct dpp_authentication *auth,
json_value_sep(json); json_value_sep(json);
json_add_string(json, "pkcs10", csr); json_add_string(json, "pkcs10", csr);
} }
#ifdef CONFIG_DPP3
json_value_sep(json);
json_add_int(json, "capabilities", DPP_ENROLLEE_CAPAB_SAE_PW_ID);
#endif /* CONFIG_DPP3 */
if (extra_name && extra_value && extra_name[0] && extra_value[0]) { if (extra_name && extra_value && extra_name[0] && extra_value[0]) {
json_value_sep(json); json_value_sep(json);
wpabuf_printf(json, "\"%s\":%s", extra_name, extra_value); wpabuf_printf(json, "\"%s\":%s", extra_name, extra_value);
@ -2562,6 +2566,9 @@ static int dpp_parse_cred_legacy(struct dpp_config_obj *conf,
if (pass && pass->type == JSON_STRING) { if (pass && pass->type == JSON_STRING) {
size_t len = os_strlen(pass->string); size_t len = os_strlen(pass->string);
#ifdef CONFIG_DPP3
struct json_token *saepi = json_get_member(cred, "idpass");
#endif /* CONFIG_DPP3 */
wpa_hexdump_ascii_key(MSG_DEBUG, "DPP: Legacy passphrase", wpa_hexdump_ascii_key(MSG_DEBUG, "DPP: Legacy passphrase",
pass->string, len); pass->string, len);
@ -2573,6 +2580,11 @@ static int dpp_parse_cred_legacy(struct dpp_config_obj *conf,
} }
os_strlcpy(conf->passphrase, pass->string, os_strlcpy(conf->passphrase, pass->string,
sizeof(conf->passphrase)); sizeof(conf->passphrase));
#ifdef CONFIG_DPP3
if (saepi && saepi->type == JSON_STRING)
os_strlcpy(conf->password_id, saepi->string,
sizeof(conf->password_id));
#endif /* CONFIG_DPP3 */
} else if (psk_hex && psk_hex->type == JSON_STRING) { } else if (psk_hex && psk_hex->type == JSON_STRING) {
if (dpp_akm_sae(conf->akm) && !dpp_akm_psk(conf->akm)) { if (dpp_akm_sae(conf->akm) && !dpp_akm_psk(conf->akm)) {
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,

6
src/common/dpp.h
View file

@ -134,6 +134,9 @@ enum dpp_connector_key {
#define DPP_MAX_SHARED_SECRET_LEN 66 #define DPP_MAX_SHARED_SECRET_LEN 66
#define DPP_CP_LEN 64 #define DPP_CP_LEN 64
/* DPP Configuration Request - Enrollee Capabilities */
#define DPP_ENROLLEE_CAPAB_SAE_PW_ID BIT(0)
struct dpp_curve_params { struct dpp_curve_params {
const char *name; const char *name;
size_t hash_len; size_t hash_len;
@ -356,6 +359,9 @@ struct dpp_authentication {
u8 ssid_len; u8 ssid_len;
int ssid_charset; int ssid_charset;
char passphrase[64]; char passphrase[64];
#ifdef CONFIG_DPP3
char password_id[64];
#endif /* CONFIG_DPP3 */
u8 psk[PMK_LEN]; u8 psk[PMK_LEN];
int psk_set; int psk_set;
enum dpp_akm akm; enum dpp_akm akm;

1
src/common/wpa_ctrl.h
View file

@ -206,6 +206,7 @@ extern "C" {
#define DPP_EVENT_CONFOBJ_SSID "DPP-CONFOBJ-SSID " #define DPP_EVENT_CONFOBJ_SSID "DPP-CONFOBJ-SSID "
#define DPP_EVENT_CONFOBJ_SSID_CHARSET "DPP-CONFOBJ-SSID-CHARSET " #define DPP_EVENT_CONFOBJ_SSID_CHARSET "DPP-CONFOBJ-SSID-CHARSET "
#define DPP_EVENT_CONFOBJ_PASS "DPP-CONFOBJ-PASS " #define DPP_EVENT_CONFOBJ_PASS "DPP-CONFOBJ-PASS "
#define DPP_EVENT_CONFOBJ_IDPASS "DPP-CONFOBJ-IDPASS "
#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 "

17
wpa_supplicant/dpp_supplicant.c
View file

@ -1418,6 +1418,17 @@ static struct wpa_ssid * wpas_dpp_add_network(struct wpa_supplicant *wpa_s,
os_memcpy(ssid->ssid, conf->ssid, conf->ssid_len); os_memcpy(ssid->ssid, conf->ssid, conf->ssid_len);
ssid->ssid_len = conf->ssid_len; ssid->ssid_len = conf->ssid_len;
#ifdef CONFIG_DPP3
if (conf->akm == DPP_AKM_SAE && conf->password_id[0]) {
size_t len = os_strlen(conf->password_id);
ssid->sae_password_id = os_zalloc(len + 1);
if (!ssid->sae_password_id)
goto fail;
os_memcpy(ssid->sae_password_id, conf->password_id, len);
}
#endif /* CONFIG_DPP3 */
if (conf->connector) { if (conf->connector) {
if (dpp_akm_dpp(conf->akm)) { if (dpp_akm_dpp(conf->akm)) {
ssid->key_mgmt = WPA_KEY_MGMT_DPP; ssid->key_mgmt = WPA_KEY_MGMT_DPP;
@ -1696,6 +1707,12 @@ static int wpas_dpp_handle_config_obj(struct wpa_supplicant *wpa_s,
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_PSK "%s", wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_PSK "%s",
hex); hex);
} }
#ifdef CONFIG_DPP3
if (conf->password_id[0]) {
wpa_msg(wpa_s, MSG_INFO, DPP_EVENT_CONFOBJ_IDPASS "%s",
conf->password_id);
}
#endif /* CONFIG_DPP3 */
if (conf->c_sign_key) { if (conf->c_sign_key) {
char *hex; char *hex;
size_t hexlen; size_t hexlen;