|
@@ -9,6 +9,8 @@
|
|
|
* more details.
|
|
|
*/
|
|
|
|
|
|
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
+
|
|
|
//#include <linux/config.h>
|
|
|
#include <linux/module.h>
|
|
|
#include <linux/init.h>
|
|
@@ -75,8 +77,7 @@ static void *ieee80211_ccmp_init(int key_idx)
|
|
|
|
|
|
priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);
|
|
|
if (IS_ERR(priv->tfm)) {
|
|
|
- printk(KERN_DEBUG "ieee80211_crypt_ccmp: could not allocate "
|
|
|
- "crypto API aes\n");
|
|
|
+ pr_debug("could not allocate crypto API aes\n");
|
|
|
priv->tfm = NULL;
|
|
|
goto fail;
|
|
|
}
|
|
@@ -282,23 +283,22 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|
|
keyidx = pos[3];
|
|
|
if (!(keyidx & (1 << 5))) {
|
|
|
if (net_ratelimit()) {
|
|
|
- printk(KERN_DEBUG "CCMP: received packet without ExtIV"
|
|
|
- " flag from %pM\n", hdr->addr2);
|
|
|
+ pr_debug("received packet without ExtIV flag from %pM\n",
|
|
|
+ hdr->addr2);
|
|
|
}
|
|
|
key->dot11RSNAStatsCCMPFormatErrors++;
|
|
|
return -2;
|
|
|
}
|
|
|
keyidx >>= 6;
|
|
|
if (key->key_idx != keyidx) {
|
|
|
- printk(KERN_DEBUG "CCMP: RX tkey->key_idx=%d frame "
|
|
|
- "keyidx=%d priv=%p\n", key->key_idx, keyidx, priv);
|
|
|
+ pr_debug("RX tkey->key_idx=%d frame keyidx=%d priv=%p\n",
|
|
|
+ key->key_idx, keyidx, priv);
|
|
|
return -6;
|
|
|
}
|
|
|
if (!key->key_set) {
|
|
|
if (net_ratelimit()) {
|
|
|
- printk(KERN_DEBUG "CCMP: received packet from %pM"
|
|
|
- " with keyid=%d that does not have a configured"
|
|
|
- " key\n", hdr->addr2, keyidx);
|
|
|
+ pr_debug("received packet from %pM with keyid=%d that does not have a configured key\n",
|
|
|
+ hdr->addr2, keyidx);
|
|
|
}
|
|
|
return -3;
|
|
|
}
|
|
@@ -313,9 +313,8 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|
|
|
|
|
if (memcmp(pn, key->rx_pn, CCMP_PN_LEN) <= 0) {
|
|
|
if (net_ratelimit()) {
|
|
|
- printk(KERN_DEBUG "CCMP: replay detected: STA=%pM"
|
|
|
- " previous PN %pm received PN %pm\n",
|
|
|
- hdr->addr2, key->rx_pn, pn);
|
|
|
+ pr_debug("replay detected: STA=%pM previous PN %pm received PN %pm\n",
|
|
|
+ hdr->addr2, key->rx_pn, pn);
|
|
|
}
|
|
|
key->dot11RSNAStatsCCMPReplays++;
|
|
|
return -4;
|
|
@@ -342,8 +341,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|
|
|
|
|
if (memcmp(mic, a, CCMP_MIC_LEN) != 0) {
|
|
|
if (net_ratelimit()) {
|
|
|
- printk(KERN_DEBUG "CCMP: decrypt failed: STA="
|
|
|
- "%pM\n", hdr->addr2);
|
|
|
+ pr_debug("decrypt failed: STA=%pM\n", hdr->addr2);
|
|
|
}
|
|
|
key->dot11RSNAStatsCCMPDecryptErrors++;
|
|
|
return -5;
|