devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tls: don't hang with openssl implementation

Browse Source 
* Exit from tls_start() on fatal errors. If SSL_connect() fails and
  returns -1 this leads to endless loop in case of fatal error.
* Don't set writefds on SSL_ERROR_WANT_READ. Otherwise, this makes
  select(2) exit immediately what leads to CPU usage.
This commit is contained in:
Dmitry Podgorny
2015-10-13 02:35:57 +03:00
parent 442914c375
commit b04c40d3ea
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/tls_openssl.c
View File

@@ -96,34 +96,38 @@ int tls_set_credentials(tls_t *tls, const char *cafilename)
int tls_start(tls_t *tls) int tls_start(tls_t *tls)
{ {
int ret = -1; fd_set fds;
struct timeval tv;
int error;
int ret;
/* Since we're non-blocking, loop the connect call until it /* Since we're non-blocking, loop the connect call until it
succeeds or fails */ succeeds or fails */
while (ret == -1) { while (1) {
ret = SSL_connect(tls->ssl); ret = SSL_connect(tls->ssl);
error = ret <= 0 ? SSL_get_error(tls->ssl, ret) : 0;
/* wait for something to happen on the sock before looping back */ if (ret == -1 && tls_is_recoverable(error)) {
if (ret == -1) { /* wait for something to happen on the sock before looping back */
fd_set fds; tv.tv_sec = 0;
struct timeval tv; tv.tv_usec = 1000;
tv.tv_sec = 0; FD_ZERO(&fds);
tv.tv_usec = 1000; FD_SET(tls->sock, &fds);
FD_ZERO(&fds);
FD_SET(tls->sock, &fds);
select(tls->sock + 1, &fds, &fds, NULL, &tv); if (error == SSL_ERROR_WANT_READ)
} select(tls->sock + 1, &fds, NULL, NULL, &tv);
} else
select(tls->sock + 1, NULL, &fds, NULL, &tv);
continue;
}
if (ret <= 0) { /* success or fatal error */
tls->lasterror = SSL_get_error(tls->ssl, ret); break;
return 0;
} }
tls->lasterror = error;
return 1; return ret <= 0 ? 0 : 1;
} }
@@ -132,13 +136,9 @@ int tls_stop(tls_t *tls)
int ret; int ret;
ret = SSL_shutdown(tls->ssl); ret = SSL_shutdown(tls->ssl);
tls->lasterror = ret <= 0 ? SSL_get_error(tls->ssl, ret) : 0;
if (ret <= 0) { return ret <= 0 ? 0 : 1;
tls->lasterror = SSL_get_error(tls->ssl, ret);
return 0;
}
return 1;
} }
int tls_is_recoverable(int error) int tls_is_recoverable(int error)