Updates requested in pull request discussion to remove guards and fix #include locations

Author: jpswensen

libraries/WiFi/src/WiFiGeneric.h

@@ -31,12 +31,6 @@
 #include "esp_smartconfig.h"
 #include "wifi_provisioning/manager.h"
 
-#ifdef ENABLE_WPA2_AUTHENTICATION
-#include <WiFiClient.h>
-#include <WiFiClientSecure.h>
-#include "esp_wpa2.h"
-#endif
-
 ESP_EVENT_DECLARE_BASE(ARDUINO_EVENTS);
 
 typedef enum {

libraries/WiFi/src/WiFiSTA.cpp

@@ -25,6 +25,7 @@
 #include "WiFi.h"
 #include "WiFiGeneric.h"
 #include "WiFiSTA.h"
+#include <WiFiClientSecure.h>
 
 extern "C" {
 #include <stdint.h>
@@ -42,6 +43,7 @@ extern "C" {
 #include "lwip/dns.h"
 #include <esp_smartconfig.h>
 #include <esp_netif.h>
+#include "esp_wpa2.h"
 }
 
 // -----------------------------------------------------------------------------------------------------------------------
@@ -146,7 +148,6 @@ wl_status_t WiFiSTAClass::status()
 }
 
 
-#ifdef ENABLE_WPA2_AUTHENTICATION
 static WiFiClientSecure client_secure;
 
 /**
@@ -213,9 +214,6 @@ wl_status_t WiFiSTAClass::begin(const char* wpa2_ssid, const char* wpa2_identity
     }
     return status();
 }
-#endif
-
-
 
 /**
  * Start Wifi connection

libraries/WiFi/src/WiFiSTA.h

@@ -39,9 +39,7 @@ class WiFiSTAClass
 
 public:
 
-#ifdef ENABLE_WPA2_AUTHENTICATION
     wl_status_t begin(const char* wpa2_ssid, const char* wpa2_identity, const char* wpa2_username, const char *wpa2_password, const char* root_ca=NULL, const char* client_cert=NULL, const char* client_key=NULL,int32_t channel=0, const uint8_t* bssid=0, bool connect=true);
-#endif
     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(char* ssid, char *passphrase = NULL, int32_t channel = 0, const uint8_t* bssid = NULL, bool connect = true);
     wl_status_t begin();