From bf9f49396b49424357e02ead25b6fc9e81852085 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 3 Apr 2020 12:18:11 +0300 Subject: [PATCH] OWE: Remove check for unexpected DH Parameter IE use with other AKMs While the Diffie-Hellman Parameter element is defined in RFC 8110 explicitly for use witht he OWE AKM, it has now been proposed to be used with another AKM (DPP). Should any other AKM be extended in similar manner in the future, the check against unexpected use could result in additional interoperability issues. Remove that and instead, ignore the unexpected Diffie-Hellman Parameter element if it is included in (Re)Association Request frame when any other AKM is negotiated. Signed-off-by: Jouni Malinen --- src/ap/wpa_auth_ie.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/ap/wpa_auth_ie.c b/src/ap/wpa_auth_ie.c index 2ac1df47e..9bcb997a1 100644 --- a/src/ap/wpa_auth_ie.c +++ b/src/ap/wpa_auth_ie.c @@ -851,17 +851,6 @@ wpa_validate_wpa_ie(struct wpa_authenticator *wpa_auth, "OWE: No Diffie-Hellman Parameter element"); return WPA_INVALID_AKMP; } -#ifdef CONFIG_DPP - if (sm->wpa_key_mgmt == WPA_KEY_MGMT_DPP && owe_dh) { - /* Diffie-Hellman Parameter element can be used with DPP as - * well, so allow this to proceed. */ - } else -#endif /* CONFIG_DPP */ - if (sm->wpa_key_mgmt != WPA_KEY_MGMT_OWE && owe_dh) { - wpa_printf(MSG_DEBUG, - "OWE: Unexpected Diffie-Hellman Parameter element with non-OWE AKM"); - return WPA_INVALID_AKMP; - } #endif /* CONFIG_OWE */ #ifdef CONFIG_DPP2