diff options
| author | David Ng <dave@codeaurora.org> | 2015-12-09 17:28:49 -0800 |
|---|---|---|
| committer | David Ng <dave@codeaurora.org> | 2015-12-09 17:28:49 -0800 |
| commit | 1a0fa705d4ab3bd90f108fe0127fb9dc7c94e396 (patch) | |
| tree | 1766d3c37f75509ec3d22665ed5722791041078d /src | |
| parent | bfadd9cfca790035c20eebad16fc1200221c1066 (diff) | |
| parent | 6ec3038c3538e97f079e67e46453d969af30d12c (diff) | |
| download | android_external_wpa_supplicant_8-1a0fa705d4ab3bd90f108fe0127fb9dc7c94e396.tar.gz android_external_wpa_supplicant_8-1a0fa705d4ab3bd90f108fe0127fb9dc7c94e396.tar.bz2 android_external_wpa_supplicant_8-1a0fa705d4ab3bd90f108fe0127fb9dc7c94e396.zip | |
Merge tag 'android-6.0.1_r3' into 601r3
Android 6.0.1 release 3
* tag 'android-6.0.1_r3':
RSN: Stop connection attempt on apparent PMK mismatch
Throttle control interface event message bursts
Add wpa_supplicant EVENT_TEST control interface command
hostapd: Global control interface notifications
Add debug prints for wpa_supplicant ctrl_iface socket send operations
Update AP WPA/RSN IE on all associations if driver can select BSS
Conflicts:
wpa_supplicant/ctrl_iface_unix.c
Change-Id: I8c5a51afff761112ba36ae21b94fd21f07d4c18a
Diffstat (limited to 'src')
| -rw-r--r-- | src/rsn_supp/wpa.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c index 38cbce63..2d4d8b80 100644 --- a/src/rsn_supp/wpa.c +++ b/src/rsn_supp/wpa.c @@ -249,6 +249,17 @@ static int wpa_supplicant_get_pmk(struct wpa_sm *sm, "RSN: the new PMK matches with the " "PMKID"); abort_cached = 0; + } else if (sa && !sm->cur_pmksa && pmkid) { + /* + * It looks like the authentication server + * derived mismatching MSK. This should not + * really happen, but bugs happen.. There is not + * much we can do here without knowing what + * exactly caused the server to misbehave. + */ + wpa_dbg(sm->ctx->msg_ctx, MSG_INFO, + "RSN: PMKID mismatch - authentication server may have derived different MSK?!"); + return -1; } if (!sm->cur_pmksa) |