projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ipv4: use the right lock for ping_group_range
[cascardo/linux.git]
/
net
/
mac80211
/
wpa.c
diff --git
a/net/mac80211/wpa.c
b/net/mac80211/wpa.c
index
b48c1e1
..
42ce9bd
100644
(file)
--- a/
net/mac80211/wpa.c
+++ b/
net/mac80211/wpa.c
@@
-405,7
+405,7
@@
static int ccmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb,
u8 *pos;
u8 pn[6];
u64 pn64;
u8 *pos;
u8 pn[6];
u64 pn64;
- u8 aad[
2 * AES_BLOCK_SIZE
];
+ u8 aad[
CCM_AAD_LEN
];
u8 b_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
u8 b_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
@@
-461,10
+461,8
@@
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);
pos += IEEE80211_CCMP_HDR_LEN;
ccmp_special_blocks(skb, pn, b_0, aad);
- ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
- skb_put(skb, mic_len), mic_len);
-
- return 0;
+ return ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
+ skb_put(skb, mic_len), mic_len);
}
}
@@
-639,7
+637,7
@@
static int gcmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
u8 *pos;
u8 pn[6];
u64 pn64;
u8 *pos;
u8 pn[6];
u64 pn64;
- u8 aad[
2 * AES_BLOCK_SIZE
];
+ u8 aad[
GCM_AAD_LEN
];
u8 j_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
u8 j_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
@@
-696,10
+694,8
@@
static int gcmp_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
pos += IEEE80211_GCMP_HDR_LEN;
gcmp_special_blocks(skb, pn, j_0, aad);
pos += IEEE80211_GCMP_HDR_LEN;
gcmp_special_blocks(skb, pn, j_0, aad);
- ieee80211_aes_gcm_encrypt(key->u.gcmp.tfm, j_0, aad, pos, len,
- skb_put(skb, IEEE80211_GCMP_MIC_LEN));
-
- return 0;
+ return ieee80211_aes_gcm_encrypt(key->u.gcmp.tfm, j_0, aad, pos, len,
+ skb_put(skb, IEEE80211_GCMP_MIC_LEN));
}
ieee80211_tx_result
}
ieee80211_tx_result
@@
-1123,9
+1119,9
@@
ieee80211_crypto_aes_gmac_encrypt(struct ieee80211_tx_data *tx)
struct ieee80211_key *key = tx->key;
struct ieee80211_mmie_16 *mmie;
struct ieee80211_hdr *hdr;
struct ieee80211_key *key = tx->key;
struct ieee80211_mmie_16 *mmie;
struct ieee80211_hdr *hdr;
- u8 aad[
20
];
+ u8 aad[
GMAC_AAD_LEN
];
u64 pn64;
u64 pn64;
- u8 nonce[
12
];
+ u8 nonce[
GMAC_NONCE_LEN
];
if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
return TX_DROP;
if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
return TX_DROP;
@@
-1171,7
+1167,7
@@
ieee80211_crypto_aes_gmac_decrypt(struct ieee80211_rx_data *rx)
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_key *key = rx->key;
struct ieee80211_mmie_16 *mmie;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
struct ieee80211_key *key = rx->key;
struct ieee80211_mmie_16 *mmie;
- u8 aad[
20], mic[16], ipn[6], nonce[12
];
+ u8 aad[
GMAC_AAD_LEN], mic[GMAC_MIC_LEN], ipn[6], nonce[GMAC_NONCE_LEN
];
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
if (!ieee80211_is_mgmt(hdr->frame_control))
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
if (!ieee80211_is_mgmt(hdr->frame_control))