summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2019-06-12 12:19:54 -0400
committerHerbert Xu <herbert@gondor.apana.org.au>2019-06-20 02:18:33 -0400
commit5fdb373570b2119abf00d909a277ebf4ea2c078f (patch)
treee3a3bef624eb183fdd36631f23a2ba2139436796 /net/mac80211/mlme.c
parentdc51f25752bfcb5f1edbac1ca4ce16af7b3bd507 (diff)
net/mac80211: move WEP handling to ARC4 library interface
The WEP code in the mac80211 subsystem currently uses the crypto API to access the arc4 (RC4) cipher, which is overly complicated, and doesn't really have an upside in this particular case, since ciphers are always synchronous and therefore always implemented in software. Given that we have no accelerated software implementations either, it is much more straightforward to invoke a generic library interface directly. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index b7a9fe3d5fcb..048a07b101b4 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -15,6 +15,7 @@
15 */ 15 */
16 16
17#include <linux/delay.h> 17#include <linux/delay.h>
18#include <linux/fips.h>
18#include <linux/if_ether.h> 19#include <linux/if_ether.h>
19#include <linux/skbuff.h> 20#include <linux/skbuff.h>
20#include <linux/if_arp.h> 21#include <linux/if_arp.h>
@@ -5038,7 +5039,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
5038 auth_alg = WLAN_AUTH_OPEN; 5039 auth_alg = WLAN_AUTH_OPEN;
5039 break; 5040 break;
5040 case NL80211_AUTHTYPE_SHARED_KEY: 5041 case NL80211_AUTHTYPE_SHARED_KEY:
5041 if (IS_ERR(local->wep_tx_tfm)) 5042 if (fips_enabled)
5042 return -EOPNOTSUPP; 5043 return -EOPNOTSUPP;
5043 auth_alg = WLAN_AUTH_SHARED_KEY; 5044 auth_alg = WLAN_AUTH_SHARED_KEY;
5044 break; 5045 break;