Given an ASN1 blob of the right form, parse and create an l_ecc_point object. The form used is specific to DPP hence why this isn't general purpose and put into dpp-util. --- src/dpp-util.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/dpp-util.h | 1 + 2 files changed, 70 insertions(+) diff --git a/src/dpp-util.c b/src/dpp-util.c index 4823b2f0..81a97f97 100644 --- a/src/dpp-util.c +++ b/src/dpp-util.c @@ -796,3 +796,72 @@ uint8_t *dpp_point_to_asn1(const struct l_ecc_point *p, size_t *len_out) return asn1; } + +/* + * Only checking for the ASN.1 form: + * + * SEQUENCE { + * SEQUENCE { + * OBJECT IDENTIFIER ecPublicKey + * OBJECT IDENTIFIER key type (p256/p384) + * } + * BITSTRING (key data) + * } + */ +struct l_ecc_point *dpp_point_from_asn1(const uint8_t *asn1, size_t len) +{ + + const uint8_t *outer_seq; + size_t outer_len; + const uint8_t *inner_seq; + size_t inner_len; + const uint8_t *elem; + const uint8_t *key_data; + size_t elen = 0; + uint8_t tag; + unsigned int curve_num; + const struct l_ecc_curve *curve; + + /* SEQUENCE */ + outer_seq = asn1_der_find_elem(asn1, len, 0, &tag, &outer_len); + if (!outer_seq || tag != ASN1_ID_SEQUENCE) + return NULL; + + /* SEQUENCE */ + inner_seq = asn1_der_find_elem(outer_seq, outer_len, 0, &tag, &inner_len); + if (!inner_seq || tag != ASN1_ID_SEQUENCE) + return NULL; + + /* OBJECT IDENTIFIER (ecPublicKey) */ + elem = asn1_der_find_elem(inner_seq, inner_len, 0, &tag, &elen); + if (!elem || tag != ASN1_ID_OID) + return NULL; + + /* Check that this OID is ecPublicKey */ + if (!asn1_oid_eq(&ec_oid, elen, elem)) + return NULL; + + elem = asn1_der_find_elem(inner_seq, inner_len, 1, &tag, &elen); + if (!elem || tag != ASN1_ID_OID) + return NULL; + + /* Check if ELL supports this curve */ + if (asn1_oid_eq(&ec_p256_oid, elen, elem)) + curve_num = 19; + else if (asn1_oid_eq(&ec_p384_oid, elen, elem)) + curve_num = 20; + else + return NULL; + + /* BITSTRING */ + key_data = asn1_der_find_elem(outer_seq, outer_len, 1, &tag, &elen); + if (!key_data || tag != ASN1_ID_BIT_STRING || elen < 34) + return NULL; + + curve = l_ecc_curve_from_ike_group(curve_num); + if (!curve) + return NULL; + + return l_ecc_point_from_data(curve, key_data[1], + key_data + 2, elen - 2); +} diff --git a/src/dpp-util.h b/src/dpp-util.h index 84d33656..82535ff8 100644 --- a/src/dpp-util.h +++ b/src/dpp-util.h @@ -167,3 +167,4 @@ bool dpp_derive_ke(const uint8_t *i_nonce, const uint8_t *r_nonce, void *ke); uint8_t *dpp_point_to_asn1(const struct l_ecc_point *p, size_t *len_out); +struct l_ecc_point *dpp_point_from_asn1(const uint8_t *asn1, size_t len); -- 2.31.1

--- unit/test-dpp.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 142 insertions(+) diff --git a/unit/test-dpp.c b/unit/test-dpp.c index bfe6f747..1803e688 100644 --- a/unit/test-dpp.c +++ b/unit/test-dpp.c @@ -33,6 +33,134 @@ #include "src/util.h" #include "ell/useful.h" +struct dpp_test_info { + const char *uri; + bool expect_fail; + uint32_t expected_freqs[10]; + struct dpp_uri_info result; +}; + +struct dpp_test_info all_values = { + .uri = "DPP:C:81/1,115/36;I:SN=4774LH2b4044;M:5254005828e5;V:2;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .result = { + .mac = { 0x52, 0x54, 0x00, 0x58, 0x28, 0xe5 }, + .version = 2, + }, + .expected_freqs = { 2412, 5180, 0 } +}; + +struct dpp_test_info no_type = { + .uri = "C:81/1;K:shouldnotmatter;;", + .expect_fail = true +}; + +struct dpp_test_info empty = { + .uri = "DPP:", + .expect_fail = true +}; + +struct dpp_test_info no_key = { + .uri = "DPP:C:81/1,115/36;I:SN=4774LH2b4044;M:5254005828e5;V:2;;", + .expect_fail = true +}; + +struct dpp_test_info data_after_terminator = { + .uri = "DPP:K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;C:81/1;;", + .expect_fail = true +}; + +struct dpp_test_info single_terminator = { + .uri = "DPP:K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;", + .expect_fail = true +}; + +struct dpp_test_info no_terminator = { + .uri = "DPP:K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=", + .expect_fail = true +}; + +struct dpp_test_info bad_key = { + .uri = "DPP:K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0;;", + .expect_fail = true +}; + +struct dpp_test_info unexpected_id = { + .uri = "DPP:Z:somedata;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true +}; + +struct dpp_test_info bad_channels[] = { + { + .uri = "DPP:C:;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true + }, + { + .uri = "DPP:C:81;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true + }, + { + .uri = "DPP:C:81/;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true + }, + { + .uri = "DPP:C:81/1,;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true + }, + { + .uri = "DPP:C:81/1,81/;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true + }, + { + .uri = "DPP:C:81/1,/;K:MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;", + .expect_fail = true + }, +}; + +static bool verify_info(const struct dpp_uri_info *parsed, + const struct dpp_test_info *result) +{ + const struct dpp_uri_info *expected = &result->result; + uint32_t i; + + assert(!memcmp(parsed->mac, expected->mac, 6)); + assert(parsed->version == expected->version); + assert(parsed->boot_public != NULL); + + for (i = 0; result->expected_freqs[i]; i++) + assert(scan_freq_set_contains(parsed->freqs, + result->expected_freqs[i])); + + return true; +} + +static void test_uri_parse(const void *data) +{ + const struct dpp_test_info *test_info = data; + struct dpp_uri_info *info; + int ret; + + info = dpp_parse_uri(test_info->uri); + if (test_info->expect_fail) { + assert(info == NULL); + return; + } + + assert(ret == 0); + + assert(verify_info(info, test_info)); + + dpp_free_uri_info(info); +} + + +static void test_bad_channels(const void *data) +{ + unsigned int i; + + for (i = 0; i < L_ARRAY_SIZE(bad_channels); i++) + test_uri_parse(&bad_channels[i]); +} + /* * B.2 Test Vectors for DPP Authentication Using P-256 for * Responder-only Authentication @@ -148,5 +276,19 @@ int main(int argc, char *argv[]) l_test_add("DPP test key derivation", test_key_derivation, NULL); + l_test_add("DPP URI parse", test_uri_parse, &all_values); + l_test_add("DPP URI no type", test_uri_parse, &no_type); + l_test_add("DPP URI empty", test_uri_parse, &empty); + l_test_add("DPP URI no key", test_uri_parse, &no_key); + l_test_add("DPP URI data after terminator", test_uri_parse, + &data_after_terminator); + l_test_add("DPP URI single terminator", test_uri_parse, + &single_terminator); + l_test_add("DPP URI no terminator", test_uri_parse, + &no_terminator); + l_test_add("DPP URI bad key", test_uri_parse, &bad_key); + l_test_add("DPP URI bad channels", test_bad_channels, &bad_channels); + l_test_add("DPP URI unexpected ID", test_uri_parse, &unexpected_id); + return l_test_run(); } -- 2.31.1

Hi James, On 1/18/22 15:25, James Prestwood wrote: Should this be opt-in? You may want to audit all uses of frame_watch_add to see if they can deal with multicast frames. Regards, -Denis

