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

openssl: Use 'CURLcode result'

Browse Source 
More CURLcode fixes.
This commit is contained in:
Steve Holme 2014-11-01 16:44:32 +00:00
parent 9bc2582c31
commit b04eef1318
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/vtls/openssl.c
View File

@ -1449,6 +1449,7 @@ select_next_proto_cb(SSL *ssl,
{ {
struct connectdata *conn = (struct connectdata*) arg; struct connectdata *conn = (struct connectdata*) arg;
int retval = nghttp2_select_next_protocol(out, outlen, in, inlen); int retval = nghttp2_select_next_protocol(out, outlen, in, inlen);
(void)ssl; (void)ssl;
if(retval == 1) { if(retval == 1) {
@ -1471,7 +1472,8 @@ select_next_proto_cb(SSL *ssl,
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_OK;
} }
#endif /* HAS_NPN */ #endif /* HAS_NPN */
#endif
#endif /* USE_NGHTTP2 */
static const char * static const char *
get_ssl_version_txt(SSL_SESSION *session) get_ssl_version_txt(SSL_SESSION *session)
@ -2643,13 +2645,12 @@ static CURLcode ossl_connect_step3(struct connectdata *conn, int sockindex)
static Curl_recv ossl_recv; static Curl_recv ossl_recv;
static Curl_send ossl_send; static Curl_send ossl_send;
static CURLcode static CURLcode ossl_connect_common(struct connectdata *conn,
ossl_connect_common(struct connectdata *conn, int sockindex,
int sockindex, bool nonblocking,
bool nonblocking, bool *done)
bool *done)
{ {
CURLcode retcode; CURLcode result;
struct SessionHandle *data = conn->data; struct SessionHandle *data = conn->data;
struct ssl_connect_data *connssl = &conn->ssl[sockindex]; struct ssl_connect_data *connssl = &conn->ssl[sockindex];
curl_socket_t sockfd = conn->sock[sockindex]; curl_socket_t sockfd = conn->sock[sockindex];
@ -2662,7 +2663,7 @@ ossl_connect_common(struct connectdata *conn,
return CURLE_OK; return CURLE_OK;
} }
if(ssl_connect_1==connssl->connecting_state) { if(ssl_connect_1 == connssl->connecting_state) {
/* Find out how much more time we're allowed */ /* Find out how much more time we're allowed */
timeout_ms = Curl_timeleft(data, NULL, TRUE); timeout_ms = Curl_timeleft(data, NULL, TRUE);
@ -2671,9 +2672,10 @@ ossl_connect_common(struct connectdata *conn,
failf(data, "SSL connection timeout"); failf(data, "SSL connection timeout");
return CURLE_OPERATION_TIMEDOUT; return CURLE_OPERATION_TIMEDOUT;
} }
retcode = ossl_connect_step1(conn, sockindex);
if(retcode) result = ossl_connect_step1(conn, sockindex);
return retcode; if(result)
return result;
} }
while(ssl_connect_2 == connssl->connecting_state || while(ssl_connect_2 == connssl->connecting_state ||
@ -2690,8 +2692,8 @@ ossl_connect_common(struct connectdata *conn,
} }
/* if ssl is expecting something, check if it's available. */ /* if ssl is expecting something, check if it's available. */
if(connssl->connecting_state == ssl_connect_2_reading if(connssl->connecting_state == ssl_connect_2_reading ||
|| connssl->connecting_state == ssl_connect_2_writing) { connssl->connecting_state == ssl_connect_2_writing) {
curl_socket_t writefd = ssl_connect_2_writing== curl_socket_t writefd = ssl_connect_2_writing==
connssl->connecting_state?sockfd:CURL_SOCKET_BAD; connssl->connecting_state?sockfd:CURL_SOCKET_BAD;
@ -2724,23 +2726,22 @@ ossl_connect_common(struct connectdata *conn,
* before step2 has completed while ensuring that a client using select() * before step2 has completed while ensuring that a client using select()
* or epoll() will always have a valid fdset to wait on. * or epoll() will always have a valid fdset to wait on.
*/ */
retcode = ossl_connect_step2(conn, sockindex); result = ossl_connect_step2(conn, sockindex);
if(retcode || (nonblocking && if(result || (nonblocking &&
(ssl_connect_2 == connssl->connecting_state || (ssl_connect_2 == connssl->connecting_state ||
ssl_connect_2_reading == connssl->connecting_state || ssl_connect_2_reading == connssl->connecting_state ||
ssl_connect_2_writing == connssl->connecting_state))) ssl_connect_2_writing == connssl->connecting_state)))
return retcode; return result;
} /* repeat step2 until all transactions are done. */ } /* repeat step2 until all transactions are done. */
if(ssl_connect_3 == connssl->connecting_state) {
if(ssl_connect_3==connssl->connecting_state) { result = ossl_connect_step3(conn, sockindex);
retcode = ossl_connect_step3(conn, sockindex); if(result)
if(retcode) return result;
return retcode;
} }
if(ssl_connect_done==connssl->connecting_state) { if(ssl_connect_done == connssl->connecting_state) {
connssl->state = ssl_connection_complete; connssl->state = ssl_connection_complete;
conn->recv[sockindex] = ossl_recv; conn->recv[sockindex] = ossl_recv;
conn->send[sockindex] = ossl_send; conn->send[sockindex] = ossl_send;