Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit11c3c83

Browse files
authored
Merge pull request#987 from pennam/sni-fix
Fix and simplify sni setting
2 parents26ff735 +4081c6b commit11c3c83

File tree

5 files changed

+12
-14
lines changed

5 files changed

+12
-14
lines changed

‎libraries/SocketWrapper/src/AClient.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ int arduino::AClient::connectSSL(IPAddress ip, uint16_t port) {
4646
return client->connectSSL(ip, port);
4747
}
4848

49-
intarduino::AClient::connectSSL(constchar *host,uint16_t port,bool disableSNI) {
49+
intarduino::AClient::connectSSL(constchar *host,uint16_t port) {
5050
if (!client) {
5151
newMbedClient();
5252
}
53-
return client->connectSSL(host, port, disableSNI);
53+
return client->connectSSL(host, port);
5454
}
5555

5656
voidarduino::AClient::stop() {

‎libraries/SocketWrapper/src/AClient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AClient : public Client {
3232
virtualintconnect(IPAddress ip,uint16_t port);
3333
virtualintconnect(constchar *host,uint16_t port);
3434
intconnectSSL(IPAddress ip,uint16_t port);
35-
intconnectSSL(constchar* host,uint16_t port,bool disableSNI =false);
35+
intconnectSSL(constchar* host,uint16_t port);
3636
virtualvoidstop();
3737

3838
virtualexplicitoperatorbool();

‎libraries/SocketWrapper/src/MbedClient.cpp‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,7 @@ int arduino::MbedClient::connectSSL(IPAddress ip, uint16_t port) {
186186
returnconnectSSL(SocketHelpers::socketAddressFromIpAddress(ip, port));
187187
}
188188

189-
intarduino::MbedClient::connectSSL(constchar *host,uint16_t port,bool disableSNI) {
190-
if (!disableSNI) {
191-
if (sock ==nullptr) {
192-
sock =newTLSSocket();
193-
_own_socket =true;
194-
}
195-
static_cast<TLSSocket *>(sock)->set_hostname(host);
196-
}
197-
189+
intarduino::MbedClient::connectSSL(constchar *host,uint16_t port) {
198190
SocketAddress socketAddress =SocketAddress();
199191
socketAddress.set_port(port);
200192
SocketHelpers::gethostbyname(getNetwork(), host, &socketAddress);

‎libraries/SocketWrapper/src/MbedClient.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MbedClient {
5656
virtualintconnect(constchar* host,uint16_t port);
5757
intconnectSSL(SocketAddress socketAddress);
5858
intconnectSSL(IPAddress ip,uint16_t port);
59-
intconnectSSL(constchar* host,uint16_t port,bool disableSNI =false);
59+
intconnectSSL(constchar* host,uint16_t port);
6060
size_twrite(uint8_t);
6161
size_twrite(constuint8_t* buf,size_t size);
6262
intavailable();

‎libraries/SocketWrapper/src/MbedSSLClient.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ class MbedSSLClient : public arduino::MbedClient {
4141
returnconnectSSL(ip, port);
4242
}
4343
intconnect(constchar* host,uint16_t port) {
44-
returnconnectSSL(host, port, _disableSNI);
44+
_hostname = host;
45+
returnconnectSSL(host, port);
4546
}
4647
voiddisableSNI(bool statusSNI) {
4748
_disableSNI = statusSNI;
@@ -53,6 +54,7 @@ class MbedSSLClient : public arduino::MbedClient {
5354

5455
protected:
5556
constchar* _ca_cert_custom =NULL;
57+
constchar* _hostname =NULL;
5658

5759
private:
5860
intsetRootCA() {
@@ -79,6 +81,10 @@ class MbedSSLClient : public arduino::MbedClient {
7981
}
8082
#endif
8183

84+
if(_hostname && !_disableSNI) {
85+
((TLSSocket*)sock)->set_hostname(_hostname);
86+
}
87+
8288
if(_ca_cert_custom !=NULL) {
8389
err = ((TLSSocket*)sock)->append_root_ca_cert(_ca_cert_custom);
8490
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp