projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: update to backports-4.14-rc2
[openwrt/staging/chunkeey.git]
/
package
/
kernel
/
mac80211
/
patches
/
100-remove-cryptoapi-dependencies.patch
diff --git
a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
index 95fea441a4f2d3dffc7ea08d9ce03412d08e352b..263be3e209f4d9ca50b82b137fbcb44073fb76d2 100644
(file)
--- a/
package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
+++ b/
package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
@@
-6,9
+6,9
@@
depends on CRYPTO_AES
- select BPAUTO_CRYPTO_CCM
- depends on CRYPTO_GCM
depends on CRYPTO_AES
- select BPAUTO_CRYPTO_CCM
- depends on CRYPTO_GCM
+ depends on CRYPTO_CMAC
depends on CRC32
---help---
depends on CRC32
---help---
- This option enables the hardware independent IEEE 802.11
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -16,9 +16,7 @@ mac80211-y := \
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -16,9 +16,7 @@ mac80211-y := \
@@
-275,7
+275,7
@@
struct {
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
struct {
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
-@@ -30
5,7 +305
,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
+@@ -30
6,7 +306
,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
}
}
@@
-285,7
+285,7
@@
{
__le16 mask_fc;
int a4_included, mgmt;
{
__le16 mask_fc;
int a4_included, mgmt;
-@@ -33
5,14 +336
,8 @@ static void ccmp_special_blocks(struct s
+@@ -33
6,14 +337
,8 @@ static void ccmp_special_blocks(struct s
else
qos_tid = 0;
else
qos_tid = 0;
@@
-302,7
+302,7
@@
/* Nonce: Nonce Flags | A2 | PN
* Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
/* Nonce: Nonce Flags | A2 | PN
* Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
-@@ -35
0,6 +345
,8 @@ static void ccmp_special_blocks(struct s
+@@ -35
1,6 +346
,8 @@ static void ccmp_special_blocks(struct s
b_0[1] = qos_tid | (mgmt << 4);
memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
b_0[1] = qos_tid | (mgmt << 4);
memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
@@
-311,7
+311,7
@@
/* AAD (extra authenticate-only data) / masked 802.11 header
* FC | A1 | A2 | A3 | SC | [A4] | [QC] */
/* AAD (extra authenticate-only data) / masked 802.11 header
* FC | A1 | A2 | A3 | SC | [A4] | [QC] */
-@@ -40
6,7 +403
,7 @@ static int ccmp_encrypt_skb(struct ieee8
+@@ -40
7,7 +404
,7 @@ static int ccmp_encrypt_skb(struct ieee8
u8 *pos;
u8 pn[6];
u64 pn64;
u8 *pos;
u8 pn[6];
u64 pn64;
@@
-320,7
+320,7
@@
u8 b_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
u8 b_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
-@@ -46
1,9 +458
,11 @@ static int ccmp_encrypt_skb(struct ieee8
+@@ -46
2,9 +459
,11 @@ static int ccmp_encrypt_skb(struct ieee8
return 0;
pos += IEEE80211_CCMP_HDR_LEN;
return 0;
pos += IEEE80211_CCMP_HDR_LEN;
@@
-335,7
+335,7
@@
}
}
-@@ -53
6,7 +535
,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
+@@ -53
7,7 +536
,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
u8 aad[2 * AES_BLOCK_SIZE];
u8 b_0[AES_BLOCK_SIZE];
/* hardware didn't decrypt/verify MIC */
u8 aad[2 * AES_BLOCK_SIZE];
u8 b_0[AES_BLOCK_SIZE];
/* hardware didn't decrypt/verify MIC */
@@
-344,7
+344,7
@@
if (ieee80211_aes_ccm_decrypt(
key->u.ccmp.tfm, b_0, aad,
if (ieee80211_aes_ccm_decrypt(
key->u.ccmp.tfm, b_0, aad,
-@@ -63
8,7 +637
,7 @@ static int gcmp_encrypt_skb(struct ieee8
+@@ -63
9,7 +638
,7 @@ static int gcmp_encrypt_skb(struct ieee8
u8 *pos;
u8 pn[6];
u64 pn64;
u8 *pos;
u8 pn[6];
u64 pn64;
@@
-353,7
+353,7
@@
u8 j_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
u8 j_0[AES_BLOCK_SIZE];
if (info->control.hw_key &&
-@@ -69
5,8 +694
,10 @@ static int gcmp_encrypt_skb(struct ieee8
+@@ -69
6,8 +695
,10 @@ static int gcmp_encrypt_skb(struct ieee8
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);
@@
-366,7
+366,7
@@
}
ieee80211_tx_result
}
ieee80211_tx_result
-@@ -112
0,9 +1121
,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct
+@@ -112
1,9 +1122
,9 @@ ieee80211_crypto_aes_gmac_encrypt(struct
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;
@@
-378,7
+378,7
@@
if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
return TX_DROP;
if (WARN_ON(skb_queue_len(&tx->skbs) != 1))
return TX_DROP;
-@@ -116
8,7 +1169
,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct
+@@ -116
9,7 +1170
,7 @@ ieee80211_crypto_aes_gmac_decrypt(struct
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;