fix _fingerprint is set checks for ESP32

see #633 and #632

.github/workflows/main.yml

@@ -25,7 +25,7 @@ jobs:
 
   prepare_example_json:
     runs-on: ubuntu-latest
-    steps: 
+    steps:
       - uses: actions/checkout@v2
 
       - name: generate examples
@@ -60,7 +60,7 @@ jobs:
     env:
       IDE_VERSION: ${{ matrix.IDE_VERSION }}
 
-    steps: 
+    steps:
       - uses: actions/checkout@v2
 
       - name: Get Date
@@ -121,6 +121,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: install libgtk2.0-0
+        run: |
+          sudo apt-get install -y libgtk2.0-0
+
       - name: Get Date
         id: get-date
         run: |
@@ -134,7 +138,7 @@ jobs:
             /home/runner/arduino_ide
             /home/runner/Arduino
           key: ${{ runner.os }}-${{ steps.get-date.outputs.date }}-${{ matrix.ideversion }}
-      
+
       - name: install python serial
         if: matrix.cpu == 'esp32'
         run: |
@@ -157,7 +161,7 @@ jobs:
         run: |
           mkdir -p $HOME/Arduino/libraries/
           cp -r $GITHUB_WORKSPACE $HOME/Arduino/libraries/arduinoWebSockets
-      
+
       - name: config IDE
         run: |
           export DISPLAY=:1.0

library.json

@@ -21,5 +21,5 @@
         "type": "git",
         "url": "https://github.com/Links2004/arduinoWebSockets.git"
     },
-    "version": "2.3.3"
+    "version": "2.3.5"
 }

library.properties

@@ -1,5 +1,5 @@
 name=WebSockets
-version=2.3.3
+version=2.3.5
 author=Markus Sattler
 maintainer=Markus Sattler
 sentence=WebSockets for Arduino (Server + Client)

src/WebSocketsClient.cpp

@@ -229,8 +229,11 @@ void WebSocketsClient::loop(void) {
 #else
 #error setCACert not implemented
 #endif
-#if defined(SSL_BARESSL)
+#if defined(ESP32)
-            } else if(_fingerprint) {
+            } else if(!SSL_FINGERPRINT_IS_SET) {
+                _client.ssl->setInsecure();
+#elif defined(SSL_BARESSL)
+            } else if(SSL_FINGERPRINT_IS_SET) {
                 _client.ssl->setFingerprint(_fingerprint);
             } else {
                 _client.ssl->setInsecure();
@@ -865,14 +868,14 @@ void WebSocketsClient::connectedCb() {
 
 #if defined(HAS_SSL)
 #if defined(SSL_AXTLS) || defined(ESP32)
-    if(_client.isSSL && _fingerprint.length()) {
+    if(_client.isSSL && SSL_FINGERPRINT_IS_SET) {
         if(!_client.ssl->verify(_fingerprint.c_str(), _host.c_str())) {
             DEBUG_WEBSOCKETS("[WS-Client] certificate mismatch\n");
             WebSockets::clientDisconnect(&_client, 1000);
             return;
         }
 #else
-    if(_client.isSSL && _fingerprint) {
+    if(_client.isSSL && SSL_FINGERPRINT_IS_SET) {
 #endif
     } else if(_client.isSSL && !_CA_cert) {
 #if defined(SSL_BARESSL)

src/WebSocketsClient.h

@@ -112,12 +112,14 @@ class WebSocketsClient : protected WebSockets {
 #ifdef SSL_AXTLS
     String _fingerprint;
     const char * _CA_cert;
+#define SSL_FINGERPRINT_IS_SET (_fingerprint.length())
 #define SSL_FINGERPRINT_NULL ""
 #else
     const uint8_t * _fingerprint;
     BearSSL::X509List * _CA_cert;
     BearSSL::X509List * _client_cert;
     BearSSL::PrivateKey * _client_key;
+#define SSL_FINGERPRINT_IS_SET (_fingerprint != NULL)
 #define SSL_FINGERPRINT_NULL NULL
 #endif
 

src/WebSocketsVersion.h

@@ -1,6 +1,6 @@
 /**
  * @file WebSocketsVersion.h
- * @date 07.01.2021
+ * @date 09.02.2021
  * @author Markus Sattler
  *
  * Copyright (c) 2015 Markus Sattler. All rights reserved.
@@ -25,12 +25,12 @@
 #ifndef WEBSOCKETSVERSION_H_
 #define WEBSOCKETSVERSION_H_
 
-#define WEBSOCKETS_VERSION "2.3.3"
+#define WEBSOCKETS_VERSION "2.3.5"
 
 #define WEBSOCKETS_VERSION_MAJOR 2
 #define WEBSOCKETS_VERSION_MINOR 3
-#define WEBSOCKETS_VERSION_PATCH 3
+#define WEBSOCKETS_VERSION_PATCH 5
 
-#define WEBSOCKETS_VERSION_INT 2003003
+#define WEBSOCKETS_VERSION_INT 2003005
 
 #endif /* WEBSOCKETSVERSION_H_ */