WiFiSSLClient: configure cusutom root_ca or client credentials on connect

Author: pennam

libraries/WiFiS3/src/WiFiSSLClient.cpp

@@ -30,7 +30,14 @@ void WiFiSSLClient::getSocket() {
 int WiFiSSLClient::connect(IPAddress ip, uint16_t port) {
 /* -------------------------------------------------------------------------- */
    getSocket();
-
+   if (_root_ca != nullptr) {
+      setCACert(_root_ca);
+   } else {
+      setCACert();
+   }
+   if ((_ecc_slot != -1) && (_ecc_cert != nullptr) && (_ecc_cert_len != 0)) {
+      setEccSlot(_ecc_slot, _ecc_cert, _ecc_cert_len);
+   }
    string res = "";
    if(modem.write(string(PROMPT(_SSLCLIENTCONNECTIP)),res, "%s%d,%s,%d\r\n" , CMD_WRITE(_SSLCLIENTCONNECTIP), _sock, ip.toString(), port)) {
       return 1;
@@ -42,9 +49,14 @@ int WiFiSSLClient::connect(IPAddress ip, uint16_t port) {
 int WiFiSSLClient::connect(const char* host, uint16_t port) {
 /* -------------------------------------------------------------------------- */
    getSocket();
-   if (!_custom_root) {
+   if (_root_ca != nullptr) {
+      setCACert(_root_ca);
+   } else {
       setCACert();
    }
+   if ((_ecc_slot != -1) && (_ecc_cert != nullptr) && (_ecc_cert_len != 0)) {
+      setEccSlot(_ecc_slot, _ecc_cert, _ecc_cert_len);
+   }
    string res = "";
    if(modem.write(string(PROMPT(_SSLCLIENTCONNECTNAME)),res, "%s%d,%s,%d\r\n" , CMD_WRITE(_SSLCLIENTCONNECTNAME), _sock, host, port)) {
       return 1;
@@ -60,7 +72,7 @@ void WiFiSSLClient::setCACert(const char* root_ca, size_t size) {
    if(size > 0) {
       modem.write_nowait(string(PROMPT(_SETCAROOT)),res, "%s%d,%d\r\n" , CMD_WRITE(_SETCAROOT), _sock, size);
       if(modem.passthrough((uint8_t *)root_ca, size)) {
-         _custom_root = true;
+         _root_ca = root_ca;
       }
    } else {
       modem.write(string(PROMPT(_SETCAROOT)),res, "%s%d\r\n" , CMD_WRITE(_SETCAROOT), _sock);
@@ -75,6 +87,9 @@ void WiFiSSLClient::setEccSlot(int ecc508KeySlot, const byte cert[], int certLen
    if(certLength > 0) {
       modem.write_nowait(string(PROMPT(_SETECCSLOT)),res, "%s%d,%d,%d\r\n" , CMD_WRITE(_SETECCSLOT), _sock, ecc508KeySlot, certLength);
       modem.passthrough((uint8_t *)cert, certLength);
+      _ecc_slot = ecc508KeySlot;
+      _ecc_cert = cert;
+      _ecc_cert_len = certLength;
    }
 }
 

libraries/WiFiS3/src/WiFiSSLClient.h

@@ -61,10 +61,13 @@ class WiFiSSLClient : public WiFiClient {
 
 private:
    int _sock;
-   bool _custom_root = false;
    void getSocket();
    int _read();
    void read_if_needed(size_t s);
+   const char* _root_ca = nullptr;
+   int _ecc_slot = -1;
+   const byte* _ecc_cert = nullptr;
+   int _ecc_cert_len = 0;
 
 private:
    void upload_default_Cert();