This changes scan_bss from using separate members for each OWE transition element data type (ssid, ssid_len, and bssid) to a structure that holds them all. This is being done because OWE transition has option operating class and channel bytes which will soon be parsed. This would end up needing 5 separate members in scan_bss which is a bit much for a single IE that needs to be parsed. This makes checking the presense of the IE more convenient as well since it can be done with a simple NULL pointer check rather than having to l_memeqzero the BSSID. --- src/ie.c | 10 ++++------ src/ie.h | 4 +--- src/network.c | 9 ++------- src/scan.c | 26 ++++++++++++++++---------- src/scan.h | 5 ++--- src/station.c | 43 ++++++++++++++++++++++--------------------- 6 files changed, 47 insertions(+), 50 deletions(-) diff --git a/src/ie.c b/src/ie.c index 0440373c..773c54e0 100644 --- a/src/ie.c +++ b/src/ie.c @@ -2500,9 +2500,7 @@ int ie_parse_network_cost(const void *data, size_t len, } int ie_parse_owe_transition(const void *data, size_t len, - uint8_t bssid[static 6], - uint8_t ssid[static 32], - size_t *ssid_len) + struct ie_owe_transition_info *info) { const uint8_t *ie = data; size_t slen; @@ -2534,10 +2532,10 @@ int ie_parse_owe_transition(const void *data, size_t len, if (len != slen + 13) return -ENOMSG; - memcpy(bssid, ie + 6, 6); + memcpy(info->bssid, ie + 6, 6); - memcpy(ssid, ie + 13, slen); - *ssid_len = slen; + memcpy(info->ssid, ie + 13, slen); + info->ssid_len = slen; return 0; } diff --git a/src/ie.h b/src/ie.h index 02892724..5258c6f3 100644 --- a/src/ie.h +++ b/src/ie.h @@ -639,6 +639,4 @@ int ie_parse_network_cost(const void *data, size_t len, uint16_t *flags, uint16_t *level); int ie_parse_owe_transition(const void *data, size_t len, - uint8_t bssid[static 6], - uint8_t ssid[static 32], - size_t *ssid_len); + struct ie_owe_transition_info *info); diff --git a/src/network.c b/src/network.c index 7240b029..110c8577 100644 --- a/src/network.c +++ b/src/network.c @@ -1110,11 +1110,6 @@ const struct l_queue_entry *network_bss_list_get_entries( return l_queue_get_entries(network->bss_list); } -static bool bss_is_owe(struct scan_bss *bss) -{ - return !l_memeqzero(bss->owe_trans_bssid, 6) && bss->rsne; -} - struct scan_bss *network_bss_select(struct network *network, bool fallback_to_blacklist) { @@ -1141,13 +1136,13 @@ struct scan_bss *network_bss_select(struct network *network, candidate = bss; /* OWE Transition BSS */ - if (!l_memeqzero(bss->owe_trans_bssid, 6)) { + if (!bss->owe_trans) { /* Don't want to connect to the Open BSS if possible */ if (!bss->rsne) continue; /* Candidate is not OWE, set this as new candidate */ - if (!bss_is_owe(candidate)) + if (!(candidate->owe_trans && candidate->rsne)) candidate = bss; } diff --git a/src/scan.c b/src/scan.c index 7d6e46e9..54a7bc84 100644 --- a/src/scan.c +++ b/src/scan.c @@ -686,8 +686,8 @@ static void add_owe_scan_cmd(struct scan_context *sc, struct scan_request *sr, } else params.freqs = freqs; - params.ssid = bss->owe_trans_ssid; - params.ssid_len = bss->owe_trans_ssid_len; + params.ssid = bss->owe_trans->ssid; + params.ssid_len = bss->owe_trans->ssid_len; params.flush = true; cmd = scan_build_cmd(sc, ignore_flush, false, &params); @@ -736,14 +736,14 @@ uint32_t scan_owe_hidden(uint64_t wdev_id, struct l_queue *list, /* First */ if (!ssid) { - ssid = bss->owe_trans_ssid; - ssid_len = bss->owe_trans_ssid_len; + ssid = bss->owe_trans->ssid; + ssid_len = bss->owe_trans->ssid_len; continue; } - if (ssid_len == bss->owe_trans_ssid_len && - !memcmp(ssid, bss->owe_trans_ssid, - bss->owe_trans_ssid_len)) + if (ssid_len == bss->owe_trans->ssid_len && + !memcmp(ssid, bss->owe_trans->ssid, + bss->owe_trans->ssid_len)) continue; same_ssid = false; @@ -1060,9 +1060,14 @@ static void scan_parse_vendor_specific(struct scan_bss *bss, const void *data, } if (is_ie_wfa_ie(data, len, IE_WFA_OI_OWE_TRANSITION)) { - ie_parse_owe_transition(data - 2, len + 2, bss->owe_trans_bssid, - bss->owe_trans_ssid, - &bss->owe_trans_ssid_len); + bss->owe_trans = l_new(struct ie_owe_transition_info, 1); + + if (ie_parse_owe_transition(data - 2, len + 2, + bss->owe_trans) < 0) { + l_free(bss->owe_trans); + bss->owe_trans = NULL; + } + return; } @@ -1511,6 +1516,7 @@ void scan_bss_free(struct scan_bss *bss) l_free(bss->osen); l_free(bss->rc_ie); l_free(bss->wfd); + l_free(bss->owe_trans); switch (bss->source_frame) { case SCAN_BSS_PROBE_RESP: diff --git a/src/scan.h b/src/scan.h index 8f481f10..22981585 100644 --- a/src/scan.h +++ b/src/scan.h @@ -22,6 +22,7 @@ struct scan_freq_set; struct ie_rsn_info; +struct ie_owe_transition_info; struct p2p_probe_resp; struct p2p_probe_req; struct p2p_beacon; @@ -62,6 +63,7 @@ struct scan_bss { struct p2p_probe_req *p2p_probe_req_info; struct p2p_beacon *p2p_beacon_info; }; + struct ie_owe_transition_info *owe_trans; uint8_t mde[3]; uint8_t ssid[32]; uint8_t ssid_len; @@ -76,9 +78,6 @@ struct scan_bss { uint64_t parent_tsf; uint8_t *wfd; /* Concatenated WFD IEs */ ssize_t wfd_size; /* Size of Concatenated WFD IEs */ - uint8_t owe_trans_ssid[32]; - size_t owe_trans_ssid_len; - uint8_t owe_trans_bssid[6]; bool mde_present : 1; bool cc_present : 1; bool cap_rm_neighbor_report : 1; diff --git a/src/station.c b/src/station.c index d30f99b7..4a41fe05 100644 --- a/src/station.c +++ b/src/station.c @@ -400,8 +400,8 @@ static struct network *station_add_seen_bss(struct station *station, return NULL; /* Hidden OWE transition network */ - if (security == SECURITY_NONE && bss->rsne && - !l_memeqzero(bss->owe_trans_bssid, 6)) { + if (security == SECURITY_NONE && bss->rsne && bss->owe_trans) { + struct ie_owe_transition_info *info = bss->owe_trans; /* * WiFi Alliance OWE Specification v1.1 - Section 2.2.1: * @@ -420,18 +420,17 @@ static struct network *station_add_seen_bss(struct station *station, * we could not look up the network. Note that this is not true * for the open BSS IE, it can be non-utf8. */ - if (!util_ssid_is_utf8(bss->owe_trans_ssid_len, - bss->owe_trans_ssid)) + if (!util_ssid_is_utf8(info->ssid_len, info->ssid)) return NULL; - if (!memcmp(bss->owe_trans_ssid, bss->ssid, bss->ssid_len)) + if (!memcmp(info->ssid, bss->ssid, bss->ssid_len)) return NULL; - if (!memcmp(bss->owe_trans_bssid, bss->addr, 6)) + if (!memcmp(info->bssid, bss->addr, 6)) return NULL; - memcpy(ssid, bss->owe_trans_ssid, sizeof(bss->owe_trans_ssid)); - ssid[bss->owe_trans_ssid_len] = '\0'; + memcpy(ssid, info->ssid, info->ssid_len); + ssid[info->ssid_len] = '\0'; l_debug("Found hidden OWE network, using %s for network lookup", ssid); @@ -690,10 +689,12 @@ static bool station_start_anqp(struct station *station, struct network *network, static bool network_has_open_pair(struct network *network, struct scan_bss *owe) { const struct l_queue_entry *entry; + struct ie_owe_transition_info *owe_info = owe->owe_trans; for (entry = network_bss_list_get_entries(network); entry; entry = entry->next) { struct scan_bss *open = entry->data; + struct ie_owe_transition_info *open_info = open->owe_trans; /* * Check if this is an Open/Hidden pair: @@ -704,14 +705,14 @@ static bool network_has_open_pair(struct network *network, struct scan_bss *owe) * OWE SSID equals the SSID in Open IE * OWE BSSID equals the BSSID in Open IE */ - if (open->ssid_len == owe->owe_trans_ssid_len && - open->owe_trans_ssid_len == owe->ssid_len && - !memcmp(open->ssid, owe->owe_trans_ssid, + if (open->ssid_len == owe_info->ssid_len && + open_info->ssid_len == owe->ssid_len && + !memcmp(open->ssid, owe_info->ssid, open->ssid_len) && - !memcmp(open->owe_trans_ssid, owe->ssid, + !memcmp(open_info->ssid, owe->ssid, owe->ssid_len) && - !memcmp(open->addr, owe->owe_trans_bssid, 6) && - !memcmp(open->owe_trans_bssid, owe->addr, 6)) + !memcmp(open->addr, owe_info->bssid, 6) && + !memcmp(open_info->bssid, owe->addr, 6)) return true; } @@ -736,10 +737,10 @@ static bool station_owe_transition_results(int err, struct l_queue *bss_list, * Don't handle the open BSS, hidden BSS, BSS with no OWE * Transition IE, or an IE with a non-utf8 SSID */ - if (!bss->rsne || l_memeqzero(bss->owe_trans_bssid, 6) || + if (!bss->rsne || !bss->owe_trans || util_ssid_is_hidden(bss->ssid_len, bss->ssid) || - !util_ssid_is_utf8(bss->owe_trans_ssid_len, - bss->owe_trans_ssid)) + !util_ssid_is_utf8(bss->owe_trans->ssid_len, + bss->owe_trans->ssid)) goto free; @@ -807,7 +808,7 @@ static void foreach_add_owe_scan(struct network *network, void *data) entry = entry->next) { struct scan_bss *open = entry->data; - if (l_memeqzero(open->owe_trans_bssid, 6)) + if (!open->owe_trans) continue; /* only want the open networks with WFA OWE IE */ @@ -815,7 +816,7 @@ static void foreach_add_owe_scan(struct network *network, void *data) continue; /* BSS already in network object */ - if (network_bss_find_by_addr(network, open->owe_trans_bssid)) + if (network_bss_find_by_addr(network, open->owe_trans->bssid)) continue; if (!list) @@ -3037,7 +3038,7 @@ static bool station_hidden_network_scan_results(int err, memcmp(bss->ssid, ssid, ssid_len)) goto next; - if (!l_memeqzero(bss->owe_trans_bssid, 6)) + if (bss->owe_trans) goto next; /* @@ -3134,7 +3135,7 @@ static struct l_dbus_message *station_dbus_connect_hidden_network( struct scan_bss *target = network_bss_select(network, true); /* Treat OWE transition networks special */ - if (!l_memeqzero(target->owe_trans_bssid, 6)) + if (target->owe_trans) goto not_hidden; for (; entry; entry = entry->next) { -- 2.31.1

This operating class/channel is also verified while parsing and parsing will fail if band_oci_frequency fails. This does put a requirement on anything that uses ie.c to also include band.c. Makefile has been updated. --- Makefile.am | 16 ++++++++++------ src/ie.c | 31 ++++++++++++++++++++----------- src/ie.h | 2 ++ 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index ab1682bd..3885c47a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -316,7 +316,8 @@ monitor_iwmon_SOURCES = monitor/main.c linux/nl80211.h \ src/eapolutil.h src/eapolutil.c \ src/nl80211cmd.h src/nl80211cmd.c \ src/p2putil.c src/p2putil.h \ - src/anqputil.h src/anqputil.c + src/anqputil.h src/anqputil.c \ + src/band.h src/band.c monitor_iwmon_LDADD = $(ell_ldadd) if MANUAL_PAGES @@ -357,7 +358,8 @@ tools_probe_req_SOURCES = tools/probe-req.c src/mpdu.h src/mpdu.c \ src/ie.h src/ie.c \ src/nl80211util.h src/nl80211util.c \ src/util.h src/util.c \ - src/common.h src/common.c + src/common.h src/common.c \ + src/band.h src/band.c tools_probe_req_LDADD = $(ell_ldadd) if HWSIM @@ -439,7 +441,7 @@ unit_test_kdf_sha256_SOURCES = unit/test-kdf-sha256.c \ src/crypto.h src/crypto.c unit_test_kdf_sha256_LDADD = $(ell_ldadd) -unit_test_ie_SOURCES = unit/test-ie.c src/ie.h src/ie.c +unit_test_ie_SOURCES = unit/test-ie.c src/ie.h src/ie.c src/band.h src/band.c unit_test_ie_LDADD = $(ell_ldadd) unit_test_band_SOURCES = unit/test-band.c src/band.h src/band.c @@ -451,7 +453,8 @@ unit_test_crypto_LDADD = $(ell_ldadd) unit_test_mpdu_SOURCES = unit/test-mpdu.c \ src/mpdu.h src/mpdu.c \ - src/ie.h src/ie.c + src/ie.h src/ie.c \ + src/band.h src/band.c unit_test_mpdu_LDADD = $(ell_ldadd) unit_test_eapol_SOURCES = unit/test-eapol.c \ @@ -481,7 +484,7 @@ unit_test_util_SOURCES = src/util.h src/util.c \ unit_test_util_LDADD = $(ell_ldadd) unit_test_ssid_security_SOURCES = unit/test-ssid-security.c src/ie.h src/ie.c \ - src/common.h src/common.c + src/common.h src/common.c src/band.h src/band.c unit_test_ssid_security_LDADD = $(ell_ldadd) unit_test_wsc_SOURCES = unit/test-wsc.c src/wscutil.h src/wscutil.c \ @@ -533,7 +536,8 @@ unit_test_p2p_SOURCES = unit/test-p2p.c src/wscutil.h src/wscutil.c \ src/crypto.h src/crypto.c \ src/ie.h src/ie.c \ src/util.h src/util.c \ - src/p2putil.h src/p2putil.c + src/p2putil.h src/p2putil.c \ + src/band.h src/band.c unit_test_p2p_LDADD = $(ell_ldadd) TESTS = $(unit_tests) diff --git a/src/ie.c b/src/ie.c index 773c54e0..5a2ea356 100644 --- a/src/ie.c +++ b/src/ie.c @@ -33,6 +33,7 @@ #include "src/util.h" #include "src/crypto.h" #include "src/ie.h" +#include "src/band.h" const unsigned char ieee_oui[3] = { 0x00, 0x0f, 0xac }; const unsigned char microsoft_oui[3] = { 0x00, 0x50, 0xf2 }; @@ -2503,6 +2504,10 @@ int ie_parse_owe_transition(const void *data, size_t len, struct ie_owe_transition_info *info) { const uint8_t *ie = data; + const uint8_t *bssid; + const uint8_t *ssid; + uint8_t oper_class = 0; + uint8_t channel = 0; size_t slen; if (len < 14 || ie[0] != IE_TYPE_VENDOR_SPECIFIC) @@ -2520,22 +2525,26 @@ int ie_parse_owe_transition(const void *data, size_t len, * * "Band Info and Channel Info are optional fields. If configured, * both fields shall be included in an OWE Transition Mode element" - * - * TODO: Support Band/Channel bytes: - * For the time being the OWE transition AP is assumed to be on the same - * channel as the open AP. This means there should be no band/channel - * bytes at the end of the IE. Currently hostapd has no support for this - * so it can be skipped. In addition 802.11 Appendix E-1 needs to be - * encoded as a table to map Country/operating class to channels to make - * any sense of it. */ - if (len != slen + 13) + if (len != slen + 13 && len != slen + 15) return -ENOMSG; - memcpy(info->bssid, ie + 6, 6); + bssid = ie + 6; + ssid = ie + 13; + + if (len == slen + 15) { + oper_class = l_get_u8(ie + 13 + slen); + channel = l_get_u8(ie + 14 + slen); + + if (oci_to_frequency(oper_class, channel) < 0) + return -ENOMSG; + } - memcpy(info->ssid, ie + 13, slen); + memcpy(info->bssid, bssid, 6); + memcpy(info->ssid, ssid, slen); info->ssid_len = slen; + info->oper_class = oper_class; + info->channel = channel; return 0; } diff --git a/src/ie.h b/src/ie.h index 5258c6f3..e20c0c87 100644 --- a/src/ie.h +++ b/src/ie.h @@ -492,6 +492,8 @@ struct ie_owe_transition_info { uint8_t bssid[6]; uint8_t ssid[32]; size_t ssid_len; + uint8_t oper_class; + uint8_t channel; }; extern const unsigned char ieee_oui[3]; -- 2.31.1

--- .../testOWE-transition/connection_test.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/autotests/testOWE-transition/connection_test.py b/autotests/testOWE-transition/connection_test.py index 7240e3a8..9555766e 100644 --- a/autotests/testOWE-transition/connection_test.py +++ b/autotests/testOWE-transition/connection_test.py @@ -196,6 +196,30 @@ class Test(unittest.TestCase): with self.assertRaises(iwd.NotFoundEx): self.validate(self.wd, self.hapd_owe, connect_hidden=True) + def test_owe_transition_band_info(self): + self.hapd_open.set_value('vendor_elements', 'dd17506f9a1c02000000f1000a6f77652d68696464656e5103') + self.hapd_open.reload() + self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e') + self.hapd_owe.set_value('channel', '3') + self.hapd_owe.reload() + + self.hapd_owe2.disable() + self.hapd_open2.disable() + + self.validate(self.wd, self.hapd_owe) + + def test_owe_transition_wrong_band_info(self): + self.hapd_open.set_value('vendor_elements', 'dd17506f9a1c02000000f1000a6f77652d68696464656e5102') + self.hapd_open.reload() + self.hapd_owe.set_value('vendor_elements', 'dd15506f9a1c02000000f0000a7472616e736974696f6e') + self.hapd_owe.set_value('channel', '3') + self.hapd_owe.reload() + + self.hapd_owe2.disable() + self.hapd_open2.disable() + + self.validate(self.wd, self.hapd_open) + def setUp(self): self.wd = IWD(True) self.hapd_owe = HostapdCLI(config='ssidOWE.conf') @@ -206,6 +230,8 @@ class Test(unittest.TestCase): def tearDown(self): IWD.clear_storage() + self.hapd_owe.set_value('channel', '1') + self.wd = None self.hapd_open = None self.hapd_owe = None -- 2.31.1