Skip to content

fix(nmrs): allow NetworkManager to negotiate best protocol and cipher #271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cachebag merged 2 commits into from
Mar 4, 2026
Merged

fix(nmrs): allow NetworkManager to negotiate best protocol and cipher #271

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6a7668
fix(#270): let NM negotiate best protocol and cipher
cachebag Mar 4, 2026
133a18a
tests(#270): assert `proto/pairwise/group` are not present
cachebag Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions nmrs/src/api/builders/wifi_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ impl WifiConnectionBuilder {

/// Configures WPA-PSK (Personal) security with the given passphrase.
///
/// Uses WPA2 (RSN) with CCMP encryption.
/// Lets NetworkManager negotiate the best protocol (WPA/WPA2/WPA3)
/// and cipher (TKIP/CCMP) with the access point, supporting mixed-mode
/// routers that advertise both WPA and WPA2.
#[must_use]
pub fn wpa_psk(mut self, psk: impl Into<String>) -> Self {
let mut security = HashMap::new();
Expand All @@ -161,11 +163,6 @@ impl WifiConnectionBuilder {
security.insert("psk-flags", Value::from(0u32));
security.insert("auth-alg", Value::from("open"));

// Enforce WPA2 with AES
security.insert("proto", Self::string_array(&["rsn"]));
security.insert("pairwise", Self::string_array(&["ccmp"]));
security.insert("group", Self::string_array(&["ccmp"]));

self.inner = self
.inner
.with_section("802-11-wireless-security", security);
Expand Down Expand Up @@ -420,6 +417,12 @@ mod tests {
Some(&Value::from("password123".to_string()))
);

// proto/pairwise/group must not be set so NetworkManager can
// negotiate with mixed-mode (WPA1+WPA2) access points.
assert!(security.get("proto").is_none());
assert!(security.get("pairwise").is_none());
assert!(security.get("group").is_none());

let wireless = settings.get("802-11-wireless").unwrap();
assert_eq!(
wireless.get("security"),
Expand Down
Loading