diff --git a/src/netdev.c b/src/netdev.c index 2f1540b5..2baa12bd 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -51,7 +51,6 @@ #include "src/device.h" #include "src/scan.h" #include "src/netdev.h" -#include "src/wscutil.h" #include "src/ft.h" #include "src/util.h" #include "src/watchlist.h" @@ -2510,58 +2509,6 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss, event_filter, cb, user_data); } -int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss, - struct handshake_state *hs, - netdev_event_func_t event_filter, - netdev_connect_cb_t cb, - netdev_eapol_event_func_t eapol_cb, - void *user_data) -{ - struct l_genl_msg *cmd_connect; - struct wsc_association_request request; - uint8_t *pdu; - size_t pdu_len; - void *ie; - size_t ie_len; - struct eapol_sm *sm; - - if (netdev->type != NL80211_IFTYPE_STATION && - netdev->type != NL80211_IFTYPE_P2P_CLIENT) - return -ENOTSUP; - - if (netdev->connected) - return -EISCONN; - - cmd_connect = netdev_build_cmd_connect(netdev, bss, hs, NULL, NULL, 0); - if (!cmd_connect) - return -EINVAL; - - request.version2 = true; - request.request_type = WSC_REQUEST_TYPE_ENROLLEE_OPEN_8021X; - - pdu = wsc_build_association_request(&request, &pdu_len); - if (!pdu) - goto error; - - ie = ie_tlv_encapsulate_wsc_payload(pdu, pdu_len, &ie_len); - l_free(pdu); - - if (!ie) - goto error; - - l_genl_msg_append_attr(cmd_connect, NL80211_ATTR_IE, ie_len, ie); - l_free(ie); - - sm = eapol_sm_new(hs); - - return netdev_connect_common(netdev, cmd_connect, bss, hs, sm, - event_filter, cb, user_data); - -error: - l_genl_msg_unref(cmd_connect); - return -ENOMEM; -} - int netdev_disconnect(struct netdev *netdev, netdev_disconnect_cb_t cb, void *user_data) { diff --git a/src/netdev.h b/src/netdev.h index 9ca2d1e6..94c74245 100644 --- a/src/netdev.h +++ b/src/netdev.h @@ -107,9 +107,6 @@ typedef void (*netdev_watch_func_t)(struct netdev *netdev, enum netdev_watch_event event, void *user_data); typedef void (*netdev_destroy_func_t)(void *user_data); -typedef void (*netdev_eapol_event_func_t)(unsigned int event, - const void *event_data, - void *user_data); typedef void (*netdev_neighbor_report_cb_t)(struct netdev *netdev, int err, const uint8_t *reports, size_t reports_len, void *user_data); @@ -150,12 +147,6 @@ int netdev_connect(struct netdev *netdev, struct scan_bss *bss, size_t num_vendor_ies, netdev_event_func_t event_filter, netdev_connect_cb_t cb, void *user_data); -int netdev_connect_wsc(struct netdev *netdev, struct scan_bss *bss, - struct handshake_state *hs, - netdev_event_func_t event_filter, - netdev_connect_cb_t cb, - netdev_eapol_event_func_t eapol_cb, - void *user_data); int netdev_disconnect(struct netdev *netdev, netdev_disconnect_cb_t cb, void *user_data); int netdev_reassociate(struct netdev *netdev, struct scan_bss *target_bss,