From 717574375e969e8272c6d1a26137286eac158abb Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Mon, 2 Jun 2014 13:50:35 -0700 Subject: Cumulative patch from commit 801e117376e13d5b3c50f1627b93a949529fdf99 801e117 Fix validation of RSN EAPOL-Key version for GCMP with PMF 3d4d234 FT: Fix GTK rekeying after FT protocol d3d0483 nl80211: Work around error case prints for nl_recvmsgs on Android 8a387a2 P2P NFC: Fix use of freed memory df48efc Fix external radio work stopping to not read freed memory 13c3303 SAE: Fix memory leak in random number generation d92bdf9 hostapd: Make sure hapd->drv_priv gets cleared on driver deinit 438e133 hostapd: Use helper function to avoid duplicate deinit calls ac1a224 hostapd: Clean up if interface setup fails 81c4fca hostapd: Reset hapd->interface_add properly 3fbd036 hostapd: Prevent double interface disabling from segfaulting ea39367 nl80211: Fix wpa_driver_nl80211_if_add() failure paths b77aeae Interworking: Re-trigger scan if no connect attempt is done b523973 RADIUS client: Trigger failover more quickly if socket is not valid 09844c0 RADIUS client: Do not flush pending messages if server did not change 5d67bf1 hostapd: Fix configuration of multiple RADIUS servers with SET 70d4084 RADIUS client: Fix socket close/re-open on server change d045cc8 RADIUS client: Fix crash issue in radius_client_timer() c1fb75a RADIUS client: Handle ENETUNREACH similarly to other failure cases 9ed4076 RADIUS client: Do not try to send message without socket cc0b7cb hostapd_cli: Fix segmentation fault with interface command 114153b P2P: Debug print channel lists for invitation processing 4eb3b76 OpenSSL: Fix OCSP certificate debug print to use wpa_printf f6fb192 HS 2.0R2: Fix subscr_remediation_method for RADIUS server 74879f3 Remove extra newline from a debug print Change-Id: I82d4f00501fabb8b325e4461178b45e7b2c0178e Signed-off-by: Dmitry Shmidt --- src/rsn_supp/wpa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/rsn_supp') diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index d45f5dc1..ba2a8c87 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -1734,9 +1734,8 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, const u8 *src_addr, "version for non-CCMP group keys"); } else goto out; - } - if (sm->pairwise_cipher == WPA_CIPHER_GCMP && - ver != WPA_KEY_INFO_TYPE_HMAC_SHA1_AES) { + } else if (sm->pairwise_cipher == WPA_CIPHER_GCMP && + ver != WPA_KEY_INFO_TYPE_HMAC_SHA1_AES) { wpa_msg(sm->ctx->msg_ctx, MSG_INFO, "WPA: GCMP is used, but EAPOL-Key " "descriptor version (%d) is not 2", ver); -- cgit v1.2.3