The difference between the existing code is that IWD will send the authentication request, making it the initiator. This handles the use case where IWD is provided a peers URI containing its bootstrapping key rather than IWD always providing its own URI. A new DBus API was added, ConfigureEnrollee(). Using ConfigureEnrollee() IWD will act as a configurator but begin by traversing a channel list (URI provided or default) and waiting for presence announcements. When an announcement is received IWD will send an authentication request to the peer, receive its reply, and send an authentication confirm. As with being a responder, IWD only supports configuration to the currently connected BSS and will request the enrollee switch to this BSS's frequency to preserve network performance. --- src/dpp.c | 442 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 439 insertions(+), 3 deletions(-) diff --git a/src/dpp.c b/src/dpp.c index a7216143..80567c1a 100644 --- a/src/dpp.c +++ b/src/dpp.c @@ -83,20 +83,33 @@ struct dpp_sm { uint8_t *own_asn1; size_t own_asn1_len; + uint8_t *peer_asn1; + size_t peer_asn1_len; uint8_t own_boot_hash[32]; + uint8_t peer_boot_hash[32]; const struct l_ecc_curve *curve; size_t key_len; size_t nonce_len; struct l_ecc_scalar *boot_private; struct l_ecc_point *boot_public; + struct l_ecc_point *peer_boot_public; enum dpp_state state; + /* + * List of frequencies to jump between. The presence of this list is + * also used to signify that a configurator is an initiator vs responder + */ uint32_t *freqs; size_t freqs_len; size_t freqs_idx; uint32_t dwell; uint32_t current_freq; + /* + * Frequency the remainder of the auth/config protocol will run on. + * For an initiating configurator this is the frequency of the currently + * connected BSS. + */ uint32_t new_freq; struct scan_freq_set *presence_list; @@ -107,7 +120,9 @@ struct dpp_sm { uint8_t i_nonce[32]; uint8_t e_nonce[32]; + struct l_ecc_scalar *m; uint64_t ke[L_ECC_MAX_DIGITS]; + uint64_t k1[L_ECC_MAX_DIGITS]; uint64_t k2[L_ECC_MAX_DIGITS]; uint64_t auth_tag[L_ECC_MAX_DIGITS]; @@ -145,6 +160,16 @@ static void dpp_free_auth_data(struct dpp_sm *dpp) l_ecc_point_free(dpp->peer_proto_public); dpp->peer_proto_public = NULL; } + + if (dpp->peer_boot_public) { + l_ecc_point_free(dpp->peer_boot_public); + dpp->peer_boot_public = NULL; + } + + if (dpp->m) { + l_ecc_scalar_free(dpp->m); + dpp->m = NULL; + } } static void dpp_reset(struct dpp_sm *dpp) @@ -188,6 +213,7 @@ static void dpp_reset(struct dpp_sm *dpp) explicit_bzero(dpp->i_nonce, dpp->nonce_len); explicit_bzero(dpp->e_nonce, dpp->nonce_len); explicit_bzero(dpp->ke, dpp->key_len); + explicit_bzero(dpp->k1, dpp->key_len); explicit_bzero(dpp->k2, dpp->key_len); explicit_bzero(dpp->auth_tag, dpp->key_len); @@ -1260,6 +1286,49 @@ static void dpp_presence_announce(struct dpp_sm *dpp) dpp_send_frame(dpp, iov, 2, dpp->current_freq); } +static void dpp_send_authenticate_request(struct dpp_sm *dpp) +{ + uint8_t hdr[32]; + uint8_t attrs[256]; + uint8_t *ptr = attrs; + uint64_t i_proto_key[L_ECC_MAX_DIGITS * 2]; + uint8_t version = 2; + struct iovec iov[2]; + + l_ecc_point_get_data(dpp->own_proto_public, i_proto_key, + sizeof(i_proto_key)); + + iov[0].iov_len = dpp_build_header(netdev_get_address(dpp->netdev), + dpp->auth_addr, + DPP_FRAME_AUTHENTICATION_REQUEST, hdr); + iov[0].iov_base = hdr; + + ptr += dpp_append_attr(ptr, DPP_ATTR_RESPONDER_BOOT_KEY_HASH, + dpp->peer_boot_hash, 32); + ptr += dpp_append_attr(ptr, DPP_ATTR_INITIATOR_BOOT_KEY_HASH, + dpp->own_boot_hash, 32); + ptr += dpp_append_attr(ptr, DPP_ATTR_INITIATOR_PROTOCOL_KEY, + i_proto_key, dpp->key_len * 2); + ptr += dpp_append_attr(ptr, DPP_ATTR_PROTOCOL_VERSION, &version, 1); + + if (dpp->current_freq != dpp->new_freq) { + uint8_t pair[2] = { 81, + band_freq_to_channel(dpp->new_freq, NULL) }; + + ptr += dpp_append_attr(ptr, DPP_ATTR_CHANNEL, pair, 2); + } + + ptr += dpp_append_wrapped_data(hdr + 26, 6, attrs, ptr - attrs, + ptr, sizeof(attrs), dpp->k1, dpp->key_len, 2, + DPP_ATTR_INITIATOR_NONCE, dpp->nonce_len, dpp->i_nonce, + DPP_ATTR_INITIATOR_CAPABILITIES, 1, &dpp->role); + + iov[1].iov_base = attrs; + iov[1].iov_len = ptr - attrs; + + dpp_send_frame(dpp, iov, 2, dpp->current_freq); +} + static void dpp_roc_started(void *user_data) { struct dpp_sm *dpp = user_data; @@ -1559,6 +1628,300 @@ auth_request_failed: dpp_free_auth_data(dpp); } +static void dpp_send_authenticate_confirm(struct dpp_sm *dpp) +{ + uint8_t hdr[32]; + struct iovec iov[2]; + uint8_t attrs[256]; + uint8_t *ptr = attrs; + uint8_t zero = 0; + + iov[0].iov_len = dpp_build_header(netdev_get_address(dpp->netdev), + dpp->auth_addr, + DPP_FRAME_AUTHENTICATION_CONFIRM, hdr); + iov[0].iov_base = hdr; + + ptr += dpp_append_attr(ptr, DPP_ATTR_STATUS, &zero, 1); + ptr += dpp_append_attr(ptr, DPP_ATTR_RESPONDER_BOOT_KEY_HASH, + dpp->peer_boot_hash, 32); + + ptr += dpp_append_wrapped_data(hdr + 26, 6, attrs, ptr - attrs, ptr, + sizeof(attrs), dpp->ke, dpp->key_len, 1, + DPP_ATTR_INITIATOR_AUTH_TAG, dpp->key_len, + dpp->auth_tag); + + iov[1].iov_base = attrs; + iov[1].iov_len = ptr - attrs; + + dpp_send_frame(dpp, iov, 2, dpp->current_freq); +} + +static void authenticate_response(struct dpp_sm *dpp, const uint8_t *from, + const uint8_t *body, size_t body_len) +{ + struct dpp_attr_iter iter; + enum dpp_attribute_type type; + size_t len; + const uint8_t *data; + int status = -1; + const void *r_boot_hash = NULL; + const void *r_proto = NULL; + size_t r_proto_len = 0; + const void *wrapped = NULL; + size_t wrapped_len; + uint8_t *unwrapped; + const void *r_nonce = NULL; + const void *i_nonce = NULL; + const void *r_auth = NULL; + struct l_ecc_point *r_proto_key; + struct l_ecc_scalar *n; + const void *ad0 = body + 2; + const void *ad1 = body + 8; + uint64_t r_auth_derived[L_ECC_MAX_DIGITS]; + + l_debug("Authenticate response"); + + if (dpp->state != DPP_STATE_AUTHENTICATING) + return; + + if (dpp->role != DPP_CAPABILITY_CONFIGURATOR) + return; + + if (!dpp->freqs) + return; + + if (memcmp(from, dpp->auth_addr, 6)) + return; + + dpp_attr_iter_init(&iter, body + 8, body_len - 8); + + while (dpp_attr_iter_next(&iter, &type, &len, &data)) { + switch (type) { + case DPP_ATTR_STATUS: + if (len != 1) + return; + + status = l_get_u8(data); + break; + case DPP_ATTR_RESPONDER_BOOT_KEY_HASH: + r_boot_hash = data; + break; + case DPP_ATTR_RESPONDER_PROTOCOL_KEY: + r_proto = data; + r_proto_len = len; + break; + case DPP_ATTR_PROTOCOL_VERSION: + if (len != 1 || l_get_u8(data) != 2) + return; + break; + case DPP_ATTR_WRAPPED_DATA: + wrapped = data; + wrapped_len = len; + break; + default: + break; + } + } + + if (status != DPP_STATUS_OK || !r_boot_hash || !r_proto ) { + l_debug("Auth response bad status or missing attributes"); + return; + } + + r_proto_key = l_ecc_point_from_data(dpp->curve, L_ECC_POINT_TYPE_FULL, + r_proto, r_proto_len); + if (!r_proto_key) { + l_debug("Peers protocol key was invalid"); + return; + } + + n = dpp_derive_k2(r_proto_key, dpp->proto_private, dpp->k2); + + unwrapped = dpp_unwrap_attr(ad0, 6, ad1, wrapped - 4 - ad1, dpp->k2, + dpp->key_len, wrapped, wrapped_len, + &wrapped_len); + if (!unwrapped) { + l_debug("Failed to unwrap primary data"); + return; + } + + wrapped = NULL; + + dpp_attr_iter_init(&iter, unwrapped, wrapped_len); + + while (dpp_attr_iter_next(&iter, &type, &len, &data)) { + switch (type) { + case DPP_ATTR_RESPONDER_NONCE: + if (len != dpp->nonce_len) + return; + + r_nonce = data; + break; + case DPP_ATTR_INITIATOR_NONCE: + if (len != dpp->nonce_len) + return; + + i_nonce = data; + break; + case DPP_ATTR_RESPONDER_CAPABILITIES: + break; + case DPP_ATTR_WRAPPED_DATA: + wrapped = data; + wrapped_len = len; + break; + default: + break; + } + } + + if (!r_nonce || !i_nonce || !wrapped) { + l_debug("Wrapped data missing attributes"); + return; + } + + if (!dpp_derive_ke(i_nonce, r_nonce, dpp->m, n, dpp->ke)) { + l_debug("Failed to derive ke"); + return; + } + + unwrapped = dpp_unwrap_attr(NULL, 0, NULL, 0, dpp->ke, dpp->key_len, + wrapped, wrapped_len, &wrapped_len); + if (!unwrapped) { + l_debug("Failed to unwrap secondary data"); + return; + } + + dpp_attr_iter_init(&iter, unwrapped, wrapped_len); + + while (dpp_attr_iter_next(&iter, &type, &len, &data)) { + switch (type) { + case DPP_ATTR_RESPONDER_AUTH_TAG: + if (len != dpp->key_len) + return; + + r_auth = data; + break; + default: + break; + } + } + + if (!r_auth) { + l_debug("R-Auth was not in secondary wrapped data"); + return; + } + + if (!dpp_derive_r_auth(i_nonce, r_nonce, dpp->nonce_len, + dpp->own_proto_public, r_proto_key, + dpp->peer_boot_public, r_auth_derived)) { + l_debug("Failed to derive r_auth"); + return; + } + + if (memcmp(r_auth, r_auth_derived, dpp->key_len)) { + l_debug("R-Auth did not verify"); + return; + } + + if (!dpp_derive_i_auth(r_nonce, i_nonce, dpp->nonce_len, + r_proto_key, dpp->own_proto_public, + dpp->peer_boot_public, dpp->auth_tag)) { + l_debug("Could not derive I-Auth"); + return; + } + + dpp->current_freq = dpp->new_freq; + + dpp_send_authenticate_confirm(dpp); +} + +static void dpp_handle_presence_announcement(struct dpp_sm *dpp, + const uint8_t *from, + const uint8_t *body, + size_t body_len) +{ + struct dpp_attr_iter iter; + enum dpp_attribute_type type; + size_t len; + const uint8_t *data; + const void *r_boot = NULL; + size_t r_boot_len = 0; + uint8_t hash[32]; + + l_debug("Presence announcement "MAC, MAC_STR(from)); + + /* Must be a configurator, in an initiator role, in PRESENCE state */ + if (dpp->state != DPP_STATE_PRESENCE) + return; + + if (dpp->role != DPP_CAPABILITY_CONFIGURATOR) + return; + + if (!dpp->freqs) + return; + + /* + * The URI may not have contained a MAC address, if this announcement + * verifies set auth_addr then. + */ + if (!l_memeqzero(dpp->auth_addr, 6) && + memcmp(from, dpp->auth_addr, 6)) { + l_debug("Unexpected source "MAC" expected "MAC, MAC_STR(from), + MAC_STR(dpp->auth_addr)); + return; + } + + dpp_attr_iter_init(&iter, body + 8, body_len - 8); + + while (dpp_attr_iter_next(&iter, &type, &len, &data)) { + switch (type) { + case DPP_ATTR_RESPONDER_BOOT_KEY_HASH: + r_boot = data; + r_boot_len = len; + break; + default: + break; + } + } + + if (!r_boot || r_boot_len != 32) { + l_debug("No responder boot hash"); + return; + } + + /* Hash what we have for the peer and check its our enrollee */ + dpp_hash(L_CHECKSUM_SHA256, hash, 2, "chirp", strlen("chirp"), + dpp->peer_asn1, dpp->peer_asn1_len); + + if (memcmp(hash, r_boot, sizeof(hash))) { + l_debug("Peers boot hash did not match"); + return; + } + + /* + * This is the peer we expected, save away the address and derive the + * initial keys. + */ + memcpy(dpp->auth_addr, from, 6); + + l_ecdh_generate_key_pair(dpp->curve, &dpp->proto_private, + &dpp->own_proto_public); + l_getrandom(dpp->i_nonce, dpp->nonce_len); + + dpp->m = dpp_derive_k1(dpp->peer_boot_public, dpp->proto_private, + dpp->k1); + + dpp->state = DPP_STATE_AUTHENTICATING; + + dpp_send_authenticate_request(dpp); + + /* + * Should we wait for an ACK then go offchannel? + */ + if (dpp->current_freq != dpp->new_freq) + dpp_start_offchannel(dpp, dpp->new_freq); +} + static void dpp_handle_frame(const struct mmpdu_header *frame, const void *body, size_t body_len, int rssi, void *user_data) @@ -1580,6 +1943,9 @@ static void dpp_handle_frame(const struct mmpdu_header *frame, case DPP_FRAME_AUTHENTICATION_REQUEST: authenticate_request(dpp, frame->address_2, body, body_len); break; + case DPP_FRAME_AUTHENTICATION_RESPONSE: + authenticate_response(dpp, frame->address_2, body, body_len); + break; case DPP_FRAME_AUTHENTICATION_CONFIRM: authenticate_confirm(dpp, frame->address_2, body, body_len); break; @@ -1587,6 +1953,10 @@ static void dpp_handle_frame(const struct mmpdu_header *frame, dpp_handle_config_result_frame(dpp, frame->address_2, body, body_len); break; + case DPP_FRAME_PRESENCE_ANNOUNCEMENT: + dpp_handle_presence_announcement(dpp, frame->address_2, + body, body_len); + break; default: l_debug("Unhandled DPP frame %u", *ptr); break; @@ -1814,9 +2184,48 @@ static struct l_dbus_message *dpp_dbus_start_enrollee(struct l_dbus *dbus, return NULL; } -static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus, +/* + * Set up the configurator for an initiator role. The configurator + * will go offchannel to frequencies advertised by the enrollees URI or, + * if no channels are provided, use a default channel list. + */ +static bool dpp_configurator_start_presence(struct dpp_sm *dpp, const char *uri) +{ + _auto_(l_free) uint32_t *freqs = NULL; + size_t freqs_len = 0; + L_AUTO_FREE_VAR(struct dpp_uri_info *, info) = NULL; + + info = dpp_parse_uri(uri); + if (!info) + return false; + + if (!l_memeqzero(info->mac, 6)) + memcpy(dpp->auth_addr, info->mac, 6); + + dpp->peer_boot_public = l_ecc_point_clone(info->boot_public); + dpp->peer_asn1 = dpp_point_to_asn1(info->boot_public, + &dpp->peer_asn1_len); + if (!dpp->peer_asn1) { + l_debug("Peer boot key did not convert to asn1"); + return false; + } + + dpp_hash(L_CHECKSUM_SHA256, dpp->peer_boot_hash, 1, dpp->peer_asn1, + dpp->peer_asn1_len); + + if (info->freqs) + freqs = scan_freq_set_to_fixed_array(info->freqs, &freqs_len); + + dpp_start_presence(dpp, freqs, freqs_len); + + return true; +} + +static struct l_dbus_message *dpp_start_configurator_common( + struct l_dbus *dbus, struct l_dbus_message *message, - void *user_data) + void *user_data, + bool responder) { struct dpp_sm *dpp = user_data; struct l_dbus_message *reply; @@ -1825,6 +2234,7 @@ static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus, struct network *network; struct l_settings *settings; struct handshake_state *hs = netdev_get_handshake(dpp->netdev); + const char *uri; /* * For now limit the configurator to only configuring enrollees to the @@ -1848,13 +2258,23 @@ static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus, if (dpp->state != DPP_STATE_NOTHING) return dbus_error_busy(message); + if (!responder) { + if (!l_dbus_message_get_arguments(message, "s", &uri)) + return dbus_error_invalid_args(message); + + if (!dpp_configurator_start_presence(dpp, uri)) + return dbus_error_invalid_args(message); + + dpp->new_freq = bss->frequency; + } else + dpp->current_freq = bss->frequency; + dpp->uri = dpp_generate_uri(dpp->own_asn1, dpp->own_asn1_len, 2, netdev_get_address(dpp->netdev), &bss->frequency, 1, NULL, NULL); dpp->state = DPP_STATE_PRESENCE; dpp->role = DPP_CAPABILITY_CONFIGURATOR; - dpp->current_freq = bss->frequency; dpp->config = dpp_configuration_new(settings, network_get_ssid(network), hs->akm_suite); @@ -1870,6 +2290,20 @@ static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus, return reply; } +static struct l_dbus_message *dpp_dbus_start_configurator(struct l_dbus *dbus, + struct l_dbus_message *message, + void *user_data) +{ + return dpp_start_configurator_common(dbus, message, user_data, true); +} + +static struct l_dbus_message *dpp_dbus_configure_enrollee(struct l_dbus *dbus, + struct l_dbus_message *message, + void *user_data) +{ + return dpp_start_configurator_common(dbus, message, user_data, false); +} + static struct l_dbus_message *dpp_dbus_stop(struct l_dbus *dbus, struct l_dbus_message *message, void *user_data) @@ -1887,6 +2321,8 @@ static void dpp_setup_interface(struct l_dbus_interface *interface) dpp_dbus_start_enrollee, "s", "", "uri"); l_dbus_interface_method(interface, "StartConfigurator", 0, dpp_dbus_start_configurator, "s", "", "uri"); + l_dbus_interface_method(interface, "ConfigureEnrollee", 0, + dpp_dbus_configure_enrollee, "", "s", "uri"); l_dbus_interface_method(interface, "Stop", 0, dpp_dbus_stop, "", ""); } -- 2.31.1

