diff options
| author | Xiang Gao <qasdfgtyuiop@gmail.com> | 2017-10-10 22:31:49 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-10-11 09:37:35 +0200 |
| commit | 4133da73067af0417c623eb4ad5e85081ccbf4b4 (patch) | |
| tree | 86ca2fa1fd06c84662778f34b8de6d01e3c9ede4 /net/mac80211/wpa.c | |
| parent | 8c03145a2e2d98d44dba4bf16ab34636eb60b834 (diff) | |
| download | blackbird-op-linux-4133da73067af0417c623eb4ad5e85081ccbf4b4.tar.gz blackbird-op-linux-4133da73067af0417c623eb4ad5e85081ccbf4b4.zip | |
mac80211: aead api to reduce redundancy
Currently, the aes_ccm.c and aes_gcm.c are almost line by line copy of
each other. This patch reduce code redundancy by moving the code in these
two files to crypto/aead_api.c to make it a higher level aead api. The
file aes_ccm.c and aes_gcm.c are removed and all the functions there are
now implemented in their headers using the newly added aead api.
Signed-off-by: Xiang Gao <qasdfgtyuiop@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/wpa.c')
| -rw-r--r-- | net/mac80211/wpa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 0d722ea98a1b..b58722d9de37 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -464,7 +464,7 @@ static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb, pos += IEEE80211_CCMP_HDR_LEN; ccmp_special_blocks(skb, pn, b_0, aad); return ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len, - skb_put(skb, mic_len), mic_len); + skb_put(skb, mic_len)); } @@ -543,7 +543,7 @@ ieee80211_crypto_ccmp_decrypt(struct ieee80211_rx_data *rx, key->u.ccmp.tfm, b_0, aad, skb->data + hdrlen + IEEE80211_CCMP_HDR_LEN, data_len, - skb->data + skb->len - mic_len, mic_len)) + skb->data + skb->len - mic_len)) return RX_DROP_UNUSABLE; } |
