diff options
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/git_wpa_sae.patch | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 54 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index a7fcf1a3..12a61cb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.20.4-2ubuntu2) UNRELEASED; urgency=medium + + * debian/patches/git_wpa_sae.patch: + - PMF can be used with SAE, allow it, fixes WPA3 handling + (lp: #1844422) + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 11 Oct 2019 00:06:27 +0200 + network-manager (1.20.4-2ubuntu1) eoan; urgency=medium * New upstream version, merged from Debian diff --git a/debian/patches/git_wpa_sae.patch b/debian/patches/git_wpa_sae.patch new file mode 100644 index 00000000..a951fa64 --- /dev/null +++ b/debian/patches/git_wpa_sae.patch @@ -0,0 +1,45 @@ +From e36c297fd8c6b1b57cd120739cc5ee8eab57aa08 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani <bgalvani@redhat.com> +Date: Wed, 9 Oct 2019 11:55:27 +0200 +Subject: [PATCH] supplicant: allow PMF with SAE + +PMF can be used with SAE, allow it. Actually, it is required according +to WPA3 specifications but there are implementations that don't +require it (hostapd can be configured in a such way); so let's not +make it mandatory for WPA3. + +Fixes: 6640fb4b3615 ('supplicant: add support for SAE key management') + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/257 +--- + src/supplicant/nm-supplicant-config.c | 4 ++-- + src/supplicant/tests/test-supplicant-config.c | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +Index: network-manager-1.20.4/src/supplicant/nm-supplicant-config.c +=================================================================== +--- network-manager-1.20.4.orig/src/supplicant/nm-supplicant-config.c ++++ network-manager-1.20.4/src/supplicant/nm-supplicant-config.c +@@ -881,8 +881,8 @@ nm_supplicant_config_add_setting_wireles + } + } + +- /* Don't try to enable PMF on non-WPA networks */ +- if (!NM_IN_STRSET (key_mgmt, "wpa-eap", "wpa-psk")) ++ /* Don't try to enable PMF on non-WPA/SAE networks */ ++ if (!NM_IN_STRSET (key_mgmt, "wpa-eap", "wpa-psk", "sae")) + pmf = NM_SETTING_WIRELESS_SECURITY_PMF_DISABLE; + + /* Check if we actually support PMF */ +Index: network-manager-1.20.4/src/supplicant/tests/test-supplicant-config.c +=================================================================== +--- network-manager-1.20.4.orig/src/supplicant/tests/test-supplicant-config.c ++++ network-manager-1.20.4/src/supplicant/tests/test-supplicant-config.c +@@ -430,7 +430,6 @@ test_wifi_sae_psk (const char *psk) + NMTST_EXPECT_NM_INFO ("Config: added 'proto' value 'RSN'"); + NMTST_EXPECT_NM_INFO ("Config: added 'pairwise' value 'TKIP CCMP'"); + NMTST_EXPECT_NM_INFO ("Config: added 'group' value 'TKIP CCMP'"); +- NMTST_EXPECT_NM_INFO ("Config: added 'ieee80211w' value '0'"); + config_dict = build_supplicant_config (connection, 1500, 0, TRUE, TRUE); + + g_test_assert_expected_messages (); diff --git a/debian/patches/series b/debian/patches/series index 0a749301..4f246a72 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +git_wpa_sae.patch # Ubuntu patches Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch |