generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mbedtls: fix "Logically dead code"

Browse Source 
CID 1332128
This commit is contained in:
Daniel Stenberg 2015-10-29 22:57:09 +01:00
parent 4c62066cec
commit f6ce8c9abb
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/vtls/mbedtls.c
View File

@ -415,8 +415,17 @@ mbedtls_connect_step2(struct connectdata *conn,
conn->send[sockindex] = mbedtls_send; conn->send[sockindex] = mbedtls_send;
for(;;) { for(;;) {
if(!(ret = mbedtls_ssl_handshake(&connssl->ssl))) ret = mbedtls_ssl_handshake(&connssl->ssl);
if(!ret)
break; break;
if(ret == MBEDTLS_ERR_SSL_WANT_READ) {
connssl->connecting_state = ssl_connect_2_reading;
return CURLE_OK;
}
else if(ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
connssl->connecting_state = ssl_connect_2_writing;
return CURLE_OK;
}
else if(ret != MBEDTLS_ERR_SSL_WANT_READ && else if(ret != MBEDTLS_ERR_SSL_WANT_READ &&
ret != MBEDTLS_ERR_SSL_WANT_WRITE) { ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
#ifdef MBEDTLS_ERROR_C #ifdef MBEDTLS_ERROR_C
@ -424,22 +433,8 @@ mbedtls_connect_step2(struct connectdata *conn,
#endif /* MBEDTLS_ERROR_C */ #endif /* MBEDTLS_ERROR_C */
failf(data, "ssl_handshake returned - mbedTLS: (-0x%04X) %s", failf(data, "ssl_handshake returned - mbedTLS: (-0x%04X) %s",
-ret, errorbuf); -ret, errorbuf);
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }
else {
if(ret == MBEDTLS_ERR_SSL_WANT_READ) {
connssl->connecting_state = ssl_connect_2_reading;
return CURLE_OK;
}
if(ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
connssl->connecting_state = ssl_connect_2_writing;
return CURLE_OK;
}
failf(data, "SSL_connect failed with error %d.", ret);
return CURLE_SSL_CONNECT_ERROR;
}
} }
infof(data, "mbedTLS: Handshake complete, cipher is %s\n", infof(data, "mbedTLS: Handshake complete, cipher is %s\n",