WiFiSSLSE050Client: fix sni setting

pennam · pennam · commit 148b74c1806c · 2024-11-06T09:18:31.000+01:00
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;
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ class MbedSSLSE050Client : public arduino::MbedSSLClient {`
`48`	`48`	`return 0;`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ if(_hostname && !_disableSNI) {`
	`52`	`+ ((TLSSocket*)sock)->set_hostname(_hostname);`
	`53`	`+ }`
	`54`	`+`
`51`	`55`	`if( NSAPI_ERROR_OK != ((TLSSocket*)sock)->append_root_ca_cert(_ca_cert_custom)) {`
`52`	`56`	`return 0;`
`53`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,9 @@ class MbedSSLClient : public arduino::MbedClient {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`protected:`
`56`		`- const char* _ca_cert_custom = NULL;`
`57`		`- const char* _hostname = NULL;`
	`56`	`+ const char* _ca_cert_custom;`
	`57`	`+ const char* _hostname;`
	`58`	`+ bool _disableSNI;`
`58`	`59`
`59`	`60`	`private:`
`60`	`61`	`int setRootCA() {`
`@@ -90,8 +91,6 @@ class MbedSSLClient : public arduino::MbedClient {`
`90`	`91`	`}`
`91`	`92`	`return err;`
`92`	`93`	`}`
`93`		`-`
`94`		`- bool _disableSNI;`
`95`	`94`	`};`
`96`	`95`
`97`	`96`	`}`