diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-10 14:31:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-10 14:31:51 -0500 |
| commit | 0d2164af2696821b27b04bebd8420b0e881bf44d (patch) | |
| tree | 3da988896640ff47a47d7d1c5a6407a902c184e2 /net/mac80211/aes_cmac.h | |
| parent | 1deeaa0b86973bef6629396cc0f5f092872bb6de (diff) | |
| parent | f181d6a3bcc35633facf5f3925699021c13492c5 (diff) | |
| download | linux-stable-0d2164af2696821b27b04bebd8420b0e881bf44d.tar.gz linux-stable-0d2164af2696821b27b04bebd8420b0e881bf44d.tar.bz2 linux-stable-0d2164af2696821b27b04bebd8420b0e881bf44d.zip | |
Merge tag 'mac80211-next-for-davem-2017-02-09' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
Some more updates:
* use shash in mac80211 crypto code where applicable
* some documentation fixes
* pass RSSI levels up in change notifications
* remove unused rfkill-regulator
* various other cleanups
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/aes_cmac.h')
| -rw-r--r-- | net/mac80211/aes_cmac.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/net/mac80211/aes_cmac.h b/net/mac80211/aes_cmac.h index c827e1d5de8b..fef531f42003 100644 --- a/net/mac80211/aes_cmac.h +++ b/net/mac80211/aes_cmac.h @@ -10,17 +10,14 @@ #define AES_CMAC_H #include <linux/crypto.h> +#include <crypto/hash.h> -void gf_mulx(u8 *pad); -void aes_cmac_vector(struct crypto_cipher *tfm, size_t num_elem, - const u8 *addr[], const size_t *len, u8 *mac, - size_t mac_len); -struct crypto_cipher *ieee80211_aes_cmac_key_setup(const u8 key[], - size_t key_len); -void ieee80211_aes_cmac(struct crypto_cipher *tfm, const u8 *aad, +struct crypto_shash *ieee80211_aes_cmac_key_setup(const u8 key[], + size_t key_len); +void ieee80211_aes_cmac(struct crypto_shash *tfm, const u8 *aad, const u8 *data, size_t data_len, u8 *mic); -void ieee80211_aes_cmac_256(struct crypto_cipher *tfm, const u8 *aad, +void ieee80211_aes_cmac_256(struct crypto_shash *tfm, const u8 *aad, const u8 *data, size_t data_len, u8 *mic); -void ieee80211_aes_cmac_key_free(struct crypto_cipher *tfm); +void ieee80211_aes_cmac_key_free(struct crypto_shash *tfm); #endif /* AES_CMAC_H */ |