Commit 6f16bf3b authored by John W. Linville's avatar John W. Linville
Browse files

lib80211: silence excessive crypto debugging messages 



When they were part of the now defunct ieee80211 component, these
messages were only visible when special debugging settings were enabled.
Let's mirror that with a new lib80211 debugging Kconfig option.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea8dbdd1

net/wireless/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -102,3 +102,13 @@ config LIB80211_CRYPT_CCMP 


config LIB80211_CRYPT_TKIP

	tristate



config LIB80211_DEBUG

	bool "lib80211 debugging messages"

	depends on LIB80211

	default n

	---help---

	  You can enable this if you want verbose debugging messages

	  from lib80211.



	  If unsure, say N.

net/wireless/lib80211_crypt_ccmp.c

+2 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	pos += 8;



	if (ccmp_replay_check(pn, key->rx_pn)) {

#ifdef CONFIG_LIB80211_DEBUG

		if (net_ratelimit()) {

			printk(KERN_DEBUG "CCMP: replay detected: STA=%pM "

				 "previous PN %02x%02x%02x%02x%02x%02x "
@@ -346,6 +347,7 @@ static int lib80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
				 key->rx_pn[3], key->rx_pn[4], key->rx_pn[5],

				 pn[0], pn[1], pn[2], pn[3], pn[4], pn[5]);

		}

#endif

		key->dot11RSNAStatsCCMPReplays++;

		return -4;

	}

net/wireless/lib80211_crypt_tkip.c

+4 −0
Original line number Diff line number Diff line
@@ -465,12 +465,14 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
	pos += 8;



	if (tkip_replay_check(iv32, iv16, tkey->rx_iv32, tkey->rx_iv16)) {

#ifdef CONFIG_LIB80211_DEBUG

		if (net_ratelimit()) {

			printk(KERN_DEBUG "TKIP: replay detected: STA=%pM"

			       " previous TSC %08x%04x received TSC "

			       "%08x%04x\n", hdr->addr2,

			       tkey->rx_iv32, tkey->rx_iv16, iv32, iv16);

		}

#endif

		tkey->dot11RSNAStatsTKIPReplays++;

		return -4;

	}
@@ -505,10 +507,12 @@ static int lib80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv) 
			 * it needs to be recalculated for the next packet. */

			tkey->rx_phase1_done = 0;

		}

#ifdef CONFIG_LIB80211_DEBUG

		if (net_ratelimit()) {

			printk(KERN_DEBUG "TKIP: ICV error detected: STA="

			       "%pM\n", hdr->addr2);

		}

#endif

		tkey->dot11RSNAStatsTKIPICVErrors++;

		return -5;

	}