Deleted Added
full compact
ieee80211_crypto.c (147870) ieee80211_crypto.c (148303)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 17 unchanged lines hidden (view full) ---

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 17 unchanged lines hidden (view full) ---

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_crypto.c 147870 2005-07-09 23:15:30Z sam $");
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_crypto.c 148303 2005-07-22 17:42:08Z sam $");
35
36/*
37 * IEEE 802.11 generic crypto support.
38 */
39#include <sys/param.h>
40#include <sys/mbuf.h>
41
42#include <sys/socket.h>

--- 495 unchanged lines hidden (view full) ---

538 * received frame that has the WEP/Privacy bit set.
539 */
540struct ieee80211_key *
541ieee80211_crypto_decap(struct ieee80211com *ic,
542 struct ieee80211_node *ni, struct mbuf *m, int hdrlen)
543{
544#define IEEE80211_WEP_HDRLEN (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN)
545#define IEEE80211_WEP_MINLEN \
35
36/*
37 * IEEE 802.11 generic crypto support.
38 */
39#include <sys/param.h>
40#include <sys/mbuf.h>
41
42#include <sys/socket.h>

--- 495 unchanged lines hidden (view full) ---

538 * received frame that has the WEP/Privacy bit set.
539 */
540struct ieee80211_key *
541ieee80211_crypto_decap(struct ieee80211com *ic,
542 struct ieee80211_node *ni, struct mbuf *m, int hdrlen)
543{
544#define IEEE80211_WEP_HDRLEN (IEEE80211_WEP_IVLEN + IEEE80211_WEP_KIDLEN)
545#define IEEE80211_WEP_MINLEN \
546 (sizeof(struct ieee80211_frame) + ETHER_HDR_LEN + \
546 (sizeof(struct ieee80211_frame) + \
547 IEEE80211_WEP_HDRLEN + IEEE80211_WEP_CRCLEN)
548 struct ieee80211_key *k;
549 struct ieee80211_frame *wh;
550 const struct ieee80211_cipher *cip;
551 const u_int8_t *ivp;
552 u_int8_t keyid;
553
554 /* NB: this minimum size data frame could be bigger */

--- 40 unchanged lines hidden ---
547 IEEE80211_WEP_HDRLEN + IEEE80211_WEP_CRCLEN)
548 struct ieee80211_key *k;
549 struct ieee80211_frame *wh;
550 const struct ieee80211_cipher *cip;
551 const u_int8_t *ivp;
552 u_int8_t keyid;
553
554 /* NB: this minimum size data frame could be bigger */

--- 40 unchanged lines hidden ---