Merge pull request #329 from cruise2018/iot_link

cruise2018 · web-flow · commit e7dae5b1326a · 2020-03-25T15:51:06.000+08:00
iot_ocmqttv5:modify the dtls cipher suits
diff --git a/change_log.txt b/change_log.txt
@@ -1,3 +1,9 @@
 v1.3.1:
     1,将os的实现接口归一化，清除link_main的os组件相关的编译宏
-    2,将tcpip的实现接口归一化，清除link_main的tcpip组件的编译宏开关
+    2,将tcpip的实现接口归一化，清除link_main的tcpip组件的编译宏开关
+
+v2.0.0:
+    1,增加OC MQTT的V5接口支持,由于设备发放平台暂时不ready,因此先屏蔽
+    2,DTLS增加DTLS AL，用于支持LWM2M MQTT COAP等组件
+    
+     
diff --git a/demos/oc_mqtt_demo/oc_mqtt_v5_demo.c b/demos/oc_mqtt_demo/oc_mqtt_v5_demo.c
@@ -46,67 +46,63 @@
 #include <oc_mqtt_al.h>
 #include <oc_mqtt_profile.h>
 
-///< ANYWAY, YOU COULD CONFIG IT TO THE ONE MODE,ALL THE INFORMATION IS JUST FOR THE TEST
-#if CONFIG_OC_MQTT_DEMO_BS
 
-///< the device bootstrap center
-#define CN_SERVER_IPV4         "119.3.251.30"
-#define CN_SERVER_PORT         "8883"
-#define CN_EP_DEVICEID         "54f107da-f251-436c-af4c-624f33b7d7b6"
-#define CN_EP_PASSWD           "f62fcf47d62c4ed18913"
-#define CN_BOOT_MODE           1
+#define CN_CONNECTMODE_TLS   0
 
-#else
+///< --TODO, the tls with ECHDE will requires more compute ability, and the mcu uptils now will be timeout,
+///<         and i think the platform will make the timeout much longer and fix this problem
 
-#define CN_BOOT_MODE              0
+///< 1.设备接入服务重新更新了证书以及加密套件，椭圆加密算法算法需要大算力去链接服务器，因此对月MCU而言，请选择非加密方案
+///< 2.设备发放平台目前本身在和设备接入做对接，还不ready.
 
-///< the iot device access center
-#define CN_SERVER_IPV4         "119.3.248.253"
-#define CN_SERVER_PORT         "8883"
-#define CN_EP_DEVICEID         "54f107da-f251-436c-af4c-624f33b7d7b6"
-#define CN_EP_PASSWD           "f62fcf47d62c4ed18913"
-//#define CN_EP_DEVICEID         "5d0c76788a48f95ac41bcb9c_sdk1002"
+//#define CN_SERVER_IPV4       "iot-mqtts.cn-north-4.myhuaweicloud.com"
+#define CN_SERVER_IPV4       "121.36.42.100"
 
+#if  CN_CONNECTMODE_TLS
 
-/////< the iot develop center
-//#define CN_SERVER_IPV4         "49.4.93.24"
-//#define CN_SERVER_PORT         "8883"
-//#define CN_EP_DEVICEID         "mqtt_sdk01"
-//#define CN_EP_PASSWD           "c18f10422c93548e6fef"
-#endif
+#define CN_SERVER_PORT       "8883"
+#define CN_SECURITY_TYPE     EN_DTLS_AL_SECURITY_TYPE_CERT
 
-#define CN_LIFE_TIME            60                 ///< the platform need more
+#else
+
+#define CN_SERVER_PORT       "1883"
+#define CN_SECURITY_TYPE     EN_DTLS_AL_SECURITY_TYPE_NONE
+
+#endif
+///< server key
+static const char s_server_ca[] =
+" -----BEGIN CERTIFICATE-----\r\n"
+"MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh\r\n"
+"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\r\n"
+"d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD\r\n"
+"QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT\r\n"
+"MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j\r\n"
+"b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG\r\n"
+"9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB\r\n"
+"CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97\r\n"
+"nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt\r\n"
+"43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P\r\n"
+"T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4\r\n"
+"gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO\r\n"
+"BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR\r\n"
+"TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw\r\n"
+"DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr\r\n"
+"hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg\r\n"
+"06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF\r\n"
+"PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls\r\n"
+"YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk\r\n"
+"CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\r\n"
+"-----END CERTIFICATE-----\r\n";
 
