From d1ede57e46f7130dcde1164360da141bc75b2847 Mon Sep 17 00:00:00 2001 From: Clemens Famulla-Conrad Date: Wed, 25 Sep 2024 15:58:32 +0200 Subject: [PATCH 1/2] fix: rename wpa-eap-suite-b192 in wpa-eap-suite-b-192 --- rust/agama-lib/share/profile.schema.json | 2 +- rust/agama-lib/src/network/proxies.rs | 2 +- rust/agama-server/src/network/model.rs | 6 +++--- rust/agama-server/src/network/nm/model.rs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rust/agama-lib/share/profile.schema.json b/rust/agama-lib/share/profile.schema.json index b3d75975be..ffc5970f6f 100644 --- a/rust/agama-lib/share/profile.schema.json +++ b/rust/agama-lib/share/profile.schema.json @@ -152,7 +152,7 @@ "wpa-psk", "sae", "wpa-eap", - "wpa-eap-suite-b192" + "wpa-eap-suite-b-192" ] }, "ssid": { diff --git a/rust/agama-lib/src/network/proxies.rs b/rust/agama-lib/src/network/proxies.rs index f02cf5e111..a12007ae9b 100644 --- a/rust/agama-lib/src/network/proxies.rs +++ b/rust/agama-lib/src/network/proxies.rs @@ -108,7 +108,7 @@ trait Wireless { /// Wireless Security property /// /// Possible values are 'none', 'owe', 'ieee8021x', 'wpa-psk', 'sae', - /// 'wpa-eap', 'wpa-eap-suite-b192' + /// 'wpa-eap', 'wpa-eap-suite-b-192' #[dbus_proxy(property)] fn security(&self) -> zbus::Result; #[dbus_proxy(property)] diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs index 7fc3b8eb92..14518cb45c 100644 --- a/rust/agama-server/src/network/model.rs +++ b/rust/agama-server/src/network/model.rs @@ -1169,7 +1169,7 @@ pub enum SecurityProtocol { WPA2, // WPA2 + WPA3 personal ("wpa-psk") WPA3Personal, // WPA3 personal only ("sae") WPA2Enterprise, // WPA2 + WPA3 Enterprise ("wpa-eap") - WPA3Only, // WPA3 only ("wpa-eap-suite-b192") + WPA3Only, // WPA3 only ("wpa-eap-suite-b-192") } impl fmt::Display for SecurityProtocol { @@ -1181,7 +1181,7 @@ impl fmt::Display for SecurityProtocol { SecurityProtocol::WPA2 => "wpa-psk", SecurityProtocol::WPA3Personal => "sae", SecurityProtocol::WPA2Enterprise => "wpa-eap", - SecurityProtocol::WPA3Only => "wpa-eap-suite-b192", + SecurityProtocol::WPA3Only => "wpa-eap-suite-b-192", }; write!(f, "{}", value) } @@ -1198,7 +1198,7 @@ impl TryFrom<&str> for SecurityProtocol { "wpa-psk" => Ok(SecurityProtocol::WPA2), "sae" => Ok(SecurityProtocol::WPA3Personal), "wpa-eap" => Ok(SecurityProtocol::WPA2Enterprise), - "wpa-eap-suite-b192" => Ok(SecurityProtocol::WPA3Only), + "wpa-eap-suite-b-192" => Ok(SecurityProtocol::WPA3Only), _ => Err(NetworkStateError::InvalidSecurityProtocol( value.to_string(), )), diff --git a/rust/agama-server/src/network/nm/model.rs b/rust/agama-server/src/network/nm/model.rs index 8869f49a4d..9a71dc2c56 100644 --- a/rust/agama-server/src/network/nm/model.rs +++ b/rust/agama-server/src/network/nm/model.rs @@ -140,7 +140,7 @@ impl TryFrom for SecurityProtocol { "wpa-psk" => Ok(SecurityProtocol::WPA2), "wpa-eap" => Ok(SecurityProtocol::WPA3Personal), "sae" => Ok(SecurityProtocol::WPA2Enterprise), - "wpa-eap-suite-b192" => Ok(SecurityProtocol::WPA2Enterprise), + "wpa-eap-suite-b-192" => Ok(SecurityProtocol::WPA2Enterprise), "none" => Ok(SecurityProtocol::WEP), _ => Err(NmError::UnsupportedSecurityProtocol(value.to_string())), } From 220b386c33d9ec0f18c11f8b95bef8a5411690a0 Mon Sep 17 00:00:00 2001 From: Clemens Famulla-Conrad Date: Wed, 25 Sep 2024 16:38:13 +0200 Subject: [PATCH 2/2] changelog: rename to wpa-eap-suite-b-192 --- rust/package/agama.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rust/package/agama.changes b/rust/package/agama.changes index 3f4c7d14a0..4541f3dcde 100644 --- a/rust/package/agama.changes +++ b/rust/package/agama.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 25 14:33:50 UTC 2024 - Clemens Famulla-Conrad + +- Rename wireless key-mgmt value wpa-eap-suite-b192 to + wpa-eap-suite-b-192 (gh#agama-project/agama#1640) + ------------------------------------------------------------------- Fri Sep 20 11:42:06 UTC 2024 - Imobach Gonzalez Sosa