aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* gcc: fix avr32 default GCC versionJonas Gorski2013-05-221-1/+1
* 6relayd: Fix a segfault when multiple downstream interfaces are presentSteven Barth2013-05-211-2/+2
* firewall3: update to git headJo-Philipp Wich2013-05-211-2/+2
* ipset: remove dependency on iptables-mod-ipset - technically it does not depe...Jo-Philipp Wich2013-05-211-1/+1
* firewall3: move libext*.a copying to compile phaseJo-Philipp Wich2013-05-211-2/+2
* netfilter: move time, mark, set matches and MARK, REDIRECT, SET targets into ...Jo-Philipp Wich2013-05-212-32/+25
* firewall3: update to git headJo-Philipp Wich2013-05-211-3/+14
* iptables: use -ffunction-sections, -fdata-sections and --gc-sectionsJo-Philipp Wich2013-05-211-2/+6
* ar71xx: disable jffs2 by default, it confuses users since many devices have i...Felix Fietkau2013-05-211-1/+1
* odhcp6c: Various fixes * Honour T1 and T2 values from servers better * Correc...Steven Barth2013-05-211-2/+2
* 6relayd: Various DHCPv6-fixes * Be more standards-compliant in stateful mode ...Steven Barth2013-05-211-2/+2
* kernel: update 3.9 to 3.9.3Jonas Gorski2013-05-207-15/+15
* odhcp6c: Fix address / prefix expiry logicSteven Barth2013-05-201-2/+2
* ar7: drop obsolete 3.3 supportJonas Gorski2013-05-2016-1753/+0
* ar7: drop obsolete 3.6 supportJonas Gorski2013-05-2016-1762/+0
* ar7: switch to 3.9Jonas Gorski2013-05-203-4/+1
* ar7: add support for 3.9Jonas Gorski2013-05-2016-0/+1755
* kernel: add some missing symbols/move them to genericJonas Gorski2013-05-203-3/+7
* brcm2708: make it boot on revision 2 raspberry pisJonas Gorski2013-05-203-12/+927
* brcm2708-gpu-fw: download zipped sources and switch to Hexxeh's gitJonas Gorski2013-05-201-8/+6
* mac80211: remove superfluous patchJonas Gorski2013-05-201-39/+0
* uboot-envtools: upgrade to 2013.04Luka Perkov2013-05-201-2/+2
* kernel: generic: add 3.10-rc1 supportJonas Gorski2013-05-19165-0/+31689
* kernel: adapt module paths for 3.10-rc1Jonas Gorski2013-05-192-6/+6
* mac80211: make it build with 3.10-rc1Jonas Gorski2013-05-193-0/+145
* bcm63xx: add 3.9 supportJonas Gorski2013-05-19133-0/+15025
* bcm63xx: Simplify CFE detection.Jonas Gorski2013-05-196-22/+78
* kernel: update 3.9 to 3.9.2Jonas Gorski2013-05-192-3/+3
* kernel: don't remove of_tablesJonas Gorski2013-05-191-0/+33
* ath9k: fix some more aggregation related issuesFelix Fietkau2013-05-183-130/+217
* dnsmasq: add directory for external hosts-filesSteven Barth2013-05-172-1/+4
* 6relayd: Add stateful DHCPv6-support (IA_NA) * Add management_level option (0...Steven Barth2013-05-173-3/+25
* netifd: Unify interface-based routing for IPv4 and IPv6 * Add interface optio...Steven Barth2013-05-171-2/+2
* Config.in: expose symbols specific to lxc in separate itemLuka Perkov2013-05-171-0/+26
* ath9k: merge some aggregation / rate handling related fixesFelix Fietkau2013-05-173-20/+229
* valgrind: enable parallel buildsFelix Fietkau2013-05-171-0/+1
* ar71xx: remove the xfrm.h chunk from the unaligned access hacks, it breaks ipsecFelix Fietkau2013-05-171-11/+0
* mac80211: add a rate control rate selection fixFelix Fietkau2013-05-161-1/+1
* uhttpd: update to latest version, fixes index page processing orderFelix Fietkau2013-05-161-2/+2
* trace-cmd: update to latest versionFelix Fietkau2013-05-164-32/+26
* iproute2: workaround compile issues with gcc 4.8.xLuka Perkov2013-05-164-4/+16
* odhcp6c: Fix handling of RAs when no DHCPv6-server is presentSteven Barth2013-05-151-2/+2
* mac80211: add mesh_param supportFelix Fietkau2013-05-152-1/+15
* mac80211: add HT support for meshFelix Fietkau2013-05-151-1/+6
* iproute2: upgrade to 3.9.0Luka Perkov2013-05-1411-120/+50
* iproute2: print help in connmarkLuka Perkov2013-05-142-2/+5
* uhttpd: update to latest version, fixes a SSL connection memory leakFelix Fietkau2013-05-141-2/+2
* package: fold the IPv6 menu into NetworkFelix Fietkau2013-05-148-15/+15
* mac80211: fix AP mode action frame handlingFelix Fietkau2013-05-141-1/+11
* mac80211: fix client mode state handling issuesFelix Fietkau2013-05-141-0/+62
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 13:42:04 +0000
t ieee80211_key *, struct sk_buff *, int); static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int); -static int ccmp_demic(struct ieee80211_key *, struct sk_buff *, int); +static int ccmp_demic(struct ieee80211_key *, struct sk_buff *, int, int); static const struct ieee80211_cipher ccmp = { .ic_name = "AES-CCM", @@ -298,7 +298,7 @@ * Verify and strip MIC from the frame. */ static int -ccmp_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen) +ccmp_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force) { return 1; } diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto.h --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto.h 2007-04-16 14:32:29.000000000 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto.h 2007-05-26 18:51:09.545636384 +0200 @@ -145,7 +145,7 @@ int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t); int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int); int (*ic_enmic)(struct ieee80211_key *, struct sk_buff *, int); - int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int); + int (*ic_demic)(struct ieee80211_key *, struct sk_buff *, int, int); }; extern const struct ieee80211_cipher ieee80211_cipher_none; @@ -163,10 +163,10 @@ */ static __inline int ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, - struct sk_buff *skb, int hdrlen) + struct sk_buff *skb, int hdrlen, int force) { const struct ieee80211_cipher *cip = k->wk_cipher; - return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen) : 1); + return (cip->ic_miclen > 0 ? cip->ic_demic(k, skb, hdrlen, force) : 1); } /* diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_none.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_none.c --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_none.c 2006-09-20 10:45:13.000000000 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_none.c 2007-05-26 18:51:09.545636384 +0200 @@ -52,7 +52,7 @@ static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int none_decap(struct ieee80211_key *, struct sk_buff *, int); static int none_enmic(struct ieee80211_key *, struct sk_buff *, int); -static int none_demic(struct ieee80211_key *, struct sk_buff *, int); +static int none_demic(struct ieee80211_key *, struct sk_buff *, int, int); const struct ieee80211_cipher ieee80211_cipher_none = { .ic_name = "NONE", @@ -137,7 +137,7 @@ } static int -none_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen) +none_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force) { struct ieee80211vap *vap = k->wk_private; diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_tkip.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_tkip.c --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_tkip.c 2007-05-17 00:13:10.000000000 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_tkip.c 2007-05-26 18:51:09.546636232 +0200 @@ -57,7 +57,7 @@ static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int); static int tkip_decap(struct ieee80211_key *, struct sk_buff *, int); -static int tkip_demic(struct ieee80211_key *, struct sk_buff *, int); +static int tkip_demic(struct ieee80211_key *, struct sk_buff *, int, int); static const struct ieee80211_cipher tkip = { .ic_name = "TKIP", @@ -339,7 +339,7 @@ * Verify and strip MIC from the frame. */ static int -tkip_demic(struct ieee80211_key *k, struct sk_buff *skb0, int hdrlen) +tkip_demic(struct ieee80211_key *k, struct sk_buff *skb0, int hdrlen, int force) { struct tkip_ctx *ctx = k->wk_private; struct sk_buff *skb; @@ -355,7 +355,7 @@ } wh = (struct ieee80211_frame *) skb0->data; /* NB: skb left pointing at last in chain */ - if (k->wk_flags & IEEE80211_KEY_SWMIC) { + if ((k->wk_flags & IEEE80211_KEY_SWMIC) || force) { struct ieee80211vap *vap = ctx->tc_vap; u8 mic[IEEE80211_WEP_MICLEN]; u8 mic0[IEEE80211_WEP_MICLEN]; diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_wep.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_wep.c --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_crypto_wep.c 2006-09-20 10:45:13.000000000 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_crypto_wep.c 2007-05-26 18:51:09.547636080 +0200 @@ -54,7 +54,7 @@ static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t); static int wep_decap(struct ieee80211_key *, struct sk_buff *, int); static int wep_enmic(struct ieee80211_key *, struct sk_buff *, int); -static int wep_demic(struct ieee80211_key *, struct sk_buff *, int); +static int wep_demic(struct ieee80211_key *, struct sk_buff *, int, int); static const struct ieee80211_cipher wep = { .ic_name = "WEP", @@ -244,7 +244,7 @@ * Verify and strip MIC from the frame. */ static int -wep_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen) +wep_demic(struct ieee80211_key *k, struct sk_buff *skb, int hdrlen, int force) { return 1; } diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_input.c 2007-05-26 18:51:09.534638056 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_input.c 2007-05-26 18:51:09.548635928 +0200 @@ -654,7 +654,7 @@ * Next strip any MSDU crypto bits. */ if (key != NULL && - !ieee80211_crypto_demic(vap, key, skb, hdrspace)) { + !ieee80211_crypto_demic(vap, key, skb, hdrspace, 0)) { IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, ni->ni_macaddr, "data", "%s", "demic error"); IEEE80211_NODE_STAT(ni, rx_demicfail); @@ -3789,6 +3789,47 @@ } #endif +/* + * Process a frame w/ hw detected MIC failure. + * The frame will be dropped in any case. + */ +void +ieee80211_check_mic(struct ieee80211_node *ni, struct sk_buff *skb) +{ + struct ieee80211vap *vap = ni->ni_vap; + + struct ieee80211_frame *wh; + struct ieee80211_key *key; + int hdrspace; + struct ieee80211com *ic = vap->iv_ic; + + if (skb->len < sizeof(struct ieee80211_frame_min)) { + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY, + ni->ni_macaddr, NULL, + "too short (1): len %u", skb->len); + vap->iv_stats.is_rx_tooshort++; + return; + } + + wh = (struct ieee80211_frame *)skb->data; + + hdrspace = ieee80211_hdrspace(ic, wh); + key = ieee80211_crypto_decap(ni, skb, hdrspace); + if (key == NULL) { + /* NB: stats+msgs handled in crypto_decap */ + IEEE80211_NODE_STAT(ni, rx_wepfail); + return; + } + + if (!ieee80211_crypto_demic(vap, key, skb, hdrspace, 1)) { + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT, + ni->ni_macaddr, "data", "%s", "demic error"); + IEEE80211_NODE_STAT(ni, rx_demicfail); + } + return; +} +EXPORT_SYMBOL(ieee80211_check_mic); + #ifdef IEEE80211_DEBUG /* * Debugging support. diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.c madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.c --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_linux.c 2007-05-21 17:53:39.000000000 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_linux.c 2007-05-26 18:51:09.549635776 +0200 @@ -311,8 +311,8 @@ /* TODO: needed parameters: count, keyid, key type, src address, TSC */ snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag, - keyix, IEEE80211_IS_MULTICAST(wh->i_addr1) ? "broad" : "uni", - ether_sprintf(wh->i_addr1)); + keyix, IEEE80211_IS_MULTICAST(wh->i_addr2) ? "broad" : "uni", + ether_sprintf(wh->i_addr2)); memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = strlen(buf); wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf); diff -urN madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h --- madwifi-ng-r2377-20070526.old/net80211/ieee80211_proto.h 2007-05-26 18:51:09.321670432 +0200 +++ madwifi-ng-r2377-20070526.dev/net80211/ieee80211_proto.h 2007-05-26 18:51:09.549635776 +0200 @@ -91,6 +91,7 @@ void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode); enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *); void ieee80211_send_pspoll(struct ieee80211_node *); +void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *); /* * Return the size of the 802.11 header for a management or data frame.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 13:42:04 +0000