+#define CN_EP_DEVICEID         "54f107da-f251-436c-af4c-624f33b7d7b6"
+#define CN_EP_PASSWD           "f62fcf47d62c4ed18913"
+#define CN_BOOT_MODE            0
+#define CN_LIFE_TIME            60                         ///< the platform need more
 //if your command is very fast,please use a queue here--TODO
 static queue_t                   *s_queue_rcvmsg = NULL;   ///< this is used to cached the message
 static oc_mqtt_profile_service_t  s_device_service;
 
 #ifndef CONFIG_OC_MQTT_DEMO_BS
-///< server key
-static const char s_server_ca[] =
-"-----BEGIN CERTIFICATE-----\r\n"
-"MIID4DCCAsigAwIBAgIJAK97nNS67HRvMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNV\r\n"
-"BAYTAkNOMQswCQYDVQQIEwJHRDELMAkGA1UEBxMCU1oxDzANBgNVBAoTBkh1YXdl\r\n"
-"aTELMAkGA1UECxMCQ04xDDAKBgNVBAMTA0lPVDAeFw0xNjA1MDQxMjE3MjdaFw0y\r\n"
-"NjA1MDIxMjE3MjdaMFMxCzAJBgNVBAYTAkNOMQswCQYDVQQIEwJHRDELMAkGA1UE\r\n"
-"BxMCU1oxDzANBgNVBAoTBkh1YXdlaTELMAkGA1UECxMCQ04xDDAKBgNVBAMTA0lP\r\n"
-"VDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxM9fwkwvxeILpkvoAM\r\n"
-"Gdqq3x0G9o445F6Shg3I0xmmzu9Of8wYuW3c4jtQ/6zscuIGyWf06ke1z//AVZ/o\r\n"
-"dp8LkuFbBbDXR5swjUJ6z15b6yaYH614Ty/d6DrCM+RaU+FWmxmOon9W/VELu2BB\r\n"
-"NXDQHJBSbWrLNGnZA2erk4JSMp7RhHrZ0QaNtT4HhIczFYtQ2lYF+sQJpQMrjoRn\r\n"
-"dSV9WB872Ja4DgcISU1+wuWLmS/NKjIvOWW1upS79yu2I4Rxos2mFy9xxz311rGC\r\n"
-"Z3X65ejFNzCUrNgf6NEP1N7wB9hUu7u50aA+/56D7EgjeI0gpFytC+a4f6JCPVWI\r\n"
-"Lr0CAwEAAaOBtjCBszAdBgNVHQ4EFgQUcGqy59oawLEgMl21//7F5RyABpwwgYMG\r\n"
-"A1UdIwR8MHqAFHBqsufaGsCxIDJdtf/+xeUcgAacoVekVTBTMQswCQYDVQQGEwJD\r\n"
-"TjELMAkGA1UECBMCR0QxCzAJBgNVBAcTAlNaMQ8wDQYDVQQKEwZIdWF3ZWkxCzAJ\r\n"
-"BgNVBAsTAkNOMQwwCgYDVQQDEwNJT1SCCQCve5zUuux0bzAMBgNVHRMEBTADAQH/\r\n"
-"MA0GCSqGSIb3DQEBCwUAA4IBAQBgv2PQn66gRMbGJMSYS48GIFqpCo783TUTePNS\r\n"
-"tV8G1MIiQCpYNdk2wNw/iFjoLRkdx4va6jgceht5iX6SdjpoQF7y5qVDVrScQmsP\r\n"
-"U95IFcOkZJCNtOpUXdT+a3N+NlpxiScyIOtSrQnDFixWMCJQwEfg8j74qO96UvDA\r\n"
-"FuTCocOouER3ZZjQ8MEsMMquNEvMHJkMRX11L5Rxo1pc6J/EMWW5scK2rC0Hg91a\r\n"
-"Lod6aezh2K7KleC0V5ZlIuEvFoBc7bCwcBSAKA3BnQveJ8nEu9pbuBsVAjHOroVb\r\n"
-"8/bL5retJigmAN2GIyFv39TFXIySw+lW0wlp+iSPxO9s9J+t\r\n"
-"-----END CERTIFICATE-----\r\n";
 ///< two way mqtt mode
 static const char s_client_ca[] = \
 "-----BEGIN CERTIFICATE-----\r\n"
