From 6c1765ff978e4205974b892418b7c18a95c528ed Mon Sep 17 00:00:00 2001
From: Zhang Jun Hao <zhangjunhao@espressif.com>
Date: Thu, 31 May 2018 15:54:45 +0800
Subject: [PATCH] fix(mqtt): Fix warning in mqtt
---
.../mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c b/components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c
index 5ed7b037..7f6edef7 100755
--- a/components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c
+++ b/components/mqtt/paho/MQTTClient-C/src/FreeRTOS/MQTTFreeRTOS.c
@@ -378,13 +378,11 @@ int NetworkConnectSSL(Network* n, char* addr, int port, ssl_ca_crt_key_t* ssl_cc
}
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;
}
-
- SSL_CTX_add_client_CA(n->ctx, cacrt);
}
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_default_read_buffer_len(n->ctx, frag_len);
-
sAddr.sin_family = AF_INET;
sAddr.sin_addr.s_addr = ((struct in_addr*)(ipAddress->h_addr))->s_addr;
sAddr.sin_port = htons(port);