network: add support for SAE password identifiers
PATCH v2 1/4 network: add support for SAE password identifiers
Adds a new network profile setting [Security].PasswordIdentifier. When set (and the BSS enables SAE password identifiers) the network and handshake object will read this and use it for the SAE exchange.
Loading the PSK will fail if there is no password identifier set and the BSS sets the "exclusive" bit. If a password identifier is set and the BSS doesn't indicate support the setting will be ignored (with a debug print).
--- src/network.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
src/network.c +48 -1
@@ -70,6 +70,7 @@ struct network {struct network_info *info;unsigned char *psk;char *passphrase; +char *password_identifier;struct l_ecc_point *sae_pt_19;/* SAE PT for Group 19 */ struct l_ecc_point *sae_pt_20;/* SAE PT for Group 20 */ unsigned int agent_request;
@@ -124,6 +125,13 @@ static void network_reset_passphrase(struct network *network) network->passphrase =NULL ; } +if (network->password_identifier) { +explicit_bzero (network->password_identifier, +strlen (network->password_identifier)); +l_free (network->password_identifier); + network->password_identifier =NULL ; + } +if (network->sae_pt_19) {l_ecc_point_free (network->sae_pt_19); network->sae_pt_19 =NULL ;
@@ -317,7 +325,8 @@ static struct l_ecc_point *network_generate_sae_pt(struct network *network,l_debug ("Generating PT for Group %u" , group); pt =crypto_derive_sae_pt_ecc (group, network->ssid, - network->passphrase,NULL ); + network->passphrase, + network->password_identifier);if (!pt)l_warn ("SAE PT generation for Group %u failed" , group);
@@ -462,6 +471,10 @@ static int network_set_handshake_secrets_psk(struct network *network,handshake_state_set_passphrase (hs, network->passphrase); +if (network->password_identifier) +handshake_state_set_password_identifier (hs, + network->password_identifier); +if (ie_rsnxe_capable (hs->authenticator_rsnxe,IE_RSNX_SAE_H2E )) {l_debug ("Authenticator is SAE H2E capable" );
@@ -631,6 +644,9 @@ static int network_load_psk(struct network *network, struct scan_bss *bss) _auto_(l_free) char *passphrase =l_settings_get_string (network->settings,"Security" ,"Passphrase" ); + _auto_(l_free) char *password_id = +l_settings_get_string (network->settings,"Security" , +"PasswordIdentifier" ); _auto_(l_free) char *path =storage_get_network_file_path (security, ssid);
@@ -641,6 +657,31 @@ static int network_load_psk(struct network *network, struct scan_bss *bss) psk_len =0 ; } +if (is_sae) { +/* +* Fail if: +* - the BSS exclusively uses password IDs and the profile +* does not have one set. +* - the BSS does not use password IDs and the profile has +* one set. +* +* In theory you could have a network with a mix of BSS's that +* use IDs and those that don't, but this is a strange +* configuration (arguably broken). +*/ +if (bss->sae_pw_id_exclusive && !password_id) { +l_error ("[Security].PasswordIdentifier is not set but " +"BSS requires SAE password identifiers" ); +return -ENOKEY ; + } + +if (!bss->sae_pw_id_used && password_id) { +l_debug ("[Security].PasswordIdentifier set but BSS " +"does not not use password identifiers" ); +return -ENOKEY ; + } + } +/* PSK can be generated from the passphrase but not the other way */ if (!psk || is_sae) {if (!passphrase)
@@ -655,6 +696,7 @@ static int network_load_psk(struct network *network, struct scan_bss *bss)network_reset_passphrase (network);network_reset_psk (network); network->passphrase =l_steal_ptr (passphrase); + network->password_identifier =l_steal_ptr (password_id);if (network_settings_load_pt_ecc (network, path,19 , &network->sae_pt_19) >0 )
@@ -726,6 +768,11 @@ static void network_settings_save(struct network *network,l_settings_set_string (settings,"Security" ,"Passphrase" , network->passphrase); +if (network->password_identifier) +l_settings_set_string (settings,"Security" , +"PasswordIdentifier" , + network->password_identifier); +if (network->sae_pt_19)network_settings_save_sae_pt_ecc (settings, network->sae_pt_19);
Signature · 1 line
2.34.1
PATCH v2 2/4 doc: document [Security].PasswordIdentifier
--- src/iwd.network.rst | 6 ++++++ 1 file changed, 6 insertions(+)
src/iwd.network.rst +6 -0
@@ -199,6 +199,12 @@ connect to that network. required if the *PreSharedKey* is not provided. If not provided in settings, the agent will be asked for the passphrase at connection time. + * - PasswordIdentifier + - string + + An identifer string to be used with the passphrase. This is used for + WPA3-Personal (SAE) networks if the security has enabled password + identifiers for clients. * - PreSharedKey - 64 character hex string
Signature · 1 line
2.34.1
PATCH v2 3/4 auto-t: add H2E password identifier test
In reply to James PrestwoodIn order to support identifiers the test profiles needed to be reworked due to hostapd allowing multiple password entires. You cannot just call set_value() with a new entry as the old ones still exist. Instead use a unique password for the identifier and non-identifier use cases.
After adding this test the failure_test started failing due to hostapd not starting up. This was due to the group being unsupported but oddly only when hostapd was reloaded (running the test individually worked). To fix this the group number was changed to 21 which hostapd does support but IWD does not.
---
autotests/testSAE/autoconnect_test.py | 20 +++++++++++++------
autotests/testSAE/failure_test.py | 2 +-
autotests/testSAE/ssidSAE.conf | 3 ++-
.../{ssidSAE.psk => ssidSAE.psk.default} | 0
autotests/testSAE/ssidSAE.psk.identifier | 3 +++
5 files changed, 20 insertions(+), 8 deletions(-)
rename autotests/testSAE/{ssidSAE.psk => ssidSAE.psk.default} (100%)
create mode 100644 autotests/testSAE/ssidSAE.psk.identifierautotests/testSAE/autoconnect_test.py +14 -6
@@ -35,12 +35,23 @@ class Test(unittest.TestCase): wd.wait_for_object_condition(ordered_network.network_object, condition) def test_SAE(self): + IWD.copy_to_storage("ssidSAE.psk.default", name="ssidSAE.psk") self.hostapd.wait_for_event("AP-ENABLED") wd = IWD(True) self.validate_connection(wd) def test_SAE_H2E(self): + IWD.copy_to_storage("ssidSAE.psk.default", name="ssidSAE.psk") + self.hostapd.set_value('sae_pwe', '1') + self.hostapd.set_value('sae_groups', '20') + self.hostapd.reload() + self.hostapd.wait_for_event("AP-ENABLED") + wd = IWD(True) + self.validate_connection(wd) + + def test_SAE_H2E_password_identifier(self): + IWD.copy_to_storage("ssidSAE.psk.identifier", name="ssidSAE.psk") self.hostapd.set_value('sae_pwe', '1') self.hostapd.set_value('sae_groups', '20') self.hostapd.reload()
@@ -51,15 +62,12 @@ class Test(unittest.TestCase): def setUp(self): self.hostapd.default() + def tearDown(self): + IWD.clear_storage() + @classmethod def setUpClass(cls): cls.hostapd = HostapdCLI(config='ssidSAE.conf') - IWD.copy_to_storage('ssidSAE.psk') - pass - - @classmethod - def tearDownClass(cls): - IWD.clear_storage() if __name__ == '__main__': unittest.main(exit=True)
autotests/testSAE/failure_test.py +1 -1
@@ -37,7 +37,7 @@ class Test(unittest.TestCase): self.validate_connection(wd, 'InvalidSecret') def test_no_supported_groups(self): - self.hostapd.set_value('sae_groups', '1') + self.hostapd.set_value('sae_groups', '21') self.hostapd.reload() wd = IWD(True)
autotests/testSAE/ssidSAE.conf +2 -1
@@ -5,7 +5,8 @@ ssid=ssidSAE wpa=2 wpa_key_mgmt=SAE wpa_pairwise=CCMP -sae_password=secret123|mac=ff:ff:ff:ff:ff:ff +sae_password=secret123 +sae_password=withidentifier|id=myidentifier sae_groups=19 ieee80211w=2 sae_pwe=0
autotests/testSAE/ssidSAE.psk.default renamed from autotests/testSAE/ssidSAE.psk +0 -0
autotests/testSAE/ssidSAE.psk.identifier new file +3 -0
@@ -0,0 +1,3 @@ +[Security] +Passphrase=withidentifier +PasswordIdentifier=myidentifier
Signature · 1 line
2.34.1
PATCH v2 4/4 auto-t: throw exception if executable is missing
In reply to James PrestwoodCertain tests may require external processes to work (e.g. testNetconfig) and if missing the test will just hang until the maximum test timeout. Check in start_process if the exe actually exists and if not throw an exception.
--- tools/utils.py | 3 +++ 1 file changed, 3 insertions(+)
tools/utils.py +3 -0
@@ -34,6 +34,9 @@ class Process(subprocess.Popen): logfile = args[0] + if not shutil.which(args[0]): + raise Exception("%s is not found on system" % args[0]) + if Process.is_verbose(args[0], log=False): self.verbose = True
Signature · 1 line
2.34.1