@@ -343,19 +339,18 @@ static int task_reportmsg_entry(void *args)
     connect_para.life_time =     CN_LIFE_TIME;
     connect_para.rcvfunc =       app_msg_deal;
 
-    connect_para.security.type = EN_DTLS_AL_SECURITY_TYPE_CERT;
+    connect_para.security.type = CN_SECURITY_TYPE;
 
-#ifndef CONFIG_OC_MQTT_DEMO_BS
 
     connect_para.security.u.cert.server_ca = (uint8_t *)s_server_ca;
     connect_para.security.u.cert.server_ca_len = sizeof(s_server_ca);
+
     connect_para.security.u.cert.client_ca = (uint8_t *)s_client_ca;
     connect_para.security.u.cert.client_ca_len = sizeof(s_client_ca);
     connect_para.security.u.cert.client_pk = (uint8_t *)s_client_pk;
     connect_para.security.u.cert.client_pk_len = sizeof(s_client_pk);
     connect_para.security.u.cert.client_pk_pwd = (uint8_t *)s_client_pk_pwd;
     connect_para.security.u.cert.client_pk_pwd_len = strlen(s_client_pk_pwd);
-#endif
 
     ret = oc_mqtt_profile_connect(&connect_para);
     if((ret != en_oc_mqtt_err_ok))
diff --git a/iot_link/network/dtls/mbedtls/mbedtls.mk b/iot_link/network/dtls/mbedtls/mbedtls.mk
@@ -17,7 +17,7 @@ MBEDTLS_SRC = \
 
 MBEDTLS_DEF = -D WITH_DTLS
 
-ifeq ($(USE_MBEDTLS_DEBUG_C), y)
+ifeq ($(USE_MBEDTLS_DEBUG_C), y) 
     MBEDTLS_DEF += -D MBEDTLS_DEBUG_C
 endif
 
diff --git a/iot_link/network/dtls/mbedtls/mbedtls_port/los_mbedtls_config_cert.h b/iot_link/network/dtls/mbedtls/mbedtls_port/los_mbedtls_config_cert.h
@@ -121,7 +121,7 @@
  * both ends of the connection!  (See comments in "mbedtls/ssl.h".)
  * The optimal size here depends on the typical size of records.
  */
-#define MBEDTLS_SSL_MAX_CONTENT_LEN             2048//5000
+#define MBEDTLS_SSL_MAX_CONTENT_LEN             5000
 #define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
 //#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
 #define MBEDTLS_SSL_ALL_ALERT_MESSAGES
@@ -135,23 +135,22 @@
 #define MBEDTLS_WITH_ONLY_AEAD_CHIPERS
 #define MBEDTLS_ONLY_CCM_8_CHIPERS
 #else
+
 #define MBEDTLS_CIPHER_MODE_CBC
 #define MBEDTLS_SSL_CIPHERSUITES                        \
-        MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA256,MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA256
+        MBEDTLS_TLS_RSA_WITH_AES_256_CBC_SHA256,MBEDTLS_TLS_RSA_WITH_AES_128_CBC_SHA256,MBEDTLS_TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,MBEDTLS_TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,MBEDTLS_TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
 #endif
 
+
 #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
 #define _CRT_SECURE_NO_DEPRECATE 1
 #endif
 // #define MBEDTLS_HAVE_ASM
