1 files changed, 54 insertions, 79 deletions

diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c
index f91d92c6df25..d4f9164be1a1 100644
--- a/net/ieee80211/ieee80211_crypt_tkip.c
+++ b/net/ieee80211/ieee80211_crypt_tkip.c
@@ -23,7 +23,6 @@
 
 #include <net/ieee80211.h>
 
-
 #include <linux/crypto.h>
 #include <asm/scatterlist.h>
 #include <linux/crc32.h>
@@ -62,7 +61,7 @@ struct ieee80211_tkip_data {
         u8 rx_hdr[16], tx_hdr[16];
 };
 
-static void * ieee80211_tkip_init(int key_idx)
+static void *ieee80211_tkip_init(int key_idx)
 {
         struct ieee80211_tkip_data *priv;
 
@@ -88,7 +87,7 @@ static void * ieee80211_tkip_init(int key_idx)
 
         return priv;
 
-fail:
+      fail:
         if (priv) {
                 if (priv->tfm_michael)
                         crypto_free_tfm(priv->tfm_michael);
@@ -100,7 +99,6 @@ fail:
         return NULL;
 }
 
-
 static void ieee80211_tkip_deinit(void *priv)
 {
         struct ieee80211_tkip_data *_priv = priv;
@@ -111,51 +109,42 @@ static void ieee80211_tkip_deinit(void *priv)
         kfree(priv);
 }
 
-
 static inline u16 RotR1(u16 val)
 {
         return (val >> 1) | (val << 15);
 }
 
-
 static inline u8 Lo8(u16 val)
 {
         return val & 0xff;
 }
 
-
 static inline u8 Hi8(u16 val)
 {
         return val >> 8;
 }
 
-
 static inline u16 Lo16(u32 val)
 {
         return val & 0xffff;
 }
 
-
 static inline u16 Hi16(u32 val)
 {
         return val >> 16;
 }
 
-
 static inline u16 Mk16(u8 hi, u8 lo)
 {
         return lo | (((u16) hi) << 8);
 }
 
-
-static inline u16 Mk16_le(u16 *v)
+static inline u16 Mk16_le(u16 * v)
 {
         return le16_to_cpu(*v);
 }
 
-
-static const u16 Sbox[256] =
-{
+static const u16 Sbox[256] = {
         0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
         0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
         0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
@@ -190,17 +179,16 @@ static const u16 Sbox[256] =
         0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,
 };
 
-
 static inline u16 _S_(u16 v)
 {
         u16 t = Sbox[Hi8(v)];
         return Sbox[Lo8(v)] ^ ((t << 8) | (t >> 8));
 }
 
-
 #define PHASE1_LOOP_COUNT 8
 
-static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
+static void tkip_mixing_phase1(u16 * TTAK, const u8 * TK, const u8 * TA,
+                               u32 IV32)
 {
         int i, j;
 
@@ -221,13 +209,12 @@ static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
         }
 }
 
-
-static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
+static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK,
                                u16 IV16)
 {
         /* Make temporary area overlap WEP seed so that the final copy can be
          * avoided on little endian hosts. */
-        u16 *PPK = (u16 *) &WEPSeed[4];
+        u16 *PPK = (u16 *) & WEPSeed[4];
 
         /* Step 1 - make copy of TTAK and bring in TSC */
         PPK[0] = TTAK[0];
@@ -238,15 +225,15 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
         PPK[5] = TTAK[4] + IV16;
 
         /* Step 2 - 96-bit bijective mixing using S-box */
-        PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) &TK[0]));
-        PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) &TK[2]));
-        PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) &TK[4]));
-        PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) &TK[6]));
-        PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) &TK[8]));
-        PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) &TK[10]));
-
-        PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) &TK[12]));
-        PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) &TK[14]));
+        PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) & TK[0]));
+        PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) & TK[2]));
+        PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) & TK[4]));
+        PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) & TK[6]));
+        PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) & TK[8]));
+        PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) & TK[10]));
+
+        PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) & TK[12]));
+        PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) & TK[14]));
         PPK[2] += RotR1(PPK[1]);
         PPK[3] += RotR1(PPK[2]);
         PPK[4] += RotR1(PPK[3]);
