Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fc0fee0 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: use key size constants 



Instead of hardcoding the key length for validation, use the
constants Zhu Yi recently added and add one for AES_CMAC too.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 362a415d

include/linux/ieee80211.h

+1 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,7 @@ enum ieee80211_key_len { 
	WLAN_KEY_LEN_WEP104 = 13,

	WLAN_KEY_LEN_CCMP = 16,

	WLAN_KEY_LEN_TKIP = 32,

	WLAN_KEY_LEN_AES_CMAC = 16,

};



/*

net/wireless/util.c

+5 −6
Original line number Diff line number Diff line
@@ -157,26 +157,25 @@ int cfg80211_validate_key_settings(struct key_params *params, int key_idx, 
	    params->cipher != WLAN_CIPHER_SUITE_WEP104)

		return -EINVAL;



	/* TODO: add definitions for the lengths to linux/ieee80211.h */

	switch (params->cipher) {

	case WLAN_CIPHER_SUITE_WEP40:

		if (params->key_len != 5)

		if (params->key_len != WLAN_KEY_LEN_WEP40)

			return -EINVAL;

		break;

	case WLAN_CIPHER_SUITE_TKIP:

		if (params->key_len != 32)

		if (params->key_len != WLAN_KEY_LEN_TKIP)

			return -EINVAL;

		break;

	case WLAN_CIPHER_SUITE_CCMP:

		if (params->key_len != 16)

		if (params->key_len != WLAN_KEY_LEN_CCMP)

			return -EINVAL;

		break;

	case WLAN_CIPHER_SUITE_WEP104:

		if (params->key_len != 13)

		if (params->key_len != WLAN_KEY_LEN_WEP104)

			return -EINVAL;

		break;

	case WLAN_CIPHER_SUITE_AES_CMAC:

		if (params->key_len != 16)

		if (params->key_len != WLAN_KEY_LEN_AES_CMAC)

			return -EINVAL;

		break;

	default: