Commit 23a5f0af authored by Johannes Berg's avatar Johannes Berg
Browse files

wifi: mac80211: remove cipher scheme support 



The only driver using this was iwlwifi, where we just removed
the support because it was never really used. Remove the code
from mac80211 as well.

Change-Id: I1667417a5932315ee9d81f5c233c56a354923f09
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 17472bc2

include/net/mac80211.h

+0 −35
Original line number Diff line number Diff line
@@ -1958,36 +1958,6 @@ struct ieee80211_key_seq { 
	};

};



/**

 * struct ieee80211_cipher_scheme - cipher scheme

 *

 * This structure contains a cipher scheme information defining

 * the secure packet crypto handling.

 *

 * @cipher: a cipher suite selector

 * @iftype: a cipher iftype bit mask indicating an allowed cipher usage

 * @hdr_len: a length of a security header used the cipher

 * @pn_len: a length of a packet number in the security header

 * @pn_off: an offset of pn from the beginning of the security header

 * @key_idx_off: an offset of key index byte in the security header

 * @key_idx_mask: a bit mask of key_idx bits

 * @key_idx_shift: a bit shift needed to get key_idx

 *     key_idx value calculation:

 *      (sec_header_base[key_idx_off] & key_idx_mask) >> key_idx_shift

 * @mic_len: a mic length in bytes

 */

struct ieee80211_cipher_scheme {

	u32 cipher;

	u16 iftype;

	u8 hdr_len;

	u8 pn_len;

	u8 pn_off;

	u8 key_idx_off;

	u8 key_idx_mask;

	u8 key_idx_shift;

	u8 mic_len;

};



/**

 * enum set_key_cmd - key command

 *
@@ -2664,9 +2634,6 @@ enum ieee80211_hw_flags { 
 *	deliver to a WMM STA during any Service Period triggered by the WMM STA.

 *	Use IEEE80211_WMM_IE_STA_QOSINFO_SP_* for correct values.

 *

 * @n_cipher_schemes: a size of an array of cipher schemes definitions.

 * @cipher_schemes: a pointer to an array of cipher scheme definitions

 *	supported by HW.

 * @max_nan_de_entries: maximum number of NAN DE functions supported by the

 *	device.

 *
@@ -2716,8 +2683,6 @@ struct ieee80211_hw { 
	netdev_features_t netdev_features;

	u8 uapsd_queues;

	u8 uapsd_max_sp_len;

	u8 n_cipher_schemes;

	const struct ieee80211_cipher_scheme *cipher_schemes;

	u8 max_nan_de_entries;

	u8 tx_sk_pacing_shift;

	u8 weight_multiplier;

net/mac80211/cfg.c

+2 −24
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2010	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2015  Intel Mobile Communications GmbH

 * Copyright (C) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2021 Intel Corporation

 * Copyright (C) 2018-2022 Intel Corporation

 */



#include <linux/ieee80211.h>
@@ -438,7 +438,6 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	struct ieee80211_local *local = sdata->local;

	struct sta_info *sta = NULL;

	const struct ieee80211_cipher_scheme *cs = NULL;

	struct ieee80211_key *key;

	int err;
@@ -456,23 +455,12 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
		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:

	case WLAN_CIPHER_SUITE_BIP_CMAC_256:

	case WLAN_CIPHER_SUITE_BIP_GMAC_128:

	case WLAN_CIPHER_SUITE_BIP_GMAC_256:

	case WLAN_CIPHER_SUITE_GCMP:

	case WLAN_CIPHER_SUITE_GCMP_256:

		break;

	default:

		cs = ieee80211_cs_get(local, params->cipher, sdata->vif.type);

		break;

	}



	key = ieee80211_key_alloc(params->cipher, key_idx, params->key_len,

				  params->key, params->seq_len, params->seq,

				  cs);

				  params->key, params->seq_len, params->seq);

	if (IS_ERR(key))

		return PTR_ERR(key);
@@ -537,9 +525,6 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
		break;

	}



	if (sta)

		sta->cipher_scheme = cs;



	err = ieee80211_key_link(key, sdata, sta);



 out_unlock:
@@ -1207,9 +1192,6 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
				params->crypto.control_port_over_nl80211;

	sdata->control_port_no_preauth =

				params->crypto.control_port_no_preauth;

	sdata->encrypt_headroom = ieee80211_cs_headroom(sdata->local,

							&params->crypto,

							sdata->vif.type);



	list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) {

		vlan->control_port_protocol =
@@ -1220,10 +1202,6 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, 
			params->crypto.control_port_over_nl80211;

		vlan->control_port_no_preauth =

			params->crypto.control_port_no_preauth;

		vlan->encrypt_headroom =

			ieee80211_cs_headroom(sdata->local,

					      &params->crypto,

					      vlan->vif.type);

	}



	sdata->vif.bss_conf.dtim_period = params->dtim_period;

net/mac80211/ieee80211_i.h

