Rework WiFiClientSecure to use the new SSLClient lib. All examples stay relevant.

Author: sgalabov

Diff for: libraries/WiFiClientSecure/src/WiFiClientSecure.cpp

@@ -2,6 +2,7 @@
   WiFiClientSecure.cpp - Client Secure class for ESP32
   Copyright (c) 2016 Hristo Gochkov  All right reserved.
   Additions Copyright (C) 2017 Evandro Luis Copercini.
+  Rewrite for SSLClient Copyright (c) 2021 Stanislav Galabov.
 
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -19,332 +20,20 @@
 */
 
 #include "WiFiClientSecure.h"
-#include <lwip/sockets.h>
-#include <lwip/netdb.h>
-#include <errno.h>
 
-#undef connect
-#undef write
-#undef read
-
-
-WiFiClientSecure::WiFiClientSecure()
+WiFiClientSecure::WiFiClientSecure() : SSLClient()
 {
-    _connected = false;
-
-    sslclient = new sslclient_context;
-    ssl_init(sslclient);
-    sslclient->socket = -1;
-    sslclient->handshake_timeout = 120000;
-    _use_insecure = false;
-    _CA_cert = NULL;
-    _cert = NULL;
-    _private_key = NULL;
-    _pskIdent = NULL;
-    _psKey = NULL;
-    next = NULL;
-    _alpn_protos = NULL;
+    sslclient->client = new WiFiClient;
 }
 
