DPP2: PFS for PTK derivation

[thirdparty/hostap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index d5ce1fb17c7a06ca7c6e47b192be6210b6d2f1ba..0db6e551d3e769788e43aa7696642f1b33e3a2aa 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -504,9 +504,6 @@ struct wpa_supplicant {
 #ifdef CONFIG_MATCH_IFACE
        int matched;
 #endif /* CONFIG_MATCH_IFACE */
-#ifdef CONFIG_CTRL_IFACE_DBUS
-       char *dbus_path;
-#endif /* CONFIG_CTRL_IFACE_DBUS */
 #ifdef CONFIG_CTRL_IFACE_DBUS_NEW
        char *dbus_new_path;
        char *dbus_groupobj_path;
@@ -751,6 +748,10 @@ struct wpa_supplicant {
        unsigned int wnmsleep_used:1;
        unsigned int owe_transition_select:1;
        unsigned int owe_transition_search:1;
+       unsigned int connection_set:1;
+       unsigned int connection_ht:1;
+       unsigned int connection_vht:1;
+       unsigned int connection_he:1;
 
        struct os_reltime last_mac_addr_change;
        int last_mac_addr_style;
@@ -918,6 +919,7 @@ struct wpa_supplicant {
        unsigned int p2p_pd_before_go_neg:1;
        unsigned int p2p_go_ht40:1;
        unsigned int p2p_go_vht:1;
+       unsigned int p2p_go_he:1;
        unsigned int user_initiated_pd:1;
        unsigned int p2p_go_group_formation_completed:1;
        unsigned int group_formation_reported:1;
@@ -1234,6 +1236,9 @@ struct wpa_supplicant {
        unsigned int dpp_resp_wait_time;
        unsigned int dpp_resp_max_tries;
        unsigned int dpp_resp_retry_time;
+#ifdef CONFIG_DPP2
+       struct dpp_pfs *dpp_pfs;
+#endif /* CONFIG_DPP2 */
 #ifdef CONFIG_TESTING_OPTIONS
        char *dpp_config_obj_override;
        char *dpp_discovery_override;
@@ -1407,8 +1412,9 @@ enum chan_allowed {
 
 enum chan_allowed verify_channel(struct hostapd_hw_modes *mode, u8 channel,
                                 u8 bw);
-size_t wpas_supp_op_class_ie(struct wpa_supplicant *wpa_s, int freq, u8 *pos,
-                             size_t len);
+size_t wpas_supp_op_class_ie(struct wpa_supplicant *wpa_s,
+                            struct wpa_ssid *ssid,
+                            int freq, u8 *pos, size_t len);
 
 /**
  * wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response