Commit 5fdb3735 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

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: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent dc51f257

net/mac80211/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ config MAC80211 
	tristate "Generic IEEE 802.11 Networking Stack (mac80211)"

	depends on CFG80211

	select CRYPTO

	select CRYPTO_ARC4

	select CRYPTO_LIB_ARC4

	select CRYPTO_AES

	select CRYPTO_CCM

	select CRYPTO_GCM

net/mac80211/cfg.c

+2 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/slab.h>

#include <net/net_namespace.h>

#include <linux/rcupdate.h>

#include <linux/fips.h>

#include <linux/if_ether.h>

#include <net/cfg80211.h>

#include "ieee80211_i.h"
@@ -403,9 +404,8 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	case WLAN_CIPHER_SUITE_WEP40:

	case WLAN_CIPHER_SUITE_TKIP:

	case WLAN_CIPHER_SUITE_WEP104:

		if (IS_ERR(local->wep_tx_tfm))

		if (WARN_ON_ONCE(fips_enabled))

			return -EINVAL;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

	case WLAN_CIPHER_SUITE_CCMP_256:

	case WLAN_CIPHER_SUITE_AES_CMAC:

net/mac80211/ieee80211_i.h

+2 −2
Original line number Diff line number Diff line
@@ -1258,8 +1258,8 @@ struct ieee80211_local { 


	struct rate_control_ref *rate_ctrl;



	struct crypto_cipher *wep_tx_tfm;

	struct crypto_cipher *wep_rx_tfm;

	struct arc4_ctx wep_tx_ctx;

	struct arc4_ctx wep_rx_ctx;

	u32 wep_iv;



	/* see iface.c */

net/mac80211/key.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/list.h>

#include <linux/crypto.h>

#include <linux/rcupdate.h>

#include <crypto/arc4.h>

#include <net/mac80211.h>



#define NUM_DEFAULT_KEYS 4

net/mac80211/main.c

+2 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <net/mac80211.h>

#include <linux/module.h>

#include <linux/fips.h>

#include <linux/init.h>

#include <linux/netdevice.h>

#include <linux/types.h>
@@ -733,8 +734,7 @@ EXPORT_SYMBOL(ieee80211_alloc_hw_nm); 


static int ieee80211_init_cipher_suites(struct ieee80211_local *local)

{

	bool have_wep = !(IS_ERR(local->wep_tx_tfm) ||

			  IS_ERR(local->wep_rx_tfm));

	bool have_wep = !fips_enabled; /* FIPS does not permit the use of RC4 */

	bool have_mfp = ieee80211_hw_check(&local->hw, MFP_CAPABLE);

	int n_suites = 0, r = 0, w = 0;

	u32 *suites;
@@ -1301,7 +1301,6 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) 
 fail_rate:

	rtnl_unlock();

	ieee80211_led_exit(local);

	ieee80211_wep_free(local);

 fail_flows:

	destroy_workqueue(local->workqueue);

 fail_workqueue:
@@ -1358,7 +1357,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw) 


	destroy_workqueue(local->workqueue);

	wiphy_unregister(local->hw.wiphy);

	ieee80211_wep_free(local);

	ieee80211_led_exit(local);

	kfree(local->int_scan_req);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE