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

Merge branch 'bugfix/aws-iot-wolfssl' into 'master'

Browse Source 
Fix a bug of using wolfssl wrapper

See merge request sdk/ESP8266_RTOS_SDK!902
This commit is contained in:
Wu Jian Gang
2019-04-18 16:36:22 +08:00
parent 8fca88d5b7 d9e69633fc
commit fed71efd23
1 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
components/aws_iot/port/network_mbedtls_wrapper.c
View File

@ -90,9 +90,7 @@ IoT_Error_t iot_tls_connect(Network *pNetwork, TLSConnectParams *params) {
.clientcert_pem_buf = (const unsigned char *)pNetwork->tlsConnectParams.pDeviceCertLocation, .clientcert_pem_buf = (const unsigned char *)pNetwork->tlsConnectParams.pDeviceCertLocation,
.clientcert_pem_bytes = strlen(pNetwork->tlsConnectParams.pDeviceCertLocation) + 1, .clientcert_pem_bytes = strlen(pNetwork->tlsConnectParams.pDeviceCertLocation) + 1,
.clientkey_pem_buf = (const unsigned char *)pNetwork->tlsConnectParams.pDevicePrivateKeyLocation, .clientkey_pem_buf = (const unsigned char *)pNetwork->tlsConnectParams.pDevicePrivateKeyLocation,
.clientkey_pem_bytes = strlen(pNetwork->tlsConnectParams.pDevicePrivateKeyLocation) + 1, .clientkey_pem_bytes = strlen(pNetwork->tlsConnectParams.pDevicePrivateKeyLocation) + 1
.timeout_ms = pNetwork->tlsConnectParams.timeout_ms,
.non_block = true
}; };
/* Use the AWS IoT ALPN extension for MQTT, if port 443 is requested */ /* Use the AWS IoT ALPN extension for MQTT, if port 443 is requested */
@ -131,8 +129,8 @@ IoT_Error_t iot_tls_write(Network *pNetwork, unsigned char *pMsg, size_t len, Ti
written_so_far < len && !has_timer_expired(timer); written_so_far += ret, frags++) { written_so_far < len && !has_timer_expired(timer); written_so_far += ret, frags++) {
while(!has_timer_expired(timer) && while(!has_timer_expired(timer) &&
(ret = esp_tls_conn_write(tls, pMsg + written_so_far, len - written_so_far)) <= 0) { (ret = esp_tls_conn_write(tls, pMsg + written_so_far, len - written_so_far)) <= 0) {
if(ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) { if(ret != ESP_TLS_ERROR_WANT_READ && ret != ESP_TLS_ERROR_WANT_WRITE) {
ESP_LOGE(TAG, "failed! mbedtls_ssl_write returned -0x%x", -ret); ESP_LOGE(TAG, "failed! esp_tls_conn_write returned -0x%x", -ret);
/* All other negative return values indicate connection needs to be reset. /* All other negative return values indicate connection needs to be reset.
* Will be caught in ping request so ignored here */ * Will be caught in ping request so ignored here */
isErrorFlag = true; isErrorFlag = true;
@ -183,7 +181,7 @@ IoT_Error_t iot_tls_read(Network *pNetwork, unsigned char *pMsg, size_t len, Tim
rxLen += ret; rxLen += ret;
pMsg += ret; pMsg += ret;
len -= ret; len -= ret;
} else if (ret == 0 || (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE && ret != MBEDTLS_ERR_SSL_TIMEOUT)) { } else if (ret == 0 || (ret != ESP_TLS_ERROR_WANT_READ && ret != ESP_TLS_ERROR_WANT_WRITE)) {
return NETWORK_SSL_READ_ERROR; return NETWORK_SSL_READ_ERROR;
} }
@ -206,13 +204,13 @@ IoT_Error_t iot_tls_read(Network *pNetwork, unsigned char *pMsg, size_t len, Tim
} }
IoT_Error_t iot_tls_disconnect(Network *pNetwork) { IoT_Error_t iot_tls_disconnect(Network *pNetwork) {
if (pNetwork) {
TLSDataParams *tlsDataParams = &(pNetwork->tlsDataParams); TLSDataParams *tlsDataParams = &(pNetwork->tlsDataParams);
struct esp_tls *tls = (struct esp_tls *) tlsDataParams->handle; struct esp_tls *tls = (struct esp_tls *) tlsDataParams->handle;
if (!tls) { if (tls) {
return NULL_VALUE_ERROR;
}
esp_tls_conn_delete(tls); esp_tls_conn_delete(tls);
}
}
/* All other negative return values indicate connection needs to be reset. /* All other negative return values indicate connection needs to be reset.
* No further action required since this is disconnect call */ * No further action required since this is disconnect call */
@ -221,13 +219,13 @@ IoT_Error_t iot_tls_disconnect(Network *pNetwork) {
} }
IoT_Error_t iot_tls_destroy(Network *pNetwork) { IoT_Error_t iot_tls_destroy(Network *pNetwork) {
if (pNetwork) {
TLSDataParams *tlsDataParams = &(pNetwork->tlsDataParams); TLSDataParams *tlsDataParams = &(pNetwork->tlsDataParams);
struct esp_tls *tls = (struct esp_tls *) tlsDataParams->handle; struct esp_tls *tls = (struct esp_tls *) tlsDataParams->handle;
if (!tls) { if (tls) {
return NULL_VALUE_ERROR;
}
esp_tls_conn_delete(tls); esp_tls_conn_delete(tls);
}
}
return SUCCESS; return SUCCESS;
} }