diff options
| author | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-01-13 10:34:43 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2020-01-13 10:35:27 +0100 |
| commit | 91bdd255821dfc003fd43dc2223798530beef9d2 (patch) | |
| tree | 507117ebaee709608a3300e480d378c728d6f145 | |
| parent | 94679242321ba280860b4dd11aa4672644c5acd5 (diff) | |
Apply an upstream patch
- wpa_supplicant: Do not try to detect PSK mismatch during PTK rekeying
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | debian/patches/upstream-fixes/0001-wpa_supplicant-Do-not-try-to-detect-PSK-mismatch-dur.patch | 28 |
2 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 2006484..5058973 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ networkd-driver-fallback.patch wpa_supplicant_fix-dependency-odering-when-invoked-with-dbus.patch allow-tlsv1.patch 2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch +upstream-fixes/0001-wpa_supplicant-Do-not-try-to-detect-PSK-mismatch-dur.patch diff --git a/debian/patches/upstream-fixes/0001-wpa_supplicant-Do-not-try-to-detect-PSK-mismatch-dur.patch b/debian/patches/upstream-fixes/0001-wpa_supplicant-Do-not-try-to-detect-PSK-mismatch-dur.patch new file mode 100644 index 0000000..da07f76 --- /dev/null +++ b/debian/patches/upstream-fixes/0001-wpa_supplicant-Do-not-try-to-detect-PSK-mismatch-dur.patch @@ -0,0 +1,28 @@ +From 84877f253d3dfff2ba70e8226b622ba2d088b054 Mon Sep 17 00:00:00 2001 +From: Alexander Wetzel <alexander@wetzel-home.de> +Date: Fri, 20 Dec 2019 20:21:26 +0100 +Subject: [PATCH] wpa_supplicant: Do not try to detect PSK mismatch during PTK + rekeying + +When a PTK rekey fails it can't be caused by a PSK mismatch. Report a +possible PSK mismatch only during the initial 4-way handshake to avoid +incorrect reports. + +Signed-off-by: Alexander Wetzel <alexander@wetzel-home.de> +--- + wpa_supplicant/events.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -2999,8 +2999,9 @@ static int could_be_psk_mismatch(struct wpa_supplicant *wpa_s, u16 reason_code, + int locally_generated) + { + if (wpa_s->wpa_state != WPA_4WAY_HANDSHAKE || ++ !wpa_s->new_connection || + !wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) +- return 0; /* Not in 4-way handshake with PSK */ ++ return 0; /* Not in initial 4-way handshake with PSK */ + + /* + * It looks like connection was lost while trying to go through PSK |