| Message ID | 1250153731-17208-1-git-send-email-yi.zhu@intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index d03e9da..f1f929a 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1116,7 +1116,8 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, EAPOL_FLAG_REQUIRE_KEY_BROADCAST)) == 0 && !wep_keys_set) { use_crypt = 0; - } else { + } else if (cipher_pairwise == WPA_CIPHER_NONE && + cipher_group == WPA_CIPHER_NONE) { /* Assume that dynamic WEP-104 keys will be used and * set cipher suites in order for drivers to expect * encryption. */
We set the cipher_pairwise and cipher_group to WEP104 only if they are not set already. Otherwise WEP40 has no way to be configured. This problem is found on 802.1X with static WEP. Signed-off-by: Zhu Yi <yi.zhu@intel.com> --- wpa_supplicant/wpa_supplicant.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)