Merge branch 'dynreg-domain-ca-modify' into 'master' (merge request !7)

合入 dynreg-domain-ca-modify

samples/dynreg_dev/dynreg_dev_sample.c

@@ -24,9 +24,9 @@
 
 #ifdef AUTH_MODE_CERT
 /* NULL cert file */
-#define QCLOUD_IOT_NULL_CERT_FILENAME "YOUR_DEVICE_NAME_cert.crt"
+#define QCLOUD_IOT_NULL_CERT_FILENAME "YOUR_DEVICE_CERT_FILE_NAME"
 /* NULL key file */
-#define QCLOUD_IOT_NULL_KEY_FILENAME "YOUR_DEVICE_NAME_private.key"
+#define QCLOUD_IOT_NULL_KEY_FILENAME "YOUR_DEVICE_PRIVATE_KEY_FILE_NAME"
 #else
 /* NULL device secret */
 #define QCLOUD_IOT_NULL_DEVICE_SECRET "YOUR_IOT_PSK"

sdk_src/internal_inc/qcloud_iot_ca.h

@@ -22,6 +22,8 @@ extern "C" {
 
 const char *iot_ca_get(void);
 
+const char *iot_dynreg_https_ca_get();
+
 const char *iot_https_ca_get(void);
 
 #ifdef __cplusplus

sdk_src/internal_inc/qcloud_iot_common.h

@@ -30,7 +30,7 @@
 #define COAP_SERVER_PORT               5684
 
 /* server domain for dynamic registering device */
-#define DYN_REG_SERVER_URL      "gateway.tencentdevices.com"
+#define DYN_REG_SERVER_URL      "ap-guangzhou.gateway.tencentdevices.com"
 #define DYN_REG_SERVER_PORT     80
 #define DYN_REG_SERVER_PORT_TLS 443
 

sdk_src/protocol/http/utils_httpc.c

@@ -508,12 +508,12 @@ static int _http_client_retrieve_content(HTTPClient *client, char *data, int len
             }
         } while (readLen);
 
+        len = readLen;
         if (client_data->is_chunked) {
             if (len < 2) {
                 int new_trf_len, rc;
                 /* Read missing chars to find end of chunk */
-                rc = _http_client_recv(client, data + len, 2 - len, HTTP_CLIENT_CHUNK_SIZE - len - 1, &new_trf_len,
-                                       left_ms(&timer), client_data);
+                rc = _http_client_recv(client, data + len, 2 - len, 7, &new_trf_len, left_ms(&timer), client_data);
                 if ((rc != QCLOUD_RET_SUCCESS) || (0 >= left_ms(&timer))) {
                     Log_w("_http_client_recv ret: %d, left_time: %d", rc, left_ms(&timer));
                     IOT_FUNC_EXIT_RC(rc);
@@ -607,7 +607,7 @@ static int _http_client_response_parse(HTTPClient *client, char *data, int len,
         client_data->retrieve_len         = client_data->response_content_len;
     } else if (NULL != (tmp_ptr = strstr(data, "Transfer-Encoding"))) {
         int   len_chunk   = strlen("Chunked");
-        char *chunk_value = data + strlen("Transfer-Encoding: ");
+        char *chunk_value = tmp_ptr + strlen("Transfer-Encoding: ");
 
         if ((!memcmp(chunk_value, "Chunked", len_chunk)) || (!memcmp(chunk_value, "chunked", len_chunk))) {
             client_data->is_chunked           = IOT_TRUE;

sdk_src/services/dynreg/dynreg.c

@@ -365,7 +365,7 @@ static int _post_reg_request_by_http(char *request_buf, DeviceInfo *pDevInfo)
 #ifndef AUTH_WITH_NOTLS
     HAL_Snprintf(url, REG_URL_MAX_LEN, url_format, "https", DYN_REG_SERVER_URL);
     port   = DYN_REG_SERVER_PORT_TLS;
-    ca_crt = iot_ca_get();
+    ca_crt = iot_dynreg_https_ca_get();
 #else
     HAL_Snprintf(url, REG_URL_MAX_LEN, url_format, "http", DYN_REG_SERVER_URL);
     port = DYN_REG_SERVER_PORT;

sdk_src/utils/qcloud_iot_ca.c

@@ -24,7 +24,65 @@ extern "C" {
 #include "qcloud_iot_import.h"
 
 #ifndef AUTH_WITH_NOTLS
-#if defined(AUTH_MODE_CERT) || defined(DEV_DYN_REG_ENABLED)
+#if defined(DEV_DYN_REG_ENABLED)
+static const char *iot_dynreg_https_ca_crt = {
+    "-----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"
+    "-----BEGIN CERTIFICATE-----\r\n"
+    "MIIFGjCCBAKgAwIBAgIQCgRw0Ja8ihLIkKbfgm7sSzANBgkqhkiG9w0BAQsFADBh\r\n"
+    "MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3\r\n"
+    "d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD\r\n"
+    "QTAeFw0xOTA2MjAxMjI3NThaFw0yOTA2MjAxMjI3NThaMF8xCzAJBgNVBAYTAlVT\r\n"
+    "MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j\r\n"
+    "b20xHjAcBgNVBAMTFUdlb1RydXN0IENOIFJTQSBDQSBHMTCCASIwDQYJKoZIhvcN\r\n"
+    "AQEBBQADggEPADCCAQoCggEBALFJ+j1KeZVG4jzgQob23lQ8PJUNhY31ufZihuUx\r\n"
+    "hYc6HSU4Lw0fxfA43a9DpJl74M3E6F1ZRBOfJ+dWnaiyYD0PxRIQd4wJisti4Uad\r\n"
+    "vz61IYY/oQ/Elxk/X7GFDquYuxCSyBdHtTVMXCxFSvQ2C/7jWZFDfGGKKNoQSiJy\r\n"
+    "wDe8iiHbUOakLMmXmOTZyWJnFdR/TH5YNTiMKCNUPHAleG4IigGxDyL/gbwrdDNi\r\n"
+    "bDA4lUNhD0xNvPjQ8BNKqm5HWDvirUuHdC+4hpi0GJO34O3iiRV16YmWTuVFNboU\r\n"
+    "LDZ0+PQtctJnatpuZKPGyKX6jCpPvzzPw/EhNDlpEdrYHZMCAwEAAaOCAc4wggHK\r\n"
+    "MB0GA1UdDgQWBBSRn14xFa4Qn61gwffBzKpINC8MJjAfBgNVHSMEGDAWgBQD3lA1\r\n"
+    "VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYB\r\n"
+    "BQUHAwEGCCsGAQUFBwMCMA8GA1UdEwEB/wQFMAMBAf8wMQYIKwYBBQUHAQEEJTAj\r\n"
+    "MCEGCCsGAQUFBzABhhVodHRwOi8vb2NzcC5kY29jc3AuY24wRAYDVR0fBD0wOzA5\r\n"
+    "oDegNYYzaHR0cDovL2NybC5kaWdpY2VydC1jbi5jb20vRGlnaUNlcnRHbG9iYWxS\r\n"
+    "b290Q0EuY3JsMIHOBgNVHSAEgcYwgcMwgcAGBFUdIAAwgbcwKAYIKwYBBQUHAgEW\r\n"
+    "HGh0dHBzOi8vd3d3LmRpZ2ljZXJ0LmNvbS9DUFMwgYoGCCsGAQUFBwICMH4MfEFu\r\n"
+    "eSB1c2Ugb2YgdGhpcyBDZXJ0aWZpY2F0ZSBjb25zdGl0dXRlcyBhY2NlcHRhbmNl\r\n"
+    "IG9mIHRoZSBSZWx5aW5nIFBhcnR5IEFncmVlbWVudCBsb2NhdGVkIGF0IGh0dHBz\r\n"
+    "Oi8vd3d3LmRpZ2ljZXJ0LmNvbS9ycGEtdWEwDQYJKoZIhvcNAQELBQADggEBABfg\r\n"
+    "eXrxIrtlixBv+KMDeqKxtNJbZiLDzJBkGCd4HI63X5eS6BElJBn6mI9eYVrr7qOL\r\n"
+    "Tp7WiO02Sf1Yrpaz/ePSjZ684o89UAGpxOfbgVSMvo/a07n/220jUWLxzaJhQNLu\r\n"
+    "lACXwwWsxYf8twP8glkoIHnUUNTlhsyyl1ZzvVC4bDpI4hC6QkJGync1MNqYSMj8\r\n"
+    "tZbhQNw3HdSmcTO0Nc/J/pK2VZc6fFbKBgspmzdHc6jMKG2t4lisXEysS3wPcg0a\r\n"
+    "Nfr1Odl5+myh3MnMK08f6pTXvduLz+QZiIh8IYL+Z6QWgTZ9e2jnV8juumX1I8Ge\r\n"
+    "7cZdtNnTCB8hFfwGLUA=\r\n"
+    "-----END CERTIFICATE-----"};
+#endif
+#endif
+
+#ifndef AUTH_WITH_NOTLS
+#if defined(AUTH_MODE_CERT)
 static const char *iot_ca_crt = {
     "-----BEGIN CERTIFICATE-----\r\n"
     "MIIDxTCCAq2gAwIBAgIJALM1winYO2xzMA0GCSqGSIb3DQEBCwUAMHkxCzAJBgNV\r\n"
@@ -106,7 +164,7 @@ static const char *iot_https_ca_crt = {
 const char *iot_ca_get()
 {
 #ifndef AUTH_WITH_NOTLS
-#if defined(AUTH_MODE_CERT) || defined(DEV_DYN_REG_ENABLED)
+#if defined(AUTH_MODE_CERT)
     return iot_ca_crt;
 #else
     return NULL;
@@ -116,6 +174,20 @@ const char *iot_ca_get()
 #endif
 }
 
+const char *iot_dynreg_https_ca_get()
+{
+#ifndef AUTH_WITH_NOTLS
+#if defined(DEV_DYN_REG_ENABLED)
+    return iot_dynreg_https_ca_crt;
+#else
+    return NULL;
+#endif
+#else
+    return NULL;
+#endif
+}
+
+
 const char *iot_https_ca_get()
 {
 #ifndef AUTH_WITH_NOTLS