+1 −10
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Copyright 2006-2007	Jiri Benc <jbenc@suse.cz>

 * Copyright 2007-2010	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2015  Intel Mobile Communications GmbH

 * Copyright (C) 2018-2021 Intel Corporation

 * Copyright (C) 2018-2022 Intel Corporation

 */



#ifndef IEEE80211_I_H
@@ -944,7 +944,6 @@ struct ieee80211_sub_if_data { 
	bool control_port_no_encrypt;

	bool control_port_no_preauth;

	bool control_port_over_nl80211;

	int encrypt_headroom;



	atomic_t num_tx_queued;

	struct ieee80211_tx_queue_params tx_conf[IEEE80211_NUM_ACS];
@@ -2483,14 +2482,6 @@ void ieee80211_dfs_radar_detected_work(struct work_struct *work); 
int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata,

			      struct cfg80211_csa_settings *csa_settings);



bool ieee80211_cs_valid(const struct ieee80211_cipher_scheme *cs);

bool ieee80211_cs_list_valid(const struct ieee80211_cipher_scheme *cs, int n);

const struct ieee80211_cipher_scheme *

ieee80211_cs_get(struct ieee80211_local *local, u32 cipher,

		 enum nl80211_iftype iftype);

int ieee80211_cs_headroom(struct ieee80211_local *local,

			  struct cfg80211_crypto_settings *crypto,

			  enum nl80211_iftype iftype);

void ieee80211_recalc_dtim(struct ieee80211_local *local,

			   struct ieee80211_sub_if_data *sdata);

int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata,

net/mac80211/iface.c

+1 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright 2008, Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright (c) 2016        Intel Deutschland GmbH

 * Copyright (C) 2018-2021 Intel Corporation

 * Copyright (C) 2018-2022 Intel Corporation

 */

#include <linux/slab.h>

#include <linux/kernel.h>
@@ -1036,8 +1036,6 @@ int ieee80211_add_virtual_monitor(struct ieee80211_local *local) 
		 wiphy_name(local->hw.wiphy));

	sdata->wdev.iftype = NL80211_IFTYPE_MONITOR;



	sdata->encrypt_headroom = IEEE80211_ENCRYPT_HEADROOM;



	ieee80211_set_default_queues(sdata);



	ret = drv_add_interface(local, sdata);
@@ -1644,7 +1642,6 @@ static void ieee80211_setup_sdata(struct ieee80211_sub_if_data *sdata, 
	sdata->control_port_no_encrypt = false;

	sdata->control_port_over_nl80211 = false;

	sdata->control_port_no_preauth = false;

	sdata->encrypt_headroom = IEEE80211_ENCRYPT_HEADROOM;

	sdata->vif.bss_conf.idle = true;

	sdata->vif.bss_conf.txpower = INT_MIN; /* unset */
@@ -2116,8 +2113,6 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, 
	sdata->ap_power_level = IEEE80211_UNSET_POWER_LEVEL;

	sdata->user_power_level = local->user_power_level;



	sdata->encrypt_headroom = IEEE80211_ENCRYPT_HEADROOM;



	/* setup type-dependent data */

	ieee80211_setup_sdata(sdata, type);

net/mac80211/key.c

+3 −19
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * Copyright 2007-2008	Johannes Berg <johannes@sipsolutions.net>

 * Copyright 2013-2014  Intel Mobile Communications GmbH

 * Copyright 2015-2017	Intel Deutschland GmbH

 * Copyright 2018-2020  Intel Corporation

 * Copyright 2018-2020, 2022  Intel Corporation

 */



#include <linux/if_ether.h>
@@ -531,8 +531,7 @@ static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, 
struct ieee80211_key *

ieee80211_key_alloc(u32 cipher, int idx, size_t key_len,

		    const u8 *key_data,

		    size_t seq_len, const u8 *seq,

		    const struct ieee80211_cipher_scheme *cs)

		    size_t seq_len, const u8 *seq)

{

	struct ieee80211_key *key;

	int i, j, err;
@@ -675,21 +674,6 @@ ieee80211_key_alloc(u32 cipher, int idx, size_t key_len, 
			return ERR_PTR(err);

		}

		break;

	default:

		if (cs) {

			if (seq_len && seq_len != cs->pn_len) {

				kfree(key);

				return ERR_PTR(-EINVAL);

			}



			key->conf.iv_len = cs->hdr_len;

			key->conf.icv_len = cs->mic_len;

			for (i = 0; i < IEEE80211_NUM_TIDS + 1; i++)

				for (j = 0; j < seq_len; j++)

					key->u.gen.rx_pn[i][j] =

							seq[seq_len - j - 1];

			key->flags |= KEY_FLAG_CIPHER_SCHEME;

		}

	}

	memcpy(key->conf.key, key_data, key_len);

	INIT_LIST_HEAD(&key->list);
@@ -1294,7 +1278,7 @@ ieee80211_gtk_rekey_add(struct ieee80211_vif *vif, 


	key = ieee80211_key_alloc(keyconf->cipher, keyconf->keyidx,

				  keyconf->keylen, keyconf->key,

				  0, NULL, NULL);

				  0, NULL);

	if (IS_ERR(key))

		return ERR_CAST(key);