127a128,130
> #ifndef CONFIG_FIPS
> #ifndef CONFIG_NO_RC4
>
207c210
< void ieee802_1x_tx_key(struct hostapd_data *hapd, struct sta_info *sta)
---
> static void ieee802_1x_tx_key(struct hostapd_data *hapd, struct sta_info *sta)
261a265,266
> #endif /* CONFIG_NO_RC4 */
> #endif /* CONFIG_FIPS */
262a268
>
349c355,356
< suite = wpa_cipher_to_suite((hapd->conf->wpa & 0x2) ?
---
> suite = wpa_cipher_to_suite(((hapd->conf->wpa & 0x2) ||
> hapd->conf->osen) ?
456c463
< if (hapd->conf->wpa && sta->wpa_sm &&
---
> if ((hapd->conf->wpa || hapd->conf->osen) && sta->wpa_sm &&
602c609
< if (eap && !radius_msg_add_eap(msg, eap, len)) {
---
> if (!radius_msg_add_eap(msg, eap, len)) {
1111,1112d1117
< int old_vlanid;
<
1126d1130
< old_vlanid = sta->vlan_id;
1128,1130c1132
< if (sta->ssid->dynamic_vlan == DYNAMIC_VLAN_DISABLED)
< sta->vlan_id = 0;
< ap_sta_bind_vlan(hapd, sta, old_vlanid);
---
> ap_sta_bind_vlan(hapd, sta);
1293c1295
< u8 *class;
---
> u8 *attr_class;
1315c1317
< class = NULL;
---
> attr_class = NULL;
1319,1320c1321,1322
< &class, &class_len,
< class) < 0) {
---
> &attr_class, &class_len,
> attr_class) < 0) {
1330c1332
< os_memcpy(nclass[nclass_count].data, class, class_len);
---
> os_memcpy(nclass[nclass_count].data, attr_class, class_len);
1593c1595
< int session_timeout_set, old_vlanid = 0;
---
> int session_timeout_set, vlan_id = 0;
1660,1661c1662,1663
< if (sta->ssid->dynamic_vlan == DYNAMIC_VLAN_DISABLED)
< sta->vlan_id = 0;
---
> if (hapd->conf->ssid.dynamic_vlan == DYNAMIC_VLAN_DISABLED)
> vlan_id = 0;
1663,1668c1665,1668
< else {
< old_vlanid = sta->vlan_id;
< sta->vlan_id = radius_msg_get_vlanid(msg);
< }
< if (sta->vlan_id > 0 &&
< hostapd_vlan_id_valid(hapd->conf->vlan, sta->vlan_id)) {
---
> else
> vlan_id = radius_msg_get_vlanid(msg);
> if (vlan_id > 0 &&
> hostapd_vlan_id_valid(hapd->conf->vlan, vlan_id)) {
1672,1673c1672,1673
< "VLAN ID %d", sta->vlan_id);
< } else if (sta->ssid->dynamic_vlan == DYNAMIC_VLAN_REQUIRED) {
---
> "VLAN ID %d", vlan_id);
> } else if (vlan_id > 0) {
1675a1676,1684
> HOSTAPD_MODULE_RADIUS,
> HOSTAPD_LEVEL_INFO,
> "Invalid VLAN ID %d received from RADIUS server",
> vlan_id);
> break;
> } else if (hapd->conf->ssid.dynamic_vlan ==
> DYNAMIC_VLAN_REQUIRED) {
> sta->eapol_sm->authFail = TRUE;
> hostapd_logger(hapd, sta->addr,
1684c1693,1695
< if (ap_sta_bind_vlan(hapd, sta, old_vlanid) < 0)
---
> sta->vlan_id = vlan_id;
> if ((sta->flags & WLAN_STA_ASSOC) &&
> ap_sta_bind_vlan(hapd, sta) < 0)
1928a1940
> int rv = -1;
1932c1944
< return -1;
---
> goto out;
1944c1956
< return -1;
---
> goto out;
1953a1966
> rv = 0;
1955c1968,1972
< return 0;
---
> out:
> if (rv)
> wpa_printf(MSG_DEBUG, "%s: Failed to find user", __func__);
>
> return rv;
2014a2032,2033
> #ifndef CONFIG_FIPS
> #ifndef CONFIG_NO_RC4
2017a2037,2038
> #endif /* CONFIG_NO_RC4 */
> #endif /* CONFIG_FIPS */
2087a2109
> conf.tls_session_lifetime = hapd->conf->tls_session_lifetime;
2335c2357
< static const char * bool_txt(Boolean bool)
---
> static const char * bool_txt(Boolean val)
2337c2359
< return bool ? "TRUE" : "FALSE";
---
> return val ? "TRUE" : "FALSE";