Merge pull request #69 from govorox/60-not-working-in-parallel-with-w…

…ificlientsecure

fix: compatibility with WifiClientSecure.h

.github/workflows/ci_master.yml

@@ -11,12 +11,12 @@ jobs:
 
     steps:
     - name: Check out the code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
-        python-version: '3.x'
+        python-version: '3.9'
 
     - name: Install PlatformIO
       run: |

README.md

@@ -4,8 +4,8 @@
 
 <!-- [Arduino Libraries Log](https://downloads.arduino.cc/libraries/logs/github.com/govorox/SSLClient/) -->
 
-### Now updated on PlatformIO registry as digitaldragon/[email protected].7
-### Updated on Arduino Libraries registry to digitaldragon/[email protected].7
+### Now updated on PlatformIO registry as digitaldragon/[email protected].8
+### Updated on Arduino Libraries registry to digitaldragon/[email protected].8
 
 # SSLClient Arduino library using *mbedtls* functions
 The SSLClient class implements support for secure connections using TLS (SSL). It Provides a transparent SSL wrapper over existing transport object of a **Client** class.

library.json

@@ -1,6 +1,6 @@
 {
   "name": "SSLClient",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "repository":
   {
     "type": "git",

library.properties

@@ -1,5 +1,5 @@
 name=GovoroxSSLClient
-version=1.1.7
+version=1.1.8
 author=V Govorovski
 maintainer=Robert Byrnes <[email protected]>
 sentence=Provides secure network connection over a generic Client trasport object.

platformio.ini

@@ -12,15 +12,15 @@
 default_envs = native
 
 [env:native]
-test_framework = unity
+# test_framework = unity
 platform = native
 build_type = test
 lib_deps = 
-	digitaldragon/[email protected].5
-	# armmbed/mbedtls@^2.23.0
+	digitaldragon/[email protected].6
+	throwtheswitch/Unity@^2.5.2
 lib_ldf_mode = deep+
 build_unflags = -std=gnu++11
 build_flags = 
 	-std=gnu++17
 	-I test/mocks
-	-D SSL_CLIENT_TEST_ENVIRONMENT
+	-D SSL_CLIENT_TEST_ENVIRONMENT

src/SSLClient.cpp

@@ -31,7 +31,7 @@
  */
 SSLClient::SSLClient() {
   _connected = false;
-  sslclient = new sslclient_context;
+  sslclient = new sslclient__context;
   ssl_init(sslclient, nullptr);
   sslclient->handshake_timeout = 120000;
   _CA_cert = NULL;
@@ -52,7 +52,7 @@ SSLClient::SSLClient() {
  */
 SSLClient::SSLClient(Client* client) {
   _connected = false;
-  sslclient = new sslclient_context;
+  sslclient = new sslclient__context;
   ssl_init(sslclient, client);
   sslclient->handshake_timeout = 120000;
   _CA_cert = NULL;

src/SSLClient.h

@@ -16,16 +16,16 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-#ifndef SSLClient_H
-#define SSLClient_H
+#ifndef SSLCLIENT_H
+#define SSLCLIENT_H
 #include "Arduino.h"
 #include "IPAddress.h"
-#include "ssl_client.h"
+#include "ssl__client.h"
 
 class SSLClient : public Client
 {
 protected:
-  sslclient_context *sslclient;
+  sslclient__context *sslclient;
 
   int _lastError = 0;
 	int _peek = -1;