Merge pull request #988 from pennam/se050-sni-fix

WiFiSSLSE050Client: fix sni setting 2nd part
arduino · Nov 7, 2024 · 0705aa1 · 0705aa1
2 parents 11c3c83 + 148b74c
commit 0705aa1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/libraries/SE05X/src/WiFiSSLSE050Client.h b/libraries/SE05X/src/WiFiSSLSE050Client.h
@@ -48,6 +48,10 @@ class MbedSSLSE050Client : public arduino::MbedSSLClient {
       return 0;
     }
 
+    if(_hostname && !_disableSNI) {
+      ((TLSSocket*)sock)->set_hostname(_hostname);
+    }
+
     if( NSAPI_ERROR_OK != ((TLSSocket*)sock)->append_root_ca_cert(_ca_cert_custom)) {
       return 0;
     }

diff --git a/libraries/SocketWrapper/src/MbedSSLClient.cpp b/libraries/SocketWrapper/src/MbedSSLClient.cpp
@@ -1,5 +1,9 @@
 #include "MbedSSLClient.h"
 
-arduino::MbedSSLClient::MbedSSLClient(): _disableSNI{false} {
+arduino::MbedSSLClient::MbedSSLClient()
+  : _ca_cert_custom(nullptr),
+    _hostname(nullptr),
+    _disableSNI(false) {
+
   onBeforeConnect(mbed::callback(this, &MbedSSLClient::setRootCA));
 };
diff --git a/libraries/SocketWrapper/src/MbedSSLClient.h b/libraries/SocketWrapper/src/MbedSSLClient.h
@@ -53,8 +53,9 @@ class MbedSSLClient : public arduino::MbedClient {
   }
 
 protected:
-  const char* _ca_cert_custom = NULL;
-  const char* _hostname = NULL;
+  const char* _ca_cert_custom;
+  const char* _hostname;
+  bool _disableSNI;
 
 private:
   int setRootCA() {
@@ -90,8 +91,6 @@ class MbedSSLClient : public arduino::MbedClient {
     }
     return err;
   }
-
-  bool _disableSNI;
 };
 
 }