-
-WiFiClientSecure::WiFiClientSecure(int sock)
+WiFiClientSecure::WiFiClientSecure(int fd) : SSLClient()
 {
-    _connected = false;
-    _timeout = 0;
-
-    sslclient = new sslclient_context;
-    ssl_init(sslclient);
-    sslclient->socket = sock;
-    sslclient->handshake_timeout = 120000;
-
-    if (sock >= 0) {
-        _connected = true;
-    }
-
-    _CA_cert = NULL;
-    _cert = NULL;
-    _private_key = NULL;
-    _pskIdent = NULL;
-    _psKey = NULL;
-    next = NULL;
-    _alpn_protos = NULL;
+    sslclient->client = new WiFiClient(fd);
 }
 
 WiFiClientSecure::~WiFiClientSecure()
 {
     stop();
-    delete sslclient;
-}
-
-WiFiClientSecure &WiFiClientSecure::operator=(const WiFiClientSecure &other)
-{
-    stop();
-    sslclient->socket = other.sslclient->socket;
-    _connected = other._connected;
-    return *this;
-}
-
-void WiFiClientSecure::stop()
-{
-    if (sslclient->socket >= 0) {
-        close(sslclient->socket);
-        sslclient->socket = -1;
-        _connected = false;
-        _peek = -1;
-    }
-    stop_ssl_socket(sslclient, _CA_cert, _cert, _private_key);
-}
-
-int WiFiClientSecure::connect(IPAddress ip, uint16_t port)
-{
-    if (_pskIdent && _psKey)
-        return connect(ip, port, _pskIdent, _psKey);
-    return connect(ip, port, _CA_cert, _cert, _private_key);
-}
-
-int WiFiClientSecure::connect(IPAddress ip, uint16_t port, int32_t timeout){
-    _timeout = timeout;
-    return connect(ip, port);
-}
-
-int WiFiClientSecure::connect(const char *host, uint16_t port)
-{
-    if (_pskIdent && _psKey)
-        return connect(host, port, _pskIdent, _psKey);
-    return connect(host, port, _CA_cert, _cert, _private_key);
-}
-
-int WiFiClientSecure::connect(const char *host, uint16_t port, int32_t timeout){
-    _timeout = timeout;
-    return connect(host, port);
-}
-
-int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *CA_cert, const char *cert, const char *private_key)
-{
-    return connect(ip.toString().c_str(), port, CA_cert, cert, private_key);
-}
-
-int WiFiClientSecure::connect(const char *host, uint16_t port, const char *CA_cert, const char *cert, const char *private_key)
-{
-    if(_timeout > 0){
-        sslclient->handshake_timeout = _timeout;
-    }
-    int ret = start_ssl_client(sslclient, host, port, _timeout, CA_cert, cert, private_key, NULL, NULL, _use_insecure, _alpn_protos);
-    _lastError = ret;
-    if (ret < 0) {
-        log_e("start_ssl_client: %d", ret);
-        stop();
-        return 0;
-    }
-    _connected = true;
-    return 1;
-}
-
-int WiFiClientSecure::connect(IPAddress ip, uint16_t port, const char *pskIdent, const char *psKey) {
-    return connect(ip.toString().c_str(), port, pskIdent, psKey);
-}
-
-int WiFiClientSecure::connect(const char *host, uint16_t port, const char *pskIdent, const char *psKey) {
-    log_v("start_ssl_client with PSK");
-    if(_timeout > 0){
-        sslclient->handshake_timeout = _timeout;
-    }
-    int ret = start_ssl_client(sslclient, host, port, _timeout, NULL, NULL, NULL, pskIdent, psKey, _use_insecure, _alpn_protos);
-    _lastError = ret;
-    if (ret < 0) {
-        log_e("start_ssl_client: %d", ret);
-        stop();
-        return 0;
-    }
-    _connected = true;
-    return 1;
-}
-
-int WiFiClientSecure::peek(){
-    if(_peek >= 0){
-        return _peek;
-    }
-    _peek = timedRead();
-    return _peek;
-}
-
-size_t WiFiClientSecure::write(uint8_t data)
-{
-    return write(&data, 1);
-}
-
-int WiFiClientSecure::read()
-{
-    uint8_t data = -1;
-    int res = read(&data, 1);
-    if (res < 0) {
-        return res;
-    }
-    return data;
-}
-
-size_t WiFiClientSecure::write(const uint8_t *buf, size_t size)
-{
-    if (!_connected) {
-        return 0;
-    }
-    int res = send_ssl_data(sslclient, buf, size);
-    if (res < 0) {
-        stop();
-        res = 0;
-    }
-    return res;
-}
-
-int WiFiClientSecure::read(uint8_t *buf, size_t size)
-{
-    int peeked = 0;
-    int avail = available();
-    if ((!buf && size) || avail <= 0) {
-        return -1;
-    }
-    if(!size){
-        return 0;
-    }
-    if(_peek >= 0){
-        buf[0] = _peek;
-        _peek = -1;
-        size--;
-        avail--;
-        if(!size || !avail){
-            return 1;
-        }
-        buf++;
-        peeked = 1;
-    }
-    
-    int res = get_ssl_receive(sslclient, buf, size);
-    if (res < 0) {
-        stop();
-        return peeked?peeked:res;
-    }
-    return res + peeked;
-}
-
-int WiFiClientSecure::available()
-{
-    int peeked = (_peek >= 0);
-    if (!_connected) {
-        return peeked;
-    }
-    int res = data_to_read(sslclient);
-    if (res < 0) {
-        stop();
-        return peeked?peeked:res;
-    }
-    return res+peeked;
-}
-
-uint8_t WiFiClientSecure::connected()
-{
-    uint8_t dummy = 0;
-    read(&dummy, 0);
-
-    return _connected;
-}
-
-void WiFiClientSecure::setInsecure()
-{
-    _CA_cert = NULL;
-    _cert = NULL;
-    _private_key = NULL;
-    _pskIdent = NULL;
-    _psKey = NULL;
-    _use_insecure = true;
-}
-
-void WiFiClientSecure::setCACert (const char *rootCA)
-{
-    _CA_cert = rootCA;
-}
-
-void WiFiClientSecure::setCertificate (const char *client_ca)
-{
-    _cert = client_ca;
-}
-
-void WiFiClientSecure::setPrivateKey (const char *private_key)
-{
-    _private_key = private_key;
-}
-
-void WiFiClientSecure::setPreSharedKey(const char *pskIdent, const char *psKey) {
-    _pskIdent = pskIdent;
-    _psKey = psKey;
-}
-
-bool WiFiClientSecure::verify(const char* fp, const char* domain_name)
-{
-    if (!sslclient)
-        return false;
-
-    return verify_ssl_fingerprint(sslclient, fp, domain_name);
-}
-
-char *WiFiClientSecure::_streamLoad(Stream& stream, size_t size) {
-  char *dest = (char*)malloc(size+1);
-  if (!dest) {
-    return nullptr;
-  }
-  if (size != stream.readBytes(dest, size)) {
-    free(dest);
-    dest = nullptr;
-    return nullptr;
-  }
-  dest[size] = '\0';
-  return dest;
-}
-
-bool WiFiClientSecure::loadCACert(Stream& stream, size_t size) {
-  char *dest = _streamLoad(stream, size);
-  bool ret = false;
-  if (dest) {
-    setCACert(dest);
-    ret = true;
-  }
-  return ret;
-}
-
-bool WiFiClientSecure::loadCertificate(Stream& stream, size_t size) {
-  char *dest = _streamLoad(stream, size);
-  bool ret = false;
-  if (dest) {
-    setCertificate(dest);
-    ret = true;
-  }
-  return ret;
-}
-
-bool WiFiClientSecure::loadPrivateKey(Stream& stream, size_t size) {
-  char *dest = _streamLoad(stream, size);
-  bool ret = false;
-  if (dest) {
-    setPrivateKey(dest);
-    ret = true;
-  }
-  return ret;
-}
-
-int WiFiClientSecure::lastError(char *buf, const size_t size)
-{
-    if (!_lastError) {
-        return 0;
-    }
-    mbedtls_strerror(_lastError, buf, size);
-    return _lastError;
-}
-
-void WiFiClientSecure::setHandshakeTimeout(unsigned long handshake_timeout)
-{
-    sslclient->handshake_timeout = handshake_timeout * 1000;
-}
-
-void WiFiClientSecure::setAlpnProtocols(const char **alpn_protos)
-{
-    _alpn_protos = alpn_protos;
+    if (sslclient->client != nullptr)
+        delete sslclient->client;
 }