If a URI is passed this will envoke ConfigureEnrollee() --- autotests/util/iwd.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py index 54b4819e..3f21d5d6 100755 --- a/autotests/util/iwd.py +++ b/autotests/util/iwd.py @@ -280,8 +280,11 @@ class DeviceProvisioning(IWDDBusAbstract): def start_enrollee(self): return self._iface.StartEnrollee() - def start_configurator(self): - return self._iface.StartConfigurator() + def start_configurator(self, uri=None): + if uri: + return self._iface.ConfigureEnrollee(uri) + else: + return self._iface.StartConfigurator() def stop(self): self._iface.Stop() @@ -667,8 +670,8 @@ class Device(IWDDBusAbstract): def dpp_start_enrollee(self): return self._device_provisioning.start_enrollee() - def dpp_start_configurator(self): - return self._device_provisioning.start_configurator() + def dpp_start_configurator(self, uri=None): + return self._device_provisioning.start_configurator(uri) def dpp_stop(self): return self._device_provisioning.stop() -- 2.31.1

This adds support for wpa_supplicant to generate its own URI and start presence announcements (DPP_CHIRP). --- autotests/util/wpas.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/autotests/util/wpas.py b/autotests/util/wpas.py index c8e65179..995bdad1 100644 --- a/autotests/util/wpas.py +++ b/autotests/util/wpas.py @@ -239,10 +239,17 @@ class Wpas: def set(self, key, value, **kwargs): self._ctrl_request('SET ' + key + ' ' + value, **kwargs) - def dpp_enrollee_start(self, uri=None): + def dpp_enrollee_start(self, uri=None, oper_and_channel=None): + if not oper_and_channel: + oper_and_channel = '81/1' + self._rx_data = [] - self._ctrl_request('DPP_BOOTSTRAP_GEN type=qrcode') - self.wait_for_result() + self._ctrl_request('DPP_BOOTSTRAP_GEN type=qrcode chan=%s' % oper_and_channel) + self._dpp_qr_id = self.wait_for_result() + self._ctrl_request('DPP_BOOTSTRAP_GET_URI %s' % self._dpp_qr_id) + self._dpp_uri = self.wait_for_result() + + print("DPP Enrollee QR: %s" % self._dpp_uri) if uri: self._rx_data = [] @@ -250,6 +257,10 @@ class Wpas: self._dpp_qr_id = self.wait_for_result() self._rx_data = [] self._ctrl_request('DPP_AUTH_INIT peer=%s role=enrollee' % self._dpp_qr_id) + else: + self._ctrl_request('DPP_CHIRP own=%s iter=100' % self._dpp_qr_id) + + return self._dpp_uri def dpp_configurator_create(self, uri): self._rx_data = [] -- 2.31.1

The purpose of this was to have a single utility to both cancel an existing offchannel operation (if one exists) and start a new one. The problem was the previous offchannel operation was being canceled first which opened up the radio work queue to other items. This is not desireable as, for example, a scan would end up breaking the DPP protocol most likely. Starting the new offchannel then canceling is the correct order of operations but to do this required saving the new ID, canceling, then setting offchannel_id to the new ID so dpp_presence_timeout wouldn't overwrite the new ID to zero. This also removes an explicit call to offchannel_cancel which is already done by dpp_offchannel_start. --- src/dpp.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/dpp.c b/src/dpp.c index 80567c1a..ee1497c0 100644 --- a/src/dpp.c +++ b/src/dpp.c @@ -1422,12 +1422,28 @@ protocol_failed: static void dpp_start_offchannel(struct dpp_sm *dpp, uint32_t freq) { + /* + * This needs to be handled carefully for a few reasons: + * + * First, the next offchannel operation needs to be started prior to + * canceling an existing one. This is so the offchannel work can + * continue uninterrupted without any other work items starting in + * between canceling and starting the next (e.g. if a scan request is + * sitting in the queue). + * + * Second, dpp_presence_timeout resets dpp->offchannel_id to zero which + * is why the new ID is saved and only set to dpp->offchannel_id once + * the previous offchannel work is cancelled (i.e. destroy() has been + * called). + */ + uint32_t id = offchannel_start(netdev_get_wdev_id(dpp->netdev), + freq, dpp->dwell, dpp_roc_started, + dpp, dpp_presence_timeout); + if (dpp->offchannel_id) offchannel_cancel(dpp->wdev_id, dpp->offchannel_id); - dpp->offchannel_id = offchannel_start(netdev_get_wdev_id(dpp->netdev), - freq, dpp->dwell, dpp_roc_started, - dpp, dpp_presence_timeout); + dpp->offchannel_id = id; } static void authenticate_request(struct dpp_sm *dpp, const uint8_t *from, @@ -1520,7 +1536,6 @@ static void authenticate_request(struct dpp_sm *dpp, const uint8_t *from, l_debug("Configurator requested a new frequency %u", dpp->new_freq); - offchannel_cancel(dpp->wdev_id, dpp->offchannel_id); dpp_start_offchannel(dpp, dpp->new_freq); break; -- 2.31.1