aboutsummaryrefslogtreecommitdiff
path: root/net/mac80211/tkip.h
diff options
context:
space:
mode:
authorGravatar Ard Biesheuvel <ard.biesheuvel@linaro.org> 2019-06-12 18:19:54 +0200
committerGravatar Herbert Xu <herbert@gondor.apana.org.au> 2019-06-20 14:18:33 +0800
commit5fdb373570b2119abf00d909a277ebf4ea2c078f (patch)
treee3a3bef624eb183fdd36631f23a2ba2139436796 /net/mac80211/tkip.h
parentcrypto: arc4 - refactor arc4 core code into separate library (diff)
downloadlinux-5fdb373570b2119abf00d909a277ebf4ea2c078f.tar.gz
linux-5fdb373570b2119abf00d909a277ebf4ea2c078f.tar.bz2
linux-5fdb373570b2119abf00d909a277ebf4ea2c078f.zip
net/mac80211: move WEP handling to ARC4 library interface
The WEP code in the mac80211 subsystem currently uses the crypto API to access the arc4 (RC4) cipher, which is overly complicated, and doesn't really have an upside in this particular case, since ciphers are always synchronous and therefore always implemented in software. Given that we have no accelerated software implementations either, it is much more straightforward to invoke a generic library interface directly. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'net/mac80211/tkip.h')
-rw-r--r--net/mac80211/tkip.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
index a1bcbfbefe7c..798583056201 100644
--- a/net/mac80211/tkip.h
+++ b/net/mac80211/tkip.h
@@ -13,7 +13,7 @@
#include <linux/crypto.h>
#include "key.h"
-int ieee80211_tkip_encrypt_data(struct crypto_cipher *tfm,
+int ieee80211_tkip_encrypt_data(struct arc4_ctx *ctx,
struct ieee80211_key *key,
struct sk_buff *skb,
u8 *payload, size_t payload_len);
@@ -24,7 +24,7 @@ enum {
TKIP_DECRYPT_INVALID_KEYIDX = -2,
TKIP_DECRYPT_REPLAY = -3,
};
-int ieee80211_tkip_decrypt_data(struct crypto_cipher *tfm,
+int ieee80211_tkip_decrypt_data(struct arc4_ctx *ctx,
struct ieee80211_key *key,
u8 *payload, size_t payload_len, u8 *ta,
u8 *ra, int only_iv, int queue,