jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #249 from metalefty/freebsd/tls

Browse Source 
common: fix #248 TLS on FreeBSD
This commit is contained in:
Idan Freiberg 2015-06-12 10:55:16 +03:00
commit 2a8209ca8b
1 changed files with 77 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
common/ssl_calls.c
View File

@ -562,11 +562,7 @@ ssl_tls_print_error(char *func, SSL *connection, int value)
return 1; return 1;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
g_writeln("ssl_tls_print_error: SSL_ERROR_WANT_READ");
return 0;
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
g_writeln("ssl_tls_print_error: SSL_ERROR_WANT_WRITE");
return 0; return 0;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
@ -669,6 +665,7 @@ ssl_tls_accept(struct ssl_tls *self)
return 1; return 1;
} }
while(1) {
connection_status = SSL_accept(self->ssl); connection_status = SSL_accept(self->ssl);
if (connection_status <= 0) if (connection_status <= 0)
@ -677,6 +674,16 @@ ssl_tls_accept(struct ssl_tls *self)
{ {
return 1; return 1;
} }
/**
* retry when SSL_get_error returns:
* SSL_ERROR_WANT_READ
* SSL_ERROR_WANT_WRITE
*/
}
else
{
break;
}
} }
g_writeln("ssl_tls_accept: TLS connection accepted"); g_writeln("ssl_tls_accept: TLS connection accepted");
@ -709,6 +716,11 @@ ssl_tls_disconnect(struct ssl_tls *self)
{ {
return 1; return 1;
} }
/**
* retry when SSL_get_error returns:
* SSL_ERROR_WANT_READ
* SSL_ERROR_WANT_WRITE
*/
} }
} }
return 0; return 0;
@ -737,25 +749,39 @@ int APP_CC
ssl_tls_read(struct ssl_tls *tls, char *data, int length) ssl_tls_read(struct ssl_tls *tls, char *data, int length)
{ {
int status; int status;
int break_flag;
while(1) {
status = SSL_read(tls->ssl, data, length); status = SSL_read(tls->ssl, data, length);
switch (SSL_get_error(tls->ssl, status)) switch (SSL_get_error(tls->ssl, status))
{ {
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
break_flag = 1;
break; break;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
status = 0; /**
break; * retry when SSL_get_error returns:
* SSL_ERROR_WANT_READ
* SSL_ERROR_WANT_WRITE
*/
continue;
default: default:
ssl_tls_print_error("SSL_read", tls->ssl, status); ssl_tls_print_error("SSL_read", tls->ssl, status);
status = -1; status = -1;
break_flag = 1;
break; break;
} }
if (break_flag)
{
break;
}
}
if (SSL_pending(tls->ssl) > 0) if (SSL_pending(tls->ssl) > 0)
{ {
g_set_wait_obj(tls->rwo); g_set_wait_obj(tls->rwo);
@ -769,25 +795,39 @@ int APP_CC
ssl_tls_write(struct ssl_tls *tls, const char *data, int length) ssl_tls_write(struct ssl_tls *tls, const char *data, int length)
{ {
int status; int status;
int break_flag;
while(1) {
status = SSL_write(tls->ssl, data, length); status = SSL_write(tls->ssl, data, length);
switch (SSL_get_error(tls->ssl, status)) switch (SSL_get_error(tls->ssl, status))
{ {
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
break_flag = 1;
break; break;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
status = 0; /**
break; * retry when SSL_get_error returns:
* SSL_ERROR_WANT_READ
* SSL_ERROR_WANT_WRITE
*/
continue;
default: default:
ssl_tls_print_error("SSL_write", tls->ssl, status); ssl_tls_print_error("SSL_write", tls->ssl, status);
status = -1; status = -1;
break_flag = 1;
break; break;
} }
if (break_flag)
{
break;
}
}
return status; return status;
} }