hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-27 11:20:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

net80211: add a possibility to retrieve current TX key without encapsulation.

Browse Source 
Submitted by:	<s3erios@gmail.com>
Differential Revision:	https://reviews.freebsd.org/D3639
This commit is contained in:
Adrian Chadd 2015-10-03 00:57:33 +00:00
parent c0cb93498d
commit 15395998e9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=288527
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/net80211/ieee80211_crypto.c
View File

@ -531,16 +531,11 @@ ieee80211_crypto_get_keyid(struct ieee80211vap *vap, struct ieee80211_key *k)
return (0);
}
/*
* Add privacy headers appropriate for the specified key.
*/
struct ieee80211_key *
ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m)
ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m)
{
struct ieee80211vap *vap = ni->ni_vap;
struct ieee80211_key *k;
struct ieee80211_frame *wh;
const struct ieee80211_cipher *cip;
/*
* Multicast traffic always uses the multicast key.
@ -559,12 +554,27 @@ ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m)
vap->iv_stats.is_tx_nodefkey++;
return NULL;
}
k = &vap->iv_nw_keys[vap->iv_def_txkey];
} else
k = &ni->ni_ucastkey;
return &vap->iv_nw_keys[vap->iv_def_txkey];
}
cip = k->wk_cipher;
return (cip->ic_encap(k, m) ? k : NULL);
return &ni->ni_ucastkey;
}
/*
* Add privacy headers appropriate for the specified key.
*/
struct ieee80211_key *
ieee80211_crypto_encap(struct ieee80211_node *ni, struct mbuf *m)
{
struct ieee80211_key *k;
const struct ieee80211_cipher *cip;
if ((k = ieee80211_crypto_get_txkey(ni, m)) != NULL) {
cip = k->wk_cipher;
return (cip->ic_encap(k, m) ? k : NULL);
}
return NULL;
}
/*

2
sys/net80211/ieee80211_crypto.h
View File

@ -195,6 +195,8 @@ int ieee80211_crypto_available(u_int cipher);
uint8_t ieee80211_crypto_get_keyid(struct ieee80211vap *vap,
struct ieee80211_key *k);
struct ieee80211_key *ieee80211_crypto_get_txkey(struct ieee80211_node *,
struct mbuf *);
struct ieee80211_key *ieee80211_crypto_encap(struct ieee80211_node *,
struct mbuf *);
struct ieee80211_key *ieee80211_crypto_decap(struct ieee80211_node *,