mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
A few simple fixes:
* fix FILS AEAD cipher usage to use the correct AAD vectors and to use synchronous algorithms * fix using mesh HT operation data from userspace * fix adding mesh vendor elements to beacons & plink frames -----BEGIN PGP SIGNATURE----- iQIcBAABCgAGBQJYmCBmAAoJEGt7eEactAAd5BAP/2oPaRDgJv0ByqoFPh0pzKqx RwoXOW9xqtp+wWFA8hPTe2niVtNpexwo4ZQ2I2hkjeomFfbw0gwklBFQQ0Vbq5b9 6UtClEBHp/xW5vdvooBwMAcUBJQMM25wIFt2jwz9xRIUxjiOisZBIp7avLTtoQKC +hsNJOWOmyeJYLXdeJVaJM953dANCKdzL590JX3f6tbr8LPpszrg8TmVLJWklTYQ Cm2latv0GezxL/d+KcSWbNoX+X+d5D0gVZXHmp5UFWX6yT0FMkNmSURmkHEfuiuD z11befXgvXAr3l7cxE/TEtrNCh57pwDoPtJmBqJ9G68aURK8iVb4XB/ZEB8hEvHi EchMXompYU/xPiGVbkb/wOFXlBY+xc85uoEwkSL1CZs4eX6r6JawrHG7RUcTKFsv V2zAQU0pDO29OcprHbjD+rnjrG2qtZ/pDKO7X5+eIgHvEzwaqZY3yd1YmJK52d67 J4slSS/jislTg+rbhFi8NrCONuRlp5rixjmHINUWCsilojrKeDh9thMYrVmXWZjT qjoOojMmiGH7ekhvSVDciRxoLgP9aIShuIvbub9uOPQAPXsVf3KHquSiY9JOpJI8 PpY3hPWQS6j2r5Q2pZu/LM345r0rcj5At1BzCzGqcfKxRUH7rbFDQQ1D3Moehzho Gqrkv2/p4FAAGFG+4bJ6 =ZzHl -----END PGP SIGNATURE----- Merge tag 'mac80211-for-davem-2017-02-06' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 Johannes Berg says: ==================== A few simple fixes: * fix FILS AEAD cipher usage to use the correct AAD vectors and to use synchronous algorithms * fix using mesh HT operation data from userspace * fix adding mesh vendor elements to beacons & plink frames ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
89389b4d55
3 changed files with 5 additions and 4 deletions
|
@ -124,7 +124,7 @@ static int aes_siv_encrypt(const u8 *key, size_t key_len,
|
|||
|
||||
/* CTR */
|
||||
|
||||
tfm2 = crypto_alloc_skcipher("ctr(aes)", 0, 0);
|
||||
tfm2 = crypto_alloc_skcipher("ctr(aes)", 0, CRYPTO_ALG_ASYNC);
|
||||
if (IS_ERR(tfm2)) {
|
||||
kfree(tmp);
|
||||
return PTR_ERR(tfm2);
|
||||
|
@ -183,7 +183,7 @@ static int aes_siv_decrypt(const u8 *key, size_t key_len,
|
|||
|
||||
/* CTR */
|
||||
|
||||
tfm2 = crypto_alloc_skcipher("ctr(aes)", 0, 0);
|
||||
tfm2 = crypto_alloc_skcipher("ctr(aes)", 0, CRYPTO_ALG_ASYNC);
|
||||
if (IS_ERR(tfm2))
|
||||
return PTR_ERR(tfm2);
|
||||
/* K2 for CTR */
|
||||
|
@ -272,7 +272,7 @@ int fils_encrypt_assoc_req(struct sk_buff *skb,
|
|||
crypt_len = skb->data + skb->len - encr;
|
||||
skb_put(skb, AES_BLOCK_SIZE);
|
||||
return aes_siv_encrypt(assoc_data->fils_kek, assoc_data->fils_kek_len,
|
||||
encr, crypt_len, 1, addr, len, encr);
|
||||
encr, crypt_len, 5, addr, len, encr);
|
||||
}
|
||||
|
||||
int fils_decrypt_assoc_resp(struct ieee80211_sub_if_data *sdata,
|
||||
|
|
|
@ -339,7 +339,7 @@ int mesh_add_vendor_ies(struct ieee80211_sub_if_data *sdata,
|
|||
/* fast-forward to vendor IEs */
|
||||
offset = ieee80211_ie_split_vendor(ifmsh->ie, ifmsh->ie_len, 0);
|
||||
|
||||
if (offset) {
|
||||
if (offset < ifmsh->ie_len) {
|
||||
len = ifmsh->ie_len - offset;
|
||||
data = ifmsh->ie + offset;
|
||||
if (skb_tailroom(skb) < len)
|
||||
|
|
|
@ -5916,6 +5916,7 @@ do { \
|
|||
break;
|
||||
}
|
||||
cfg->ht_opmode = ht_opmode;
|
||||
mask |= (1 << (NL80211_MESHCONF_HT_OPMODE - 1));
|
||||
}
|
||||
FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathToRootTimeout,
|
||||
1, 65535, mask,
|
||||
|
|
Loading…
Reference in a new issue