From: Jouni Malinen <jouni@codeaurora.org>
Date: Tue, 14 Apr 2020 13:36:07 +0000 (+0300)
Subject: tests: AP may discard FT ReassocReq in ap_ft_sae_h2e_downgrade_attack
X-Git-Tag: hostap_2_10~1466
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2012a26d0f7d1089b17f958bf3dec4cebf014a03;p=thirdparty%2Fhostap.git

tests: AP may discard FT ReassocReq in ap_ft_sae_h2e_downgrade_attack

This is in preparation for a hostapd implementation change on how to
address the unexpected RSNXE Used field value in FTE during FT
reassociation.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---

diff --git a/tests/hwsim/test_ap_ft.py b/tests/hwsim/test_ap_ft.py
index a7a71711a..abc9431e8 100644
--- a/tests/hwsim/test_ap_ft.py
+++ b/tests/hwsim/test_ap_ft.py
@@ -1080,10 +1080,17 @@ def test_ap_ft_sae_h2e_downgrade_attack(dev, apdev):
                   force_initial_conn_to_first_ap=True,
                   return_after_initial=True)
         dev[0].scan_for_bss(hapd1.own_addr(), freq="2412")
-        dev[0].request("ROAM " + hapd1.own_addr())
-        ev = dev[0].wait_event(["CTRL-EVENT-ASSOC-REJECT"], timeout=10)
-        if ev is None:
-            raise Exception("Association not rejected")
+        if "OK" not in dev[0].request("ROAM " + hapd1.own_addr()):
+            raise Exception("ROAM command failed")
+        # The target AP is expected to discard Reassociation Response frame due
+        # to RSNXE Used mismatch. This will result in roaming timeout and
+        # returning back to the old AP.
+        ev = dev[0].wait_event(["CTRL-EVENT-ASSOC-REJECT",
+                                "CTRL-EVENT-CONNECTED"], timeout=10)
+        if ev and "CTRL-EVENT-ASSOC-REJECT" in ev:
+            pass
+        elif ev and hapd1.own_addr() in ev:
+            raise Exception("Roaming succeeded unexpectedly")
     finally:
         dev[0].set("sae_pwe", "0")