From 38d28a8b7d599c70f604e16d87b136979d385581 Mon Sep 17 00:00:00 2001
From: Khoi Hoang <57012152+khoih-prog@users.noreply.github.com>
Date: Tue, 29 Mar 2022 12:54:15 -0400
Subject: [PATCH] v1.4.5 to Sync with SSLClient v1.6.11
### Releases v1.4.5
1. Sync with [SSLClient v1.6.11](https://github.com/OPEnSLab-OSU/SSLClient/releases/tag/v1.6.11). Check [Pull in OPEnSLab-OSU's SSLClient v1.6.11 #17](https://github.com/khoih-prog/EthernetWebServer_SSL/issues/17)
2. Add example [AWS_IoT](examples/AWS_IoT)
---
CONTRIBUTING.md | 2 +-
README.md | 43 ++++++++++++++++++++++++-------------------
changelog.md | 7 +++++++
keywords.txt | 16 +++++++++++++++-
library.json | 2 +-
library.properties | 2 +-
6 files changed, 49 insertions(+), 23 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a469a0d..d0da5d9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@ Please ensure to specify the following:
Arduino IDE version: 1.8.19
STM32F7 Nucleo-144 NUCLEO_F767ZI, STM32 core v2.2.0
OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.13.0-35-generic #40~20.04.1-Ubuntu SMP Mon Mar 7 09:18:32 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
+Linux xy-Inspiron-3593 5.13.0-37-generic #42~20.04.1-Ubuntu SMP Tue Mar 15 15:44:28 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
Context:
I encountered a crash while trying to use the Timer Interrupt.
diff --git a/README.md b/README.md
index dd5c11c..53c7990 100644
--- a/README.md
+++ b/README.md
@@ -99,8 +99,9 @@
* [16. WebClientRepeating](examples/WebClientRepeating)
* [17. WebClient_SSL](examples/WebClient_SSL)
* [18. WebServer](examples/WebServer)
- * [19. **MQTTS_ThingStream**](examples/MQTTS_ThingStream).
- * [20. **MQTT_ThingStream**](examples/MQTT_ThingStream).
+ * [19. **MQTTS_ThingStream**](examples/MQTTS_ThingStream)
+ * [20. **MQTT_ThingStream**](examples/MQTT_ThingStream)
+ * [21. **AWS_IoT**](examples/AWS_IoT) **New**
* [HTTP and WebSocket Client New Examples](#http-and-websocket-client-new-examples)
* [ 1. BasicAuthGet](examples/HTTPClient/BasicAuthGet)
* [ 2. CustomHeader](examples/HTTPClient/CustomHeader)
@@ -1194,8 +1195,9 @@ Connect FDTI (USB to Serial) as follows:
16. [WebClientRepeating](examples/WebClientRepeating)
17. [WebClient_SSL](examples/WebClient_SSL)
18. [WebServer](examples/WebServer)
-19. [**MQTTS_ThingStream**](examples/MQTTS_ThingStream).
-20. [**MQTT_ThingStream**](examples/MQTT_ThingStream).
+19. [**MQTTS_ThingStream**](examples/MQTTS_ThingStream)
+20. [**MQTT_ThingStream**](examples/MQTT_ThingStream)
+21. [**AWS_IoT**](examples/AWS_IoT) **New**
#### HTTP and WebSocket Client New Examples
@@ -1254,7 +1256,7 @@ Following is debug terminal output and screen shot when running example [Advance
```
Start AdvancedWebServer on NUCLEO_F767ZI, using LAN8742A Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
HTTP EthernetWebServer is @ IP : 192.168.2.117
.[EWS] String Len = 0, extend to 2048
EthernetWebServer::handleClient: New Client
@@ -1379,7 +1381,7 @@ The following is debug terminal output when running example [WebClientRepeating]
```
Start WebClientRepeating on NUCLEO_F767ZI, using ENC28J60 & EthernetENC Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1454,7 +1456,7 @@ Disconnecting from server...
```
Start UdpNTPClient on NUCLEO_F767ZI, using W5x00 & Ethernet2 Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1478,7 +1480,7 @@ The UTC time is 22:20:21
```
Start WebClient_SSL on NUCLEO_F767ZI with LAN8742A Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] =========================
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1583,7 +1585,7 @@ The terminal output of **NUCLEO_F767ZI with W5x00 & Ethernet3 Library** running
```
Start WebClient_SSL on NUCLEO_F767ZI with W5x00 & Ethernet3 Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] =========== USE_ETHERNET3 ===========
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1687,7 +1689,7 @@ The terminal output of **NUCLEO_F767ZI with ENC28J60 & EthernetENC Library** run
```
Start WebClientMulti_SSL on NUCLEO_F767ZI with ENC28J60 & EthernetENC Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] =========================
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1823,7 +1825,7 @@ The terminal output of **NUCLEO_F767ZI with LAN8742A Ethernet & STM32Ethernet Li
```
Start MQTTClient_SSL_Complex on NUCLEO_F767ZI with LAN8742A Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1857,7 +1859,7 @@ The terminal output of **NUCLEO_F767ZI with W5x00 & Ethernet2 Library** running
```
Start MQTTClient_SSL_Complex on NUCLEO_F767ZI with W5x00 & Ethernet2 Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1889,7 +1891,7 @@ The terminal output of **NUCLEO_F767ZI with LAN8742A Ethernet & STM32Ethernet Li
```
Start MQTTS_ThingStream on NUCLEO_F767ZI with LAN8742A Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1923,7 +1925,7 @@ The terminal output of **NUCLEO_F767ZI with ENC28J60 & EthernetENC Library** run
```
Start MQTTS_ThingStream_ThingStream on NUCLEO_F767ZI with ENC28J60 & EthernetENC Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1955,7 +1957,7 @@ The terminal output of **NUCLEO_F767ZI with W5x00 & Ethernet3 Library** running
```
Start MQTTS_ThingStream_ThingStream on NUCLEO_F767ZI with W5x00 & Ethernet3 Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
[ETHERNET_WEBSERVER] Board : NUCLEO_F767ZI , setCsPin: 10
[ETHERNET_WEBSERVER] Default SPI pinout:
[ETHERNET_WEBSERVER] MOSI: 11
@@ -1989,7 +1991,7 @@ The terminal output of **BLACK_F407VE with LAN8720 Ethernet and STM32Ethernet Li
```
Start MQTTS_ThingStream_ThingStream on on BLACK_F407VE with LAN8720 Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
You're connected to the network, IP = 192.168.2.107
***************************************
esp32-sniffer/12345678/ble
@@ -2013,7 +2015,7 @@ The terminal output of **BLACK_F407VE with LAN8720 Ethernet and STM32Ethernet Li
```
Start WebClient_SSL_LAN8720 on BLACK_F407VE with LAN8720 Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
Using mac index = 6
Connected! IP address: 192.168.2.138
Connecting to : www.arduino.cc, port : 443
@@ -2095,7 +2097,7 @@ The terminal output of **BLACK_F407VE with LAN8720 Ethernet and STM32Ethernet Li
```
Start MQTTClient_SSL_LAN8720 on BLACK_F407VE with LAN8720 Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
You're connected to the network, IP = 192.168.2.138
Attempting MQTT connection to broker.emqx.io...connected
Published connection message successfully!
@@ -2119,7 +2121,7 @@ The terminal output of **BLACK_F407VE with LAN8720 Ethernet and STM32Ethernet Li
```
Start MQTTClient_SSL_Complex_LAN8720 on BLACK_F407VE with LAN8720 Ethernet & STM32Ethernet Library
-EthernetWebServer_SSL_STM32 v1.4.4
+EthernetWebServer_SSL_STM32 v1.4.5
You're connected to the network, IP = 192.168.2.142
Attempting MQTT connection to broker.emqx.io...connected
Published connection message successfully!
@@ -2196,6 +2198,7 @@ Submit issues to: [EthernetWebServer_SSL_STM32 issues](https://github.com/khoih-
11. Optimize library code and examples by using **reference-passing instead of value-passing**.
12. Fix authenticate issue and compiler warnings caused by libb64
13. Change licence from `MIT` to `GPLv3`
+14. Sync with [SSLClient v1.6.11](https://github.com/OPEnSLab-OSU/SSLClient/releases/tag/v1.6.11)
---
@@ -2206,6 +2209,7 @@ Submit issues to: [EthernetWebServer_SSL_STM32 issues](https://github.com/khoih-
2. [OPEnSLab-OSU](https://github.com/PEnSLab-OSU) for [OPEnSLab-OSU's SSLClient](https://github.com/OPEnSLab-OSU/SSLClient)
3. Thanks to [Miguel Alexandre Wisintainer](https://github.com/tcpipchip) to help debug and test.
4. [Adrian McEwen](https://github.com/amcewen) for [HttpClient Library](https://github.com/amcewen/HttpClient) on which the [ArduinoHttpClient Library](https://github.com/arduino-libraries/ArduinoHttpClient) and this [EthernetWebServer library](https://github.com/khoih-prog/EthernetWebServer) are relied.
+5. Thanks to [Marcel Stör](https://github.com/marcelstoer) to report issue [Pull in OPEnSLab-OSU's SSLClient v1.6.11 #17](https://github.com/khoih-prog/EthernetWebServer_SSL/issues/17) which was fixed in v1.4.5
diff --git a/changelog.md b/changelog.md
index 5f548c7..4e33d73 100644
--- a/changelog.md
+++ b/changelog.md
@@ -11,6 +11,7 @@
## Table of Contents
* [Changelog](#changelog)
+ * [Releases v1.4.5](#releases-v145)
* [Releases v1.4.4](#releases-v144)
* [Releases v1.4.3](#releases-v143)
* [Releases v1.4.2](#releases-v142)
@@ -29,6 +30,12 @@
## Changelog
+### Releases v1.4.5
+
+1. Sync with [SSLClient v1.6.11](https://github.com/OPEnSLab-OSU/SSLClient/releases/tag/v1.6.11). Check [Pull in OPEnSLab-OSU's SSLClient v1.6.11 #17](https://github.com/khoih-prog/EthernetWebServer_SSL/issues/17)
+2. Add example [AWS_IoT](examples/AWS_IoT)
+
+
### Releases v1.4.4
1. Change license from `MIT` to `GPLv3`. Check [Licensing of SSLClient #16](https://github.com/khoih-prog/EthernetWebServer_SSL/issues/16)
diff --git a/keywords.txt b/keywords.txt
index c8bf864..753ef80 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -212,5 +212,19 @@ AUTHORIZATION_HEADER LITERAL1
_ETHERNET_WEBSERVER_LOGLEVEL_ LITERAL1
-
+# enum Error
+SSL_OK LITERAL1
+SSL_CLIENT_CONNECT_FAIL LITERAL1
+SSL_BR_CONNECT_FAIL LITERAL1
+SSL_CLIENT_WRTIE_ERROR LITERAL1
+SSL_BR_WRITE_ERROR LITERAL1
+SSL_INTERNAL_ERROR LITERAL1
+SSL_OUT_OF_MEMORY LITERAL1
+
+# enum DebugLevel
+SSL_NONE LITERAL1
+SSL_ERROR LITERAL1
+SSL_WARN LITERAL1
+SSL_INFO LITERAL1
+SSL_DUMP LITERAL1
diff --git a/library.json b/library.json
index e199e2d..1cfcb1c 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
{
"name": "EthernetWebServer_SSL_STM32",
- "version": "1.4.4",
+ "version": "1.4.5",
"keywords": "WebServer, built-in Ethernet, Arduino, STM32F, STM32L, STM32H, STM32G, STM32WB, STM32MP1, Ethernet shield, Nucleo-144, Nucleo-64, Nucleo-32, LAN8742A, LAN8720, ENC28J60, W5x00, W5500, W5100, SSL, TLS, HTTP-Client, WebSocket-Client, server, client, websocket",
"description": "Simple TLS/SSL Ethernet WebServer, HTTP Client and WebSocket Client library for STM32F/L/H/G/WB/MP1 boards running built-in Ethernet LAN8742A, LAN8720 or Ethernet W5x00, ENC28J60 shields. The WebServer supports HTTP/HTTPS GET and POST requests, provides argument parsing, handles one client at a time. It now provides HTTP(S) Client and Secured WebSockets Client. It supports Arduino STM32F/L/H/G/WB/MP1 series with 32+ Kbytes of Flash, using built-in LAN8742A Ethernet (Nucleo-144: F429ZI, F767ZI, Discovery: STM32F746G-DISCOVERY), or LAN8720, ENC28J60, W5x00 Ethernet shields.",
"authors":
diff --git a/library.properties b/library.properties
index a1f9280..16369df 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
name=EthernetWebServer_SSL_STM32
-version=1.4.4
+version=1.4.5
author=Khoi Hoang
license=GPLv3
maintainer=Khoi Hoang
