diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:53:57 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:56:18 +0100 |
| commit | 5035d260cb1cde38bfdc732e0d1ff8b3ca78135c (patch) | |
| tree | 1433995e753effc7cfa4f63266691bdc8b5ad6b3 /debian/patches | |
| parent | 21add8edb7927d06f038208fd6271202063d5293 (diff) | |
| parent | 121343423a2e75e15e16988e664a8b32a629f2ba (diff) | |
Merge tag 'debian/1.20.6-1'
network-manager Debian release 1.20.6-1
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/git_wpa_sae.patch | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 46 deletions
diff --git a/debian/patches/git_wpa_sae.patch b/debian/patches/git_wpa_sae.patch deleted file mode 100644 index a951fa64..00000000 --- a/debian/patches/git_wpa_sae.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 4f246a72..0a749301 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 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 |