Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guard WPA Enterprise support #10616

Merged
merged 5 commits into from
Nov 20, 2024
Merged

Guard WPA Enterprise support #10616

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e93ab6
Guard WPA Enterprise support
Jason2866 Nov 18, 2024
3706fcf
guard `WIFI_ENTERPRISE_SUPPORT`
Jason2866 Nov 18, 2024
d31f2da
wrong part guarded
Jason2866 Nov 18, 2024
5cb6b50
fix guard start and end
Jason2866 Nov 19, 2024
1f97325
add guard enterprise
Jason2866 Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libraries/WiFi/src/STA.cpp
View file
Original file line number Diff line number Diff line change
@@ -421,6 +421,7 @@ bool STAClass::connect(const char *ssid, const char *passphrase, int32_t channel
return true;
}

#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
/**
* Start Wifi connection with a WPA2 Enterprise AP
* if passphrase is set the most secure supported mode will be automatically selected
@@ -519,6 +520,7 @@ bool STAClass::connect(

return connect(wpa2_ssid, NULL, channel, bssid, tryConnect); //connect to wifi
}
#endif /* CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT */

bool STAClass::disconnect(bool eraseap, unsigned long timeout) {
if (eraseap) {
2 changes: 2 additions & 0 deletions libraries/WiFi/src/WiFiSTA.cpp
View file
Original file line number Diff line number Diff line change
@@ -63,6 +63,7 @@ wl_status_t WiFiSTAClass::status() {
return STA.status();
}

#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
wl_status_t WiFiSTAClass::begin(
const char *wpa2_ssid, wpa2_auth_method_t method, const char *wpa2_identity, const char *wpa2_username, const char *wpa2_password, const char *ca_pem,
const char *client_crt, const char *client_key, int ttls_phase2_type, int32_t channel, const uint8_t *bssid, bool connect
@@ -77,6 +78,7 @@ wl_status_t WiFiSTAClass::begin(

return STA.status();
}
#endif /* CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT */

wl_status_t WiFiSTAClass::begin(const char *ssid, const char *passphrase, int32_t channel, const uint8_t *bssid, bool connect) {
if (!STA.begin()) {
5 changes: 5 additions & 0 deletions libraries/WiFi/src/WiFiSTA.h
View file
Original file line number Diff line number Diff line change
@@ -54,11 +54,13 @@ class STAClass : public NetworkInterface {

bool connect();
bool connect(const char *ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t *bssid = NULL, bool connect = true);
#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
bool connect(
const char *wpa2_ssid, wpa2_auth_method_t method, const char *wpa2_identity = NULL, const char *wpa2_username = NULL, const char *wpa2_password = NULL,
const char *ca_pem = NULL, const char *client_crt = NULL, const char *client_key = NULL, int ttls_phase2_type = -1, int32_t channel = 0,
const uint8_t *bssid = 0, bool connect = true
);
#endif /* CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT */
bool disconnect(bool eraseap = false, unsigned long timeout = 0);
bool reconnect();
bool erase();
@@ -109,6 +111,7 @@ class WiFiSTAClass {
public:
STAClass STA;

#if CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT
wl_status_t begin(
const char *wpa2_ssid, wpa2_auth_method_t method, const char *wpa2_identity = NULL, const char *wpa2_username = NULL, const char *wpa2_password = NULL,
const char *ca_pem = NULL, const char *client_crt = NULL, const char *client_key = NULL, int ttls_phase2_type = -1, int32_t channel = 0,
@@ -124,6 +127,8 @@ class WiFiSTAClass {
ttls_phase2_type, channel, bssid, connect
);
}
#endif /* CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT */

wl_status_t begin(const char *ssid, const char *passphrase = NULL, int32_t channel = 0, const uint8_t *bssid = NULL, bool connect = true);
wl_status_t begin(const String &ssid, const String &passphrase = (const char *)NULL, int32_t channel = 0, const uint8_t *bssid = NULL, bool connect = true) {
return begin(ssid.c_str(), passphrase.c_str(), channel, bssid, connect);