system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 01:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

add force flag to enmic/demic crypto api for use in xmit fragmentation

Browse source 
and h/w mic verification

Reviewed by:	avatar
This commit is contained in:
Sam Leffler 2005-06-06 04:04:38 +00:00
parent f67f6dd220
commit 96d8846397
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=147045
7 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/net80211/ieee80211_crypto.h
View file

@ -161,8 +161,8 @@ struct ieee80211_cipher {
int (*ic_encap)(struct ieee80211_key *, struct mbuf *,
u_int8_t keyid);
int (*ic_decap)(struct ieee80211_key *, struct mbuf *);
int (*ic_enmic)(struct ieee80211_key *, struct mbuf *);
int (*ic_demic)(struct ieee80211_key *, struct mbuf *);
int (*ic_enmic)(struct ieee80211_key *, struct mbuf *, int);
int (*ic_demic)(struct ieee80211_key *, struct mbuf *, int);
};
extern const struct ieee80211_cipher ieee80211_cipher_none;
@ -180,10 +180,10 @@ struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211com *,
*/
static __inline int
ieee80211_crypto_demic(struct ieee80211com *ic, struct ieee80211_key *k,
struct mbuf *m)
struct mbuf *m, int force)
{
const struct ieee80211_cipher *cip = k->wk_cipher;
return (cip->ic_miclen > 0 ? cip->ic_demic(k, m) : 1);
return (cip->ic_miclen > 0 ? cip->ic_demic(k, m, force) : 1);
}
/*
@ -191,10 +191,10 @@ ieee80211_crypto_demic(struct ieee80211com *ic, struct ieee80211_key *k,
*/
static __inline int
ieee80211_crypto_enmic(struct ieee80211com *ic,
struct ieee80211_key *k, struct mbuf *m)
struct ieee80211_key *k, struct mbuf *m, int force)
{
const struct ieee80211_cipher *cip = k->wk_cipher;
return (cip->ic_miclen > 0 ? cip->ic_enmic(k, m) : 1);
return (cip->ic_miclen > 0 ? cip->ic_enmic(k, m, force) : 1);
}
/*

8
sys/net80211/ieee80211_crypto_ccmp.c
View file

@ -68,8 +68,8 @@ static void ccmp_detach(struct ieee80211_key *);
static int ccmp_setkey(struct ieee80211_key *);
static int ccmp_encap(struct ieee80211_key *k, struct mbuf *, u_int8_t keyid);
static int ccmp_decap(struct ieee80211_key *, struct mbuf *);
static int ccmp_enmic(struct ieee80211_key *, struct mbuf *);
static int ccmp_demic(struct ieee80211_key *, struct mbuf *);
static int ccmp_enmic(struct ieee80211_key *, struct mbuf *, int);
static int ccmp_demic(struct ieee80211_key *, struct mbuf *, int);
static const struct ieee80211_cipher ccmp = {
.ic_name = "AES-CCM",
@ -177,7 +177,7 @@ ccmp_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid)
* Add MIC to the frame as needed.
*/
static int
ccmp_enmic(struct ieee80211_key *k, struct mbuf *m)
ccmp_enmic(struct ieee80211_key *k, struct mbuf *m, int force)
{
return 1;
@ -262,7 +262,7 @@ ccmp_decap(struct ieee80211_key *k, struct mbuf *m)
* Verify and strip MIC from the frame.
*/
static int
ccmp_demic(struct ieee80211_key *k, struct mbuf *m)
ccmp_demic(struct ieee80211_key *k, struct mbuf *m, int force)
{
return 1;
}

8
sys/net80211/ieee80211_crypto_none.c
View file

@ -53,8 +53,8 @@ static void none_detach(struct ieee80211_key *);
static int none_setkey(struct ieee80211_key *);
static int none_encap(struct ieee80211_key *, struct mbuf *, u_int8_t);
static int none_decap(struct ieee80211_key *, struct mbuf *);
static int none_enmic(struct ieee80211_key *, struct mbuf *);
static int none_demic(struct ieee80211_key *, struct mbuf *);
static int none_enmic(struct ieee80211_key *, struct mbuf *, int);
static int none_demic(struct ieee80211_key *, struct mbuf *, int);
const struct ieee80211_cipher ieee80211_cipher_none = {
.ic_name = "NONE",
@ -131,7 +131,7 @@ none_decap(struct ieee80211_key *k, struct mbuf *m)
}
static int
none_enmic(struct ieee80211_key *k, struct mbuf *m)
none_enmic(struct ieee80211_key *k, struct mbuf *m, int force)
{
struct ieee80211com *ic = k->wk_private;
@ -140,7 +140,7 @@ none_enmic(struct ieee80211_key *k, struct mbuf *m)
}
static int
none_demic(struct ieee80211_key *k, struct mbuf *m)
none_demic(struct ieee80211_key *k, struct mbuf *m, int force)
{
struct ieee80211com *ic = k->wk_private;

12
sys/net80211/ieee80211_crypto_tkip.c
View file

@ -59,9 +59,9 @@ static void *tkip_attach(struct ieee80211com *, struct ieee80211_key *);
static void tkip_detach(struct ieee80211_key *);
static int tkip_setkey(struct ieee80211_key *);
static int tkip_encap(struct ieee80211_key *, struct mbuf *m, u_int8_t keyid);
static int tkip_enmic(struct ieee80211_key *, struct mbuf *);
static int tkip_enmic(struct ieee80211_key *, struct mbuf *, int);
static int tkip_decap(struct ieee80211_key *, struct mbuf *);
static int tkip_demic(struct ieee80211_key *, struct mbuf *);
static int tkip_demic(struct ieee80211_key *, struct mbuf *, int);
static const struct ieee80211_cipher tkip = {
.ic_name = "TKIP",
@ -209,11 +209,11 @@ tkip_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid)
* Add MIC to the frame as needed.
*/
static int
tkip_enmic(struct ieee80211_key *k, struct mbuf *m)
tkip_enmic(struct ieee80211_key *k, struct mbuf *m, int force)
{
struct tkip_ctx *ctx = k->wk_private;
if (k->wk_flags & IEEE80211_KEY_SWMIC) {
if (force || (k->wk_flags & IEEE80211_KEY_SWMIC)) {
struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *);
struct ieee80211com *ic = ctx->tc_ic;
int hdrlen;
@ -321,11 +321,11 @@ tkip_decap(struct ieee80211_key *k, struct mbuf *m)
* Verify and strip MIC from the frame.
*/
static int
tkip_demic(struct ieee80211_key *k, struct mbuf *m)
tkip_demic(struct ieee80211_key *k, struct mbuf *m, int force)
{
struct tkip_ctx *ctx = k->wk_private;
if (k->wk_flags & IEEE80211_KEY_SWMIC) {
if (force || (k->wk_flags & IEEE80211_KEY_SWMIC)) {
struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *);
int hdrlen = ieee80211_hdrsize(wh);
u8 mic[IEEE80211_WEP_MICLEN];

8
sys/net80211/ieee80211_crypto_wep.c
View file

@ -56,8 +56,8 @@ static void wep_detach(struct ieee80211_key *);
static int wep_setkey(struct ieee80211_key *);
static int wep_encap(struct ieee80211_key *, struct mbuf *, u_int8_t keyid);
static int wep_decap(struct ieee80211_key *, struct mbuf *);
static int wep_enmic(struct ieee80211_key *, struct mbuf *);
static int wep_demic(struct ieee80211_key *, struct mbuf *);
static int wep_enmic(struct ieee80211_key *, struct mbuf *, int);
static int wep_demic(struct ieee80211_key *, struct mbuf *, int);
static const struct ieee80211_cipher wep = {
.ic_name = "WEP",
@ -193,7 +193,7 @@ wep_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid)
* Add MIC to the frame as needed.
*/
static int
wep_enmic(struct ieee80211_key *k, struct mbuf *m)
wep_enmic(struct ieee80211_key *k, struct mbuf *m, int force)
{
return 1;
@ -242,7 +242,7 @@ wep_decap(struct ieee80211_key *k, struct mbuf *m)
* Verify and strip MIC from the frame.
*/
static int
wep_demic(struct ieee80211_key *k, struct mbuf *skb)
wep_demic(struct ieee80211_key *k, struct mbuf *skb, int force)
{
return 1;
}

2
sys/net80211/ieee80211_input.c
View file

@ -429,7 +429,7 @@ ieee80211_input(struct ieee80211com *ic, struct mbuf *m,
/*
* Next strip any MSDU crypto bits.
*/
if (key != NULL && !ieee80211_crypto_demic(ic, key, m)) {
if (key != NULL && !ieee80211_crypto_demic(ic, key, m, 0)) {
IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_INPUT,
ni->ni_macaddr, "data", "%s", "demic error");
IEEE80211_NODE_STAT(ni, rx_demicfail);

2
sys/net80211/ieee80211_output.c
View file

@ -567,7 +567,7 @@ ieee80211_encap(struct ieee80211com *ic, struct mbuf *m,
!KEY_UNDEFINED(*key) : !KEY_UNDEFINED(ni->ni_ucastkey)))) {
wh->i_fc[1] |= IEEE80211_FC1_WEP;
/* XXX do fragmentation */
if (!ieee80211_crypto_enmic(ic, key, m)) {
if (!ieee80211_crypto_enmic(ic, key, m, 0)) {
IEEE80211_DPRINTF(ic, IEEE80211_MSG_OUTPUT,
"[%s] enmic failed, discard frame\n",
ether_sprintf(eh.ether_dhost));