From 07d3c1177bbb44fbcc3fe12cf1e8bfa50aa5fd19 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <quic_jouni@quicinc.com>
Date: Tue, 22 Aug 2023 19:46:44 +0300
Subject: [PATCH] tests: Make sae_proto_hostapd_status_* more robust

The first MGMT-TX-STATUS event might be for the initial broadcast
Deauthentication frame instead of the SAE Authentication frame. Skip the
first event and try to process TX status for the first Authentication
frame instead.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
---
 tests/hwsim/test_sae.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/hwsim/test_sae.py b/tests/hwsim/test_sae.py
index ff58598b0..97361d806 100644
--- a/tests/hwsim/test_sae.py
+++ b/tests/hwsim/test_sae.py
@@ -1226,8 +1226,13 @@ def check_commit_status(hapd, use_status, expect_status):
     element_x = "559cb8928db4ce4e3cbd6555e837591995e5ebe503ef36b503d9ca519d63728d"
     element_y = "d3c7c676b8e8081831b6bc3a64bdf136061a7de175e17d1965bfa41983ed02f8"
     status = binascii.hexlify(struct.pack('<H', use_status)).decode()
+    hapd.dump_monitor()
     hapd.request("MGMT_RX_PROCESS freq=2412 datarate=0 ssi_signal=-30 frame=" + hdr + "03000100" + status + group + scalar + element_x + element_y)
     ev = hapd.wait_event(["MGMT-TX-STATUS"], timeout=5)
+    if ev:
+        msg = ev.split(' ')[3].split('=')[1]
+        if not msg.startswith("b0"):
+            ev = hapd.wait_event(["MGMT-TX-STATUS"], timeout=5)
     if ev is None:
         raise Exception("MGMT-TX-STATUS not seen")
     msg = ev.split(' ')[3].split('=')[1]