DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Set NL80211_ATTR_KEY_DEFAULT_TYPES based on set_key addr

Browse source 
This allows mac80211 to configure default keys properly for RSN IBSS
mode.
This commit is contained in:
Jouni Malinen 2011-01-09 19:54:50 +02:00
parent 0382097ef3
commit 60ea8187c9
1 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/drivers/driver_nl80211.c
View file

@ -2649,6 +2649,19 @@ static int wpa_driver_nl80211_set_key(const char *ifname, void *priv,
NLA_PUT_U32(msg, NL80211_ATTR_KEY_TYPE, NLA_PUT_U32(msg, NL80211_ATTR_KEY_TYPE,
NL80211_KEYTYPE_GROUP); NL80211_KEYTYPE_GROUP);
} }
} else if (addr && is_broadcast_ether_addr(addr)) {
struct nl_msg *types;
int err;
wpa_printf(MSG_DEBUG, " broadcast key");
types = nlmsg_alloc();
if (!types)
goto nla_put_failure;
NLA_PUT_FLAG(types, NL80211_KEY_DEFAULT_TYPE_MULTICAST);
err = nla_put_nested(msg, NL80211_ATTR_KEY_DEFAULT_TYPES,
types);
nlmsg_free(types);
if (err)
goto nla_put_failure;
} }
NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, key_idx); NLA_PUT_U8(msg, NL80211_ATTR_KEY_IDX, key_idx);
NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex); NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
@ -2682,6 +2695,31 @@ static int wpa_driver_nl80211_set_key(const char *ifname, void *priv,
NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT_MGMT); NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT_MGMT);
else else
NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT); NLA_PUT_FLAG(msg, NL80211_ATTR_KEY_DEFAULT);
if (addr && is_broadcast_ether_addr(addr)) {
struct nl_msg *types;
int err;
types = nlmsg_alloc();
if (!types)
goto nla_put_failure;
NLA_PUT_FLAG(types, NL80211_KEY_DEFAULT_TYPE_MULTICAST);
err = nla_put_nested(msg, NL80211_ATTR_KEY_DEFAULT_TYPES,
types);
nlmsg_free(types);
if (err)
goto nla_put_failure;
} else if (addr) {
struct nl_msg *types;
int err;
types = nlmsg_alloc();
if (!types)
goto nla_put_failure;
NLA_PUT_FLAG(types, NL80211_KEY_DEFAULT_TYPE_UNICAST);
err = nla_put_nested(msg, NL80211_ATTR_KEY_DEFAULT_TYPES,
types);
nlmsg_free(types);
if (err)
goto nla_put_failure;
}
ret = send_and_recv_msgs(drv, msg, NULL, NULL); ret = send_and_recv_msgs(drv, msg, NULL, NULL);
if (ret == -ENOENT) if (ret == -ENOENT)