espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-21 06:40:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_warning_in_mqtt' into 'master'

Browse Source 
fix(mqtt): Fix warning in mqtt

See merge request sdk/ESP8266_RTOS_SDK!205
This commit is contained in:
Wu Jian Gang
2018-05-31 17:35:28 +08:00
parent e8f1483801 6c1765ff97
commit 39da4bd87b
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c
View File

@ -378,13 +378,11 @@ int NetworkConnectSSL(Network* n, char* addr, int port, ssl_ca_crt_key_t* ssl_cc
} }
if (ssl_cck->cacrt) { if (ssl_cck->cacrt) {
X509* cacrt = d2i_X509(NULL, ssl_cck->cacrt, ssl_cck->cacrt_len); retVal = SSL_CTX_load_verify_buffer(n->ctx, ssl_cck->cacrt, ssl_cck->cacrt_len);
if (!cacrt) { if (retVal != 1) {
goto exit1; goto exit1;
} }
SSL_CTX_add_client_CA(n->ctx, cacrt);
} }
if (ssl_cck->cert && ssl_cck->key) { if (ssl_cck->cert && ssl_cck->key) {
@ -407,8 +405,6 @@ int NetworkConnectSSL(Network* n, char* addr, int port, ssl_ca_crt_key_t* ssl_cc
SSL_CTX_set_verify(n->ctx, SSL_VERIFY_NONE, NULL); SSL_CTX_set_verify(n->ctx, SSL_VERIFY_NONE, NULL);
} }
SSL_CTX_set_default_read_buffer_len(n->ctx, frag_len);
sAddr.sin_family = AF_INET; sAddr.sin_family = AF_INET;
sAddr.sin_addr.s_addr = ((struct in_addr*)(ipAddress->h_addr))->s_addr; sAddr.sin_addr.s_addr = ((struct in_addr*)(ipAddress->h_addr))->s_addr;
sAddr.sin_port = htons(port); sAddr.sin_port = htons(port);