- //#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
- //#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
+// #define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
+// #define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
  #define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
- //#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
- //#define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-
-
-
+ #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
+ #define MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
 
 //#define MBEDTLS_CIPHER_MODE_CFB
 //#define MBEDTLS_CIPHER_MODE_CTR
@@ -162,14 +161,14 @@
 #define MBEDTLS_CIPHER_PADDING_ZEROS
 //#define MBEDTLS_ECDSA_DETERMINISTIC
 //#define MBEDTLS_ECP_NIST_OPTIM
-//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
-//#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
+#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
 //#define MBEDTLS_ECP_DP_BP256R1_ENABLED
 //#define MBEDTLS_ECP_DP_BP384R1_ENABLED
 //#define MBEDTLS_ECP_DP_BP512R1_ENABLED
@@ -210,11 +209,11 @@
 #define MBEDTLS_CERTS_C
 //#define MBEDTLS_DES_C
 //#define MBEDTLS_DHM_C
-//#define MBEDTLS_ECDH_C
-//#define MBEDTLS_ECDSA_C
-//#define MBEDTLS_ECP_C
+#define MBEDTLS_ECDH_C
+#define MBEDTLS_ECDSA_C
+#define MBEDTLS_ECP_C
 #define MBEDTLS_ERROR_C
-//#define MBEDTLS_GCM_C
+#define MBEDTLS_GCM_C
 //#define MBEDTLS_HMAC_DRBG_C
 //#define MBEDTLS_MD5_C
 #define MBEDTLS_OID_C
@@ -243,12 +242,7 @@
  #define MBEDTLS_X509_CSR_WRITE_C
 //#define MBEDTLS_XTEA_C
 //#define MBEDTLS_TLS_DEFAULT_ALLOW_SHA1_IN_KEY_EXCHANGE
-//#define MBEDTLS_SHA1_C
-
-
-//#define MBEDTLS_DEBUG_C   1
-//#define MBEDTLS_BIGNUM_C  1
-//#define MBEDTLS_X509_CRT_PARSE_C  1
+#define MBEDTLS_SHA1_C
 
 
 #include "mbedtls/check_config.h"
diff --git a/iot_link/network/tcpip/sal/sal.c b/iot_link/network/tcpip/sal/sal.c
@@ -500,12 +500,13 @@ int sal_closesocket(int sockfd)
 
 struct hostent * sal_gethostbyname(const char *name)
 {
+    struct hostent *ret =NULL;
     if((NULL != s_sal_cb.domain)&&(NULL != s_sal_cb.domain->ops) &&\
        (NULL != s_sal_cb.domain->ops->gethostbyname))
     {
-        return (struct hostent *)s_sal_cb.domain->ops->gethostbyname(name);
+        ret = (struct hostent *)s_sal_cb.domain->ops->gethostbyname(name);
     }
-    return NULL;
+    return ret;
 }
 
 int sal_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout)
diff --git a/iot_link/oc/oc_mqtt/oc_mqtt_tiny_v5/oc_mqtt_tiny.c b/iot_link/oc/oc_mqtt/oc_mqtt_tiny_v5/oc_mqtt_tiny.c
@@ -60,28 +60,27 @@
 
 ////CRT FOR THE OC
 static const char s_oc_mqtt_ca_crt[] =
