aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2014-11-17 22:53:11 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 22:53:11 +0000
commitfee0f928f4b3d742a55836f46fbbdf9e43535450 (patch)
tree51b8cdb26d9de74c258b2e125a160e7f09e87a6a /src
parent2e425d69801667e42b4874548f2a49dc16e95617 (diff)
parent658fb4adb9458c3055c64a43833f1a9e89b4db74 (diff)
downloadandroid_external_wpa_supplicant_8-fee0f928f4b3d742a55836f46fbbdf9e43535450.tar.gz
android_external_wpa_supplicant_8-fee0f928f4b3d742a55836f46fbbdf9e43535450.tar.bz2
android_external_wpa_supplicant_8-fee0f928f4b3d742a55836f46fbbdf9e43535450.zip
am 658fb4ad: Work around AP misbehavior on EAPOL-Key descriptor version
* commit '658fb4adb9458c3055c64a43833f1a9e89b4db74': Work around AP misbehavior on EAPOL-Key descriptor version
Diffstat (limited to 'src')
-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 b17fc88b..8f561b9a 100644
--- a/src/rsn_supp/wpa.c
+++ b/src/rsn_supp/wpa.c
@@ -1737,6 +1737,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 &&