diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-18 14:26:15 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-18 14:26:15 (GMT) |
| commit | 5cbee5573604e6c6170911bdfb78e2a0e6aa142e (patch) | |
| tree | 012d8ce83e9410345be68146bb155159ae629713 /net/mac80211/aes_ccm.h | |
| parent | 6bc80629eefc3731f5881092bed610d994e05763 (diff) | |
| parent | f4a067f9ffca603b45f7e82ddd2ba50e5904cea3 (diff) | |
| download | linux-5cbee5573604e6c6170911bdfb78e2a0e6aa142e.tar.xz | |
Merge tag 'mac80211-for-davem-2016-10-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
This is relatively small, mostly to get the SG/crypto
from stack removal fix that crashes things when VMAP
stack is used in conjunction with software crypto.
Aside from that, we have:
* a fix for AP_VLAN usage with the nl80211 frame command
* two fixes (and two preparation patches) for A-MSDU, one
to discard group-addressed (multicast) and unexpected
4-address A-MSDUs, the other to validate A-MSDU inner
MAC addresses properly to prevent controlled port bypass
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/aes_ccm.h')
| -rw-r--r-- | net/mac80211/aes_ccm.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/aes_ccm.h b/net/mac80211/aes_ccm.h index 6a73d1e..fcd3254 100644 --- a/net/mac80211/aes_ccm.h +++ b/net/mac80211/aes_ccm.h @@ -12,12 +12,14 @@ #include <linux/crypto.h> +#define CCM_AAD_LEN 32 + struct crypto_aead *ieee80211_aes_key_setup_encrypt(const u8 key[], size_t key_len, size_t mic_len); -void ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, - u8 *data, size_t data_len, u8 *mic, - size_t mic_len); +int ieee80211_aes_ccm_encrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, + u8 *data, size_t data_len, u8 *mic, + size_t mic_len); int ieee80211_aes_ccm_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, u8 *data, size_t data_len, u8 *mic, size_t mic_len); |