@@ -257,7 +244,7 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
         WEPSeed[0] = Hi8(IV16);
         WEPSeed[1] = (Hi8(IV16) | 0x20) & 0x7F;
         WEPSeed[2] = Lo8(IV16);
-        WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) &TK[0])) >> 1);
+        WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) & TK[0])) >> 1);
 
 #ifdef __BIG_ENDIAN
         {
@@ -281,7 +268,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
             skb->len < hdr_len)
                 return -1;
 
-        hdr = (struct ieee80211_hdr *) skb->data;
+        hdr = (struct ieee80211_hdr *)skb->data;
         if (!tkey->tx_phase1_done) {
                 tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
                                    tkey->tx_iv32);
@@ -298,7 +285,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
         *pos++ = rc4key[0];
         *pos++ = rc4key[1];
         *pos++ = rc4key[2];
-        *pos++ = (tkey->key_idx << 6) | (1 << 5) /* Ext IV included */;
+        *pos++ = (tkey->key_idx << 6) | (1 << 5) /* Ext IV included */ ;
         *pos++ = tkey->tx_iv32 & 0xff;
         *pos++ = (tkey->tx_iv32 >> 8) & 0xff;
         *pos++ = (tkey->tx_iv32 >> 16) & 0xff;
@@ -341,7 +328,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         if (skb->len < hdr_len + 8 + 4)
                 return -1;
 
-        hdr = (struct ieee80211_hdr *) skb->data;
+        hdr = (struct ieee80211_hdr *)skb->data;
         pos = skb->data + hdr_len;
         keyidx = pos[3];
         if (!(keyidx & (1 << 5))) {
@@ -427,9 +414,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
         return keyidx;
 }
 
-
-static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
-                       u8 *data, size_t data_len, u8 *mic)
+static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr,
+                       u8 * data, size_t data_len, u8 * mic)
 {
         struct scatterlist sg[2];
 
@@ -453,37 +439,37 @@ static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
         return 0;
 }
 
-static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
+static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)
 {
         struct ieee80211_hdr *hdr11;
 
-        hdr11 = (struct ieee80211_hdr *) skb->data;
+        hdr11 = (struct ieee80211_hdr *)skb->data;
         switch (le16_to_cpu(hdr11->frame_ctl) &
                 (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
         case IEEE80211_FCTL_TODS:
-                memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
-                memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
+                memcpy(hdr, hdr11->addr3, ETH_ALEN);    /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
                 break;
         case IEEE80211_FCTL_FROMDS:
-                memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
-                memcpy(hdr + ETH_ALEN, hdr11->addr3, ETH_ALEN); /* SA */
+                memcpy(hdr, hdr11->addr1, ETH_ALEN);    /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr3, ETH_ALEN); /* SA */
                 break;
         case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
-                memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
-                memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */
+                memcpy(hdr, hdr11->addr3, ETH_ALEN);    /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */
                 break;
         case 0:
-                memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
-                memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
+                memcpy(hdr, hdr11->addr1, ETH_ALEN);    /* DA */
+                memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
                 break;
         }
 
-        hdr[12] = 0; /* priority */
-        hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */
+        hdr[12] = 0;            /* priority */
+        hdr[13] = hdr[14] = hdr[15] = 0;        /* reserved */
 }
 
-
-static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)
+static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len,
+                                     void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
         u8 *pos;
@@ -504,11 +490,9 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
         return 0;
 }
 
-
 #if WIRELESS_EXT >= 18
 static void ieee80211_michael_mic_failure(struct net_device *dev,
-                                       struct ieee80211_hdr *hdr,
-                                       int keyidx)
+                                          struct ieee80211_hdr *hdr, int keyidx)
 {
         union iwreq_data wrqu;
         struct iw_michaelmicfailure ev;
@@ -524,12 +508,11 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
         memcpy(ev.src_addr.sa_data, hdr->addr2, ETH_ALEN);
         memset(&wrqu, 0, sizeof(wrqu));
         wrqu.data.length = sizeof(ev);
-        wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev);
+        wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *)&ev);
 }
 #elif WIRELESS_EXT >= 15
 static void ieee80211_michael_mic_failure(struct net_device *dev,
-                                       struct ieee80211_hdr *hdr,
-                                       int keyidx)
+                                          struct ieee80211_hdr *hdr, int keyidx)
 {
         union iwreq_data wrqu;
         char buf[128];
@@ -542,17 +525,16 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
         wrqu.data.length = strlen(buf);
         wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
 }
-#else /* WIRELESS_EXT >= 15 */
+#else                           /* WIRELESS_EXT >= 15 */
 static inline void ieee80211_michael_mic_failure(struct net_device *dev,
-                                              struct ieee80211_hdr *hdr,
-                                              int keyidx)
+                                                 struct ieee80211_hdr *hdr,
+                                                 int keyidx)
 {
 }
-#endif /* WIRELESS_EXT >= 15 */
-
+#endif                          /* WIRELESS_EXT >= 15 */
 
 static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
-                                     int hdr_len, void *priv)
+                                        int hdr_len, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
         u8 mic[8];
@@ -566,7 +548,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
                 return -1;
         if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {
                 struct ieee80211_hdr *hdr;
-                hdr = (struct ieee80211_hdr *) skb->data;
+                hdr = (struct ieee80211_hdr *)skb->data;
                 printk(KERN_DEBUG "%s: Michael MIC verification failed for "
                        "MSDU from " MAC_FMT " keyidx=%d\n",
                        skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
@@ -587,8 +569,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
         return 0;
 }
 
-
-static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
+static int ieee80211_tkip_set_key(void *key, int len, u8 * seq, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
         int keyidx;
@@ -603,10 +584,10 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
         if (len == TKIP_KEY_LEN) {
                 memcpy(tkey->key, key, TKIP_KEY_LEN);
                 tkey->key_set = 1;
-                tkey->tx_iv16 = 1; /* TSC is initialized to 1 */
+                tkey->tx_iv16 = 1;      /* TSC is initialized to 1 */
                 if (seq) {
                         tkey->rx_iv32 = (seq[5] << 24) | (seq[4] << 16) |
-                                (seq[3] << 8) | seq[2];
+                            (seq[3] << 8) | seq[2];
                         tkey->rx_iv16 = (seq[1] << 8) | seq[0];
                 }
         } else if (len == 0)
@@ -617,8 +598,7 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
         return 0;
 }
 
-
-static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
+static int ieee80211_tkip_get_key(void *key, int len, u8 * seq, void *priv)
 {
         struct ieee80211_tkip_data *tkey = priv;
 
@@ -647,8 +627,7 @@ static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
         return TKIP_KEY_LEN;
 }
 
-
-static char * ieee80211_tkip_print_stats(char *p, void *priv)
+static char *ieee80211_tkip_print_stats(char *p, void *priv)
 {
         struct ieee80211_tkip_data *tkip = priv;
         p += sprintf(p, "key[%d] alg=TKIP key_set=%d "
@@ -674,7 +653,6 @@ static char * ieee80211_tkip_print_stats(char *p, void *priv)
         return p;
 }
 
-
 static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
         .name                   = "TKIP",
         .init                   = ieee80211_tkip_init,
@@ -686,23 +664,20 @@ static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
         .set_key                = ieee80211_tkip_set_key,
         .get_key                = ieee80211_tkip_get_key,
         .print_stats            = ieee80211_tkip_print_stats,
-        .extra_prefix_len       = 4 + 4, /* IV + ExtIV */
-        .extra_postfix_len      = 8 + 4, /* MIC + ICV */
-        .owner                  = THIS_MODULE,
+        .extra_prefix_len       = 4 + 4,        /* IV + ExtIV */
+        .extra_postfix_len      = 8 + 4,        /* MIC + ICV */
+        .owner                  = THIS_MODULE,
 };
 
-
 static int __init ieee80211_crypto_tkip_init(void)
 {
         return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip);
 }
 
-
 static void __exit ieee80211_crypto_tkip_exit(void)
 {
         ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
 }
 
-
 module_init(ieee80211_crypto_tkip_init);
 module_exit(ieee80211_crypto_tkip_exit);