X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fmac80211%2Ftkip.h;h=d4714383f5fce5a3f5216f30669b669b8a11c1aa;hb=6ef307bc561911c8cdda98ef3896b5982b602a43;hp=1fa0bb4dba3c7e7d2a6cfcca92f0e68aad6de0fe;hpb=63fe46da9c380b3f2bbdf3765044649517cc717c;p=linux-2.6 diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h index 1fa0bb4dba..d4714383f5 100644 --- a/net/mac80211/tkip.h +++ b/net/mac80211/tkip.h @@ -13,12 +13,8 @@ #include #include "key.h" -u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, - u8 iv0, u8 iv1, u8 iv2); -void ieee80211_tkip_gen_phase1key(struct ieee80211_key *key, u8 *ta, - u16 *phase1key); -void ieee80211_tkip_gen_rc4key(struct ieee80211_key *key, u8 *ta, - u8 *rc4key); +u8 *ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key, u16 iv16); + void ieee80211_tkip_encrypt_data(struct crypto_blkcipher *tfm, struct ieee80211_key *key, u8 *pos, size_t payload_len, u8 *ta);