aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-11-20 06:10:48 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2014-11-20 06:10:48 -0800
commitebed7570eb40aa0279df25af25b1b75c711b7ef5 (patch)
tree4456bf7c4ad132756e3c677afca7a5f7c318b8bd
parentf8341077df129cee1d9305d0acfdccbc239de240 (diff)
parentacc9f5bc1a3e687fa95a6cc8b1908faf5b6197f0 (diff)
downloadandroid_external_wpa_supplicant_8-ebed7570eb40aa0279df25af25b1b75c711b7ef5.tar.gz
android_external_wpa_supplicant_8-ebed7570eb40aa0279df25af25b1b75c711b7ef5.tar.bz2
android_external_wpa_supplicant_8-ebed7570eb40aa0279df25af25b1b75c711b7ef5.zip
Merge "Work around AP misbehavior on EAPOL-Key descriptor version"
-rw-r--r--src/rsn_supp/wpa.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c
index 7e095751..56718b1b 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -1752,6 +1752,9 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, const u8 *src_addr,
wpa_msg(sm->ctx->msg_ctx, MSG_INFO,
"WPA: Backwards compatibility: allow invalid "
"version for non-CCMP group keys");
+ } else if (ver == WPA_KEY_INFO_TYPE_AES_128_CMAC) {
+ wpa_msg(sm->ctx->msg_ctx, MSG_INFO,
+ "WPA: Interoperability workaround: allow incorrect (should have been HMAC-SHA1), but stronger (is AES-128-CMAC), descriptor version to be used");
} else
goto out;
} else if (sm->pairwise_cipher == WPA_CIPHER_GCMP &&