Skip to contentSkip to conversation

eapol: relax (but warn) on secure bit check in handshake 1/4

PATCH Applied James Prestwood 2 participants 2 messages Apr 10, 2023 – Apr 16, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eapol: relax (but warn) on secure bit check in handshake 1/4

Hostapd commit bc36991791 now properly sets the secure bit on message 1/4. This was addressed in an earlier IWD commit but neglected to allow for backwards compatibility. The check is fatal which now breaks earlier hostapd version (older than 2.10).

Instead warn on this condition rather than reject the rekey.

Fixes 7fad6590bd ("eapol: allow 'secure' to be set on rekeys")
---
 src/eapol.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
src/eapol.c +1 -2
index 3d7d33e0..9471d13e 100644
@@ -478,8 +478,7 @@ bool eapol_verify_ptk_1_of_4(const struct eapol_key *ek, size_t mic_len,
 	if (ek->key_mic)
 		return false;
 
-	if (ek->secure != ptk_complete)
-		return false;
+	L_WARN_ON(ek->secure != ptk_complete);
 
 	if (ek->encrypted_key_data)
 		return false;
Signature · 1 line
2.25.1
#1 lore raw

Hi James,

Quoted 11 lines · James Prestwood

Hostapd commit bc36991791 now properly sets the secure bit on message 1/4. This was addressed in an earlier IWD commit but neglected to allow for backwards compatibility. The check is fatal which now breaks earlier hostapd version (older than 2.10).

Instead warn on this condition rather than reject the rekey.

Fixes 7fad6590bd ("eapol: allow 'secure' to be set on rekeys")
---
  src/eapol.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)

Applied, thanks.

Regards,
-Denis