Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: compatibility with WifiClientSecure.h #69

Merged
merged 4 commits into from
Apr 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SSLClient",
"version": "1.1.7",
"version": "1.1.8",
"repository":
{
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
8 changes: 4 additions & 4 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/SSLClient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions src/SSLClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading