--- drivers/net/wireless/orinoco.h.orig Sat Apr 20 16:18:26 2002 +++ drivers/net/wireless/orinoco.h Sun Apr 21 10:30:28 2002 @@ -8,7 +8,7 @@ #define _ORINOCO_H /* To enable debug messages */ -//#define ORINOCO_DEBUG 3 +#define ORINOCO_DEBUG 0 #if (! defined (WIRELESS_EXT)) || (WIRELESS_EXT < 10) #error "orinoco driver requires Wireless extensions v10 or later." @@ -17,6 +17,11 @@ #define ORINOCO_MAX_KEY_SIZE 14 #define ORINOCO_MAX_KEYS 4 + +#define ORINOCO_WEPFLAGS_PRIVACYINVOKED 0x01 +#define ORINOCO_WEPFLAGS_EXCLUDEUNENCRYPTED 0x02 +#define ORINOCO_WEPFLAGS_HOSTENCRYPT 0x10 +#define ORINOCO_WEPFLAGS_HOSTDECRYPT 0x80 typedef struct orinoco_key { u16 len; /* always store little-endian */ @@ -65,6 +70,7 @@ int port_type, allow_ibss; u16 wep_on, wep_restrict, tx_key; + u32 iv; orinoco_keys_t keys; int bitratemode; --- drivers/net/wireless/orinoco.c.orig Sat Apr 20 16:18:11 2002 +++ drivers/net/wireless/orinoco.c Sun Apr 21 10:27:05 2002 @@ -300,6 +300,7 @@ #include #include #include +#include #include "hermes.h" #include "hermes_rid.h" @@ -331,6 +332,11 @@ MODULE_PARM(orinoco_debug, "i"); #endif +int orinoco_host_encrypt = 0; +int orinoco_host_decrypt = 0; +MODULE_PARM(orinoco_host_encrypt, "i"); +MODULE_PARM(orinoco_host_decrypt, "i"); + #define ORINOCO_MIN_MTU 256 #define ORINOCO_MAX_MTU (HERMES_FRAME_LEN_MAX - ENCAPS_OVERHEAD) @@ -420,6 +426,63 @@ u16 qual, signal, noise; } __attribute__ ((packed)) orinoco_commsqual_t; +/* CRC table used for WEP frame checksumming */ +static const __u32 crc32_table[256] = { + 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, + 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, + 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, + 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, + 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, + 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, + 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, + 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, + 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, + 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, + 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, + 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, + 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, + 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, + 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, + 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, + 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, + 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, + 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, + 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, + 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, + 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, + 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, + 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, + 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, + 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, + 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, + 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, + 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, + 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, + 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, + 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, + 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, + 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, + 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, + 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, + 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, + 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, + 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, + 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, + 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, + 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, + 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, + 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, + 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, + 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, + 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, + 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, + 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, + 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, + 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, + 0x2d02ef8dL +}; + + /* * Function prototypes */ @@ -430,6 +493,7 @@ static struct net_device_stats *orinoco_get_stats(struct net_device *dev); static struct iw_statistics *orinoco_get_wireless_stats(struct net_device *dev); +static int orinoco_wep_decrypt(struct orinoco_private *priv, u8 *buf, int len); /* Hardware control routines */ @@ -884,10 +948,14 @@ } else { /* Prism2 card : we need to modify master * WEP setting */ + master_wep_flag = ORINOCO_WEPFLAGS_PRIVACYINVOKED; if(priv->wep_restrict) - master_wep_flag = 3; - else - master_wep_flag = 1; + master_wep_flag |= ORINOCO_WEPFLAGS_EXCLUDEUNENCRYPTED; + + if (orinoco_host_encrypt) + master_wep_flag |= ORINOCO_WEPFLAGS_HOSTENCRYPT; + if (orinoco_host_decrypt) + master_wep_flag |= ORINOCO_WEPFLAGS_HOSTDECRYPT; } } @@ -1295,6 +1363,7 @@ struct orinoco_rxframe_hdr hdr; struct ethhdr *eh; int err; + int do_decrypt; rxfid = hermes_read_regn(hw, RXFID); DEBUG(3, "__orinoco_ev_rx(): RXFID=0x%04x\n", rxfid); @@ -1331,7 +1400,18 @@ goto drop; } + do_decrypt = (hdr.p80211.frame_ctl & IEEE802_11_FCTL_WEP) && orinoco_host_decrypt; + + + /* If we do the decryption ourselves, the encapsulation is + * hidden in the encrypted content - everything after p80211 + * in the hdr is actually bogus */ + length = le16_to_cpu(hdr.p80211.data_len); + if (do_decrypt) + length += ETH_HLEN; + + /* Yes, you heard right, that's le16. 802.2 and 802.3 are big-endian, but 802.11 is little-endian believe it or not. */ @@ -1369,9 +1449,10 @@ * are not properly recognised by most firmwares. * So, check ourselves (note : only 3 bytes out of 6). */ - if(((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) || - ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) || - (!memcmp(&hdr.p8022, &encaps_hdr, 3))) { + if( ! do_decrypt && + (((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_1042) || + ((status & HERMES_RXSTAT_MSGTYPE) == HERMES_RXSTAT_TUNNEL) || + (!memcmp(&hdr.p8022, &encaps_hdr, 3)))) { /* These indicate a SNAP within 802.2 LLC within 802.11 frame which we'll need to de-encapsulate to the original EthernetII frame. */ @@ -1386,7 +1467,8 @@ eh->h_proto = hdr.ethertype; } else { /* All other cases indicate a genuine 802.3 frame. - * No decapsulation needed */ + * No decapsulation needed + * If we are decrypting, we sort it out later. */ /* Otherwise, we just throw the whole thing in, * and hope the protocol layer can deal with it @@ -1395,9 +1477,11 @@ data_off = P8023_OFFSET; } + p = skb_put(skb, data_len); err = hermes_bap_pread(hw, IRQ_BAP, p, RUP_EVEN(data_len), rxfid, data_off); + if (err) { if (err == -EIO) DEBUG(1, "%s: EIO reading frame header.\n", dev->name); @@ -1408,11 +1492,33 @@ goto drop; } + /* Don't decrypt the header space */ + if (do_decrypt) { + err = orinoco_wep_decrypt(priv, p+ETH_HLEN, data_len-ETH_HLEN); + + if (err) { + wstats->discard.code++; + printk(KERN_WARNING "%s: Undecryptable frame on Rx. Frame dropped.\n", + dev->name); + goto drop; + } + + /* We need to rearrange a bit - we probably got + * an encapsulated frame */ + if (! memcmp(p+4+ETH_HLEN, &encaps_hdr, 3)) { + memmove(p+ETH_HLEN-2, p+ETH_HLEN+ENCAPS_OVERHEAD+2, data_len-ETH_HLEN-ENCAPS_OVERHEAD-2); + skb_trim(skb, skb->len-8-ENCAPS_OVERHEAD); + } else { + memmove(p+ETH_HLEN, p+ETH_HLEN+4, data_len-ETH_HLEN-4); + skb_trim(skb, skb->len-8); + } + } + dev->last_rx = jiffies; skb->dev = dev; skb->protocol = eth_type_trans(skb, dev); skb->ip_summed = CHECKSUM_NONE; - + /* Process the wireless stats if needed */ orinoco_stat_gather(dev, skb, &hdr); @@ -1612,7 +1718,7 @@ priv->broken_allocate = 0; priv->has_port3 = 1; priv->has_ibss = (firmver >= 0x00007); /* FIXME */ - priv->has_wep = (firmver >= 0x00007); /* SM */ + priv->has_wep = (firmver >= 0x00008) || (firmver >= 0x00007 && orinoco_host_decrypt); priv->has_big_wep = priv->has_wep; priv->has_mwo = 0; priv->has_pm = (firmver >= 0x00007); @@ -1778,6 +1884,9 @@ priv->wep_on = 0; priv->tx_key = 0; + /* Seed the WEP IV */ + get_random_bytes(&priv->iv, 4); + printk(KERN_DEBUG "%s: ready\n", dev->name); out: @@ -1849,6 +1958,61 @@ return wstats; } +static int orinoco_wep_decrypt(struct orinoco_private *priv, u8 *buf, int len) +{ + u32 iv; + u8 kid; + + u32 i, j, k, crc, icv, klen; + u8 S[256], key[ORINOCO_MAX_KEY_SIZE + 3]; + u8 kpos, *pos; +#define S_SWAP(a,b) do { u8 t = S[a]; S[a] = S[b]; S[b] = t; } while(0) + + /* Extract the IV and the key number from bytes 0 to 3 */ + iv = buf[0] | (buf[1] << 8) | (buf[2] << 16); + kid = (buf[3] >> 6) & 3; + klen = 3+priv->keys[kid].len; + + DEBUG(2, "%s: key id %u, IV %06x\n", priv->ndev.name, kid, iv); + + /* Decrypt the payload */ + + /* Copy IV and the rest of the WEP key (the secret part) */ + memcpy(key, buf, 3); + memcpy(key + 3, priv->keys[kid].data, priv->keys[kid].len); + + /* Setup RC4 state */ + for (i = 0; i < 256; i++) + S[i] = i; + j = 0; + kpos = 0; + for (i = 0; i < 256; i++) { + j = (j + S[i] + key[kpos]) & 0xff; + kpos = (kpos + 1) % klen; + S_SWAP(i, j); + } + + /* Decrypt the data and compute the CRC of the result */ + pos = buf+4; + crc = ~0; + i = j = 0; + for (k = 0; k < len-4; k++) { + i = (i + 1) & 0xff; + j = (j + S[i]) & 0xff; + S_SWAP(i, j); + *pos ^= S[(S[i] + S[j]) & 0xff]; + if (k < len-8) + crc = crc32_table[(crc ^ *pos) & 0xff] ^ (crc >> 8); + pos++; + } + crc = ~crc; + icv = buf[len-4] | (buf[len-3] << 8) | (buf[len-2] << 16) | (buf[len-1] << 24); + + DEBUG(2, "%s: ICV data %08x, ICV computed %08x\n", priv->ndev.name, icv, crc); + + return icv != crc; +} + static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac, int level, int noise) {