diff options
| author | David S. Miller <davem@davemloft.net> | 2015-08-18 00:25:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-08-18 00:25:04 +0300 |
| commit | 2bd736fa0d8a1da90e6ccaa6a79e56a8d2ae60c4 (patch) | |
| tree | d855a6972df023eeef682498be454f1dedc638c1 /net/mac80211/aes_cmac.c | |
| parent | 90eb7fa51ccb9af58c437581af73c4a1d5fd2b9f (diff) | |
| parent | 8f9c98df949333f08b74e5df1caacf7e2c5e8552 (diff) | |
| download | linux-2bd736fa0d8a1da90e6ccaa6a79e56a8d2ae60c4.tar.xz | |
Merge tag 'mac80211-next-for-davem-2015-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Another pull request for the next cycle, this time with quite
a bit of content:
* mesh fixes/improvements from Alexis, Bob, Chun-Yeow and Jesse
* TDLS higher bandwidth support (Arik)
* OCB fixes from Bertold Van den Bergh
* suspend/resume fixes from Eliad
* dynamic SMPS support for minstrel-HT (Krishna Chaitanya)
* VHT bitrate mask support (Lorenzo Bianconi)
* better regulatory support for 5/10 MHz channels (Matthias May)
* basic support for MU-MIMO to avoid the multi-vif issue (Sara Sharon)
along with a number of other cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/aes_cmac.c')
| -rw-r--r-- | net/mac80211/aes_cmac.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/net/mac80211/aes_cmac.c b/net/mac80211/aes_cmac.c index 4192806be3d3..bdf0790d89cc 100644 --- a/net/mac80211/aes_cmac.c +++ b/net/mac80211/aes_cmac.c @@ -145,20 +145,3 @@ void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm) { crypto_free_cipher(tfm); } - -void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf, - u8 *k1, u8 *k2) -{ - u8 l[AES_BLOCK_SIZE] = {}; - struct ieee80211_key *key = - container_of(keyconf, struct ieee80211_key, conf); - - crypto_cipher_encrypt_one(key->u.aes_cmac.tfm, l, l); - - memcpy(k1, l, AES_BLOCK_SIZE); - gf_mulx(k1); - - memcpy(k2, k1, AES_BLOCK_SIZE); - gf_mulx(k2); -} -EXPORT_SYMBOL(ieee80211_aes_cmac_calculate_k1_k2); |