-"-----BEGIN CERTIFICATE-----\r\n"
-"MIID4DCCAsigAwIBAgIJAK97nNS67HRvMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNV\r\n"
-"BAYTAkNOMQswCQYDVQQIEwJHRDELMAkGA1UEBxMCU1oxDzANBgNVBAoTBkh1YXdl\r\n"
-"aTELMAkGA1UECxMCQ04xDDAKBgNVBAMTA0lPVDAeFw0xNjA1MDQxMjE3MjdaFw0y\r\n"
-"NjA1MDIxMjE3MjdaMFMxCzAJBgNVBAYTAkNOMQswCQYDVQQIEwJHRDELMAkGA1UE\r\n"
-"BxMCU1oxDzANBgNVBAoTBkh1YXdlaTELMAkGA1UECxMCQ04xDDAKBgNVBAMTA0lP\r\n"
-"VDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJxM9fwkwvxeILpkvoAM\r\n"
-"Gdqq3x0G9o445F6Shg3I0xmmzu9Of8wYuW3c4jtQ/6zscuIGyWf06ke1z//AVZ/o\r\n"
-"dp8LkuFbBbDXR5swjUJ6z15b6yaYH614Ty/d6DrCM+RaU+FWmxmOon9W/VELu2BB\r\n"
-"NXDQHJBSbWrLNGnZA2erk4JSMp7RhHrZ0QaNtT4HhIczFYtQ2lYF+sQJpQMrjoRn\r\n"
-"dSV9WB872Ja4DgcISU1+wuWLmS/NKjIvOWW1upS79yu2I4Rxos2mFy9xxz311rGC\r\n"
-"Z3X65ejFNzCUrNgf6NEP1N7wB9hUu7u50aA+/56D7EgjeI0gpFytC+a4f6JCPVWI\r\n"
-"Lr0CAwEAAaOBtjCBszAdBgNVHQ4EFgQUcGqy59oawLEgMl21//7F5RyABpwwgYMG\r\n"
-"A1UdIwR8MHqAFHBqsufaGsCxIDJdtf/+xeUcgAacoVekVTBTMQswCQYDVQQGEwJD\r\n"
-"TjELMAkGA1UECBMCR0QxCzAJBgNVBAcTAlNaMQ8wDQYDVQQKEwZIdWF3ZWkxCzAJ\r\n"
-"BgNVBAsTAkNOMQwwCgYDVQQDEwNJT1SCCQCve5zUuux0bzAMBgNVHRMEBTADAQH/\r\n"
-"MA0GCSqGSIb3DQEBCwUAA4IBAQBgv2PQn66gRMbGJMSYS48GIFqpCo783TUTePNS\r\n"
-"tV8G1MIiQCpYNdk2wNw/iFjoLRkdx4va6jgceht5iX6SdjpoQF7y5qVDVrScQmsP\r\n"
-"U95IFcOkZJCNtOpUXdT+a3N+NlpxiScyIOtSrQnDFixWMCJQwEfg8j74qO96UvDA\r\n"
-"FuTCocOouER3ZZjQ8MEsMMquNEvMHJkMRX11L5Rxo1pc6J/EMWW5scK2rC0Hg91a\r\n"
-"Lod6aezh2K7KleC0V5ZlIuEvFoBc7bCwcBSAKA3BnQveJ8nEu9pbuBsVAjHOroVb\r\n"
-"8/bL5retJigmAN2GIyFv39TFXIySw+lW0wlp+iSPxO9s9J+t\r\n"
+" -----BEGIN CERTIFICATE-----\r\n"
+"MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh\r\n"
+"MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\r\n"
+"d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD\r\n"
+"QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT\r\n"
+"MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j\r\n"
+"b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG\r\n"
+"9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB\r\n"
+"CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97\r\n"
+"nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt\r\n"
+"43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P\r\n"
+"T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4\r\n"
+"gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO\r\n"
+"BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR\r\n"
+"TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw\r\n"
+"DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr\r\n"
+"hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg\r\n"
+"06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF\r\n"
+"PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls\r\n"
+"YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk\r\n"
+"CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=\r\n"
 "-----END CERTIFICATE-----\r\n";
 
 
diff --git a/targets/STM32F429IGTx_FIRE/GCC/config.mk b/targets/STM32F429IGTx_FIRE/GCC/config.mk
@@ -14,7 +14,7 @@
 # * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 # * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
 # * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# * PURPOSE ARE DISCLAIMED. IN NO EVENT   THE COPYRIGHT HOLDER OR
 # * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 # * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 # * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
diff --git a/targets/STM32F429_GSL/GCC/config.mk b/targets/STM32F429_GSL/GCC/config.mk
@@ -167,7 +167,7 @@ CONFIG_PCP_ENABLE      := n
 #CONFIG_DEMO_TYPE could be "oc_coap_demo" "oc_dtls_coap_demo" "oc_dtls_lwm2m_bs_demo" "oc_dtls_lwm2m_demo" "oc_dtls_lwm2m_ota_demo"
 #"oc_lwm2m_bs_demo"  "oc_lwm2m_demo" "oc_lwm2m_ota_demo" "stimer_demo"
 
-CONFIG_DEMO_ENABLE := n
+CONFIG_DEMO_ENABLE := y
 CONFIG_DEMO_TYPE   := ""
 
 #########################STANDARD DEMO END######################################
diff --git a/targets/STM32F429_GSL/Src/app_main.c b/targets/STM32F429_GSL/Src/app_main.c
@@ -1038,6 +1038,7 @@ static int deal_iotconnect(unsigned int counter)
 
     deal_commonfresh(counter);
 
+    iot_disconnect();
     ret = iot_connect();
     if(0 == ret)
     {
diff --git a/targets/STM32F429_GSL/Src/iot_main.c b/targets/STM32F429_GSL/Src/iot_main.c
@@ -50,9 +50,9 @@
 /** the address product_id device_id password crt is only for the test  */
 
 #define DEFAULT_LIFETIME            60                 ///< the platform need more
-#define DEFAULT_SERVER_IPV4         "119.3.251.30"     ///<  server ip address
+#define DEFAULT_SERVER_IPV4         "119.3.248.253"     ///<  server ip address
 #define DEFAULT_SERVER_PORT         "8883"             ///<  server mqtt service port
-#define CN_MQTT_EP_NOTEID           "mqtt_sdk81"
+#define CN_MQTT_EP_NOTEID           "mqtt_sdk82"
 #define CN_MQTT_EP_PASSWD           "f62fcf47d62c4ed18913"
 
 //if your command is very fast,please use a queue here--TODO
@@ -244,7 +244,7 @@ int iot_connect()
 
     memset(&config, 0, sizeof(config));
 
-    config.boot_mode = en_oc_mqtt_mode_bs_static_nodeid_hmacsha256_notimecheck_json;
+    config.boot_mode = en_oc_mqtt_mode_nobs_static_nodeid_hmacsha256_notimecheck_json;
     config.msg_deal = app_msg_deal;
     config.msg_deal_arg = NULL;
     config.lifetime = DEFAULT_LIFETIME;

Original file line number	Diff line number	Diff line change
`@@ -500,12 +500,13 @@ int sal_closesocket(int sockfd)`
`500`	`500`
`501`	`501`	`struct hostent * sal_gethostbyname(const char *name)`
`502`	`502`	`{`
	`503`	`+ struct hostent *ret =NULL;`
`503`	`504`	`if((NULL != s_sal_cb.domain)&&(NULL != s_sal_cb.domain->ops) &&\`
`504`	`505`	`(NULL != s_sal_cb.domain->ops->gethostbyname))`
`505`	`506`	`{`
`506`		`- return (struct hostent *)s_sal_cb.domain->ops->gethostbyname(name);`
	`507`	`+ ret = (struct hostent *)s_sal_cb.domain->ops->gethostbyname(name);`
`507`	`508`	`}`
`508`		`- return NULL;`
	`509`	`+ return ret;`
`509`	`510`	`}`
`510`	`511`
`511`	`512`	`int sal_select(int nfds, fd_set readfds, fd_set writefds, fd_set exceptfds, struct timeval timeout)`
Original file line number	Diff line number	Diff line change
`@@ -1038,6 +1038,7 @@ static int deal_iotconnect(unsigned int counter)`
`1038`	`1038`
`1039`	`1039`	`deal_commonfresh(counter);`
`1040`	`1040`
	`1041`	`+ iot_disconnect();`
`1041`	`1042`	`ret = iot_connect();`
`1042`	`1043`	`if(0 == ret)`
`1043`	`1044`	`{`