Unverified Commit a844073d authored by Me No Dev's avatar Me No Dev Committed by GitHub

Update toolchains to use the tar.gz format for IDE1 compatibility (#8757)

* Update toolchains to use the tar.gz format for IDE1 compatibility

* Update WiFiSTA.cpp

* Implement the new EAP API for STA
parent 7e0f892f
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "WiFiGeneric.h" #include "WiFiGeneric.h"
#include "WiFiSTA.h" #include "WiFiSTA.h"
extern "C" {
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
...@@ -42,9 +41,13 @@ extern "C" { ...@@ -42,9 +41,13 @@ extern "C" {
#include "lwip/dns.h" #include "lwip/dns.h"
#include <esp_smartconfig.h> #include <esp_smartconfig.h>
#include <esp_netif.h> #include <esp_netif.h>
#include "esp_wpa2.h"
#include "esp_mac.h" #include "esp_mac.h"
}
#if __has_include ("esp_eap_client.h")
#include "esp_eap_client.h"
#else
#include "esp_wpa2.h"
#endif
// ----------------------------------------------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------------------------------------------
// ---------------------------------------------------- Private functions ------------------------------------------------ // ---------------------------------------------------- Private functions ------------------------------------------------
...@@ -193,19 +196,40 @@ wl_status_t WiFiSTAClass::begin(const char* wpa2_ssid, wpa2_auth_method_t method ...@@ -193,19 +196,40 @@ wl_status_t WiFiSTAClass::begin(const char* wpa2_ssid, wpa2_auth_method_t method
} }
if(ca_pem) { if(ca_pem) {
#if __has_include ("esp_eap_client.h")
esp_eap_client_set_ca_cert((uint8_t *)ca_pem, strlen(ca_pem));
#else
esp_wifi_sta_wpa2_ent_set_ca_cert((uint8_t *)ca_pem, strlen(ca_pem)); esp_wifi_sta_wpa2_ent_set_ca_cert((uint8_t *)ca_pem, strlen(ca_pem));
#endif
} }
if(client_crt) { if(client_crt) {
#if __has_include ("esp_eap_client.h")
esp_eap_client_set_certificate_and_key((uint8_t *)client_crt, strlen(client_crt), (uint8_t *)client_key, strlen(client_key), NULL, 0);
#else
esp_wifi_sta_wpa2_ent_set_cert_key((uint8_t *)client_crt, strlen(client_crt), (uint8_t *)client_key, strlen(client_key), NULL, 0); esp_wifi_sta_wpa2_ent_set_cert_key((uint8_t *)client_crt, strlen(client_crt), (uint8_t *)client_key, strlen(client_key), NULL, 0);
#endif
} }
#if __has_include ("esp_eap_client.h")
esp_eap_client_set_identity((uint8_t *)wpa2_identity, strlen(wpa2_identity));
#else
esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)wpa2_identity, strlen(wpa2_identity)); esp_wifi_sta_wpa2_ent_set_identity((uint8_t *)wpa2_identity, strlen(wpa2_identity));
#endif
if(method == WPA2_AUTH_PEAP || method == WPA2_AUTH_TTLS) { if(method == WPA2_AUTH_PEAP || method == WPA2_AUTH_TTLS) {
#if __has_include ("esp_eap_client.h")
esp_eap_client_set_username((uint8_t *)wpa2_username, strlen(wpa2_username));
esp_eap_client_set_password((uint8_t *)wpa2_password, strlen(wpa2_password));
#else
esp_wifi_sta_wpa2_ent_set_username((uint8_t *)wpa2_username, strlen(wpa2_username)); esp_wifi_sta_wpa2_ent_set_username((uint8_t *)wpa2_username, strlen(wpa2_username));
esp_wifi_sta_wpa2_ent_set_password((uint8_t *)wpa2_password, strlen(wpa2_password)); esp_wifi_sta_wpa2_ent_set_password((uint8_t *)wpa2_password, strlen(wpa2_password));
#endif
} }
#if __has_include ("esp_eap_client.h")
esp_wifi_sta_enterprise_enable(); //set config settings to enable function
#else
esp_wifi_sta_wpa2_ent_enable(); //set config settings to enable function esp_wifi_sta_wpa2_ent_enable(); //set config settings to enable function
#endif
WiFi.begin(wpa2_ssid); //connect to wifi WiFi.begin(wpa2_ssid); //connect to wifi
return status(); return status();
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment