uLab
/
xrdp-proprietary
mirror of https://mirror.git.trinitydesktop.org/gitea/uLab/xrdp-proprietary
0
0
Fork 0
Code Issues Releases Wiki Activity

common: xrdp_tls, indentation fix

Browse Source
ulab-next-nosound
speidy 10 years ago
parent c612683119
commit be51fb739c
1 changed files with 187 additions and 174 deletions
Show Stats Download Patch File Download Diff File

361
common/xrdp_tls.c
Unescape View File

@ -22,7 +22,8 @@
#include "ssl_calls.h" #include "ssl_calls.h"
/*****************************************************************************/ /*****************************************************************************/
struct xrdp_tls *APP_CC struct xrdp_tls *
APP_CC
xrdp_tls_create(struct trans *trans, const char *key, const char *cert) xrdp_tls_create(struct trans *trans, const char *key, const char *cert)
{ {
struct xrdp_tls *self; struct xrdp_tls *self;
@ -30,9 +31,9 @@ xrdp_tls_create(struct trans *trans, const char *key, const char *cert)
if (self != NULL) if (self != NULL)
{ {
self->trans = trans; self->trans = trans;
self->cert = (char *) cert; self->cert = (char *) cert;
self->key = (char *) key; self->key = (char *) key;
} }
return self; return self;
@ -41,206 +42,218 @@ xrdp_tls_create(struct trans *trans, const char *key, const char *cert)
int APP_CC int APP_CC
xrdp_tls_accept(struct xrdp_tls *self) xrdp_tls_accept(struct xrdp_tls *self)
{ {
int connection_status; int connection_status;
long options = 0; long options = 0;
/** /**
* SSL_OP_NO_SSLv2: * SSL_OP_NO_SSLv2:
* *
* We only want SSLv3 and TLSv1, so disable SSLv2. * We only want SSLv3 and TLSv1, so disable SSLv2.
* SSLv3 is used by, eg. Microsoft RDC for Mac OS X. * SSLv3 is used by, eg. Microsoft RDC for Mac OS X.
*/ */
options |= SSL_OP_NO_SSLv2; options |= SSL_OP_NO_SSLv2;
/** /**
* SSL_OP_NO_COMPRESSION: * SSL_OP_NO_COMPRESSION:
* *
* The Microsoft RDP server does not advertise support * The Microsoft RDP server does not advertise support
* for TLS compression, but alternative servers may support it. * for TLS compression, but alternative servers may support it.
* This was observed between early versions of the FreeRDP server * This was observed between early versions of the FreeRDP server
* and the FreeRDP client, and caused major performance issues, * and the FreeRDP client, and caused major performance issues,
* which is why we're disabling it. * which is why we're disabling it.
*/ */
options |= SSL_OP_NO_COMPRESSION; options |= SSL_OP_NO_COMPRESSION;
/** /**
* SSL_OP_TLS_BLOCK_PADDING_BUG: * SSL_OP_TLS_BLOCK_PADDING_BUG:
* *
* The Microsoft RDP server does *not* support TLS padding. * The Microsoft RDP server does *not* support TLS padding.
* It absolutely needs to be disabled otherwise it won't work. * It absolutely needs to be disabled otherwise it won't work.
*/ */
options |= SSL_OP_TLS_BLOCK_PADDING_BUG; options |= SSL_OP_TLS_BLOCK_PADDING_BUG;
/** /**
* SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: * SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS:
* *
* Just like TLS padding, the Microsoft RDP server does not * Just like TLS padding, the Microsoft RDP server does not
* support empty fragments. This needs to be disabled. * support empty fragments. This needs to be disabled.
*/ */
options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
self->ctx = SSL_CTX_new(SSLv23_server_method()); self->ctx = SSL_CTX_new(SSLv23_server_method());
/* set context options */ /* set context options */
SSL_CTX_set_mode(self->ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER | SSL_MODE_ENABLE_PARTIAL_WRITE); SSL_CTX_set_mode(self->ctx,
SSL_CTX_set_options(self->ctx, options); SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER
SSL_CTX_set_read_ahead(self->ctx, 1); | SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_set_options(self->ctx, options);
if (self->ctx == NULL) { SSL_CTX_set_read_ahead(self->ctx, 1);
g_writeln("xrdp_tls_accept: SSL_CTX_new failed");
return 1; if (self->ctx == NULL)
} {
g_writeln("xrdp_tls_accept: SSL_CTX_new failed");
if (SSL_CTX_use_RSAPrivateKey_file(self->ctx, self->key, SSL_FILETYPE_PEM) return 1;
<= 0) { }
g_writeln("xrdp_tls_accept: SSL_CTX_use_RSAPrivateKey_file failed");
return 1; if (SSL_CTX_use_RSAPrivateKey_file(self->ctx, self->key, SSL_FILETYPE_PEM)
} <= 0)
{
self->ssl = SSL_new(self->ctx); g_writeln("xrdp_tls_accept: SSL_CTX_use_RSAPrivateKey_file failed");
return 1;
if (self->ssl == NULL) { }
g_writeln("xrdp_tls_accept: SSL_new failed");
return 1; self->ssl = SSL_new(self->ctx);
}
if (self->ssl == NULL)
if (SSL_use_certificate_file(self->ssl, self->cert, SSL_FILETYPE_PEM) <= 0) { {
g_writeln("xrdp_tls_accept: SSL_use_certificate_file failed"); g_writeln("xrdp_tls_accept: SSL_new failed");
return 1; return 1;
} }
if (SSL_set_fd(self->ssl, self->trans->sck) < 1) { if (SSL_use_certificate_file(self->ssl, self->cert, SSL_FILETYPE_PEM) <= 0)
g_writeln("xrdp_tls_accept: SSL_set_fd failed"); {
return 1; g_writeln("xrdp_tls_accept: SSL_use_certificate_file failed");
} return 1;
}
connection_status = SSL_accept(self->ssl);
if (SSL_set_fd(self->ssl, self->trans->sck) < 1)
if (connection_status <= 0) { {
if (xrdp_tls_print_error("SSL_accept", self->ssl, connection_status)) g_writeln("xrdp_tls_accept: SSL_set_fd failed");
{ return 1;
return 1; }
}
} connection_status = SSL_accept(self->ssl);
g_writeln("xrdp_tls_accept: TLS connection accepted"); if (connection_status <= 0)
{
return 0; if (xrdp_tls_print_error("SSL_accept", self->ssl, connection_status))
{
return 1;
}
}
g_writeln("xrdp_tls_accept: TLS connection accepted");
return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_tls_print_error(char *func, SSL *connection, int value) xrdp_tls_print_error(char *func, SSL *connection, int value)
{ {
switch (SSL_get_error(connection, value)) switch (SSL_get_error(connection, value))
{ {
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
g_writeln("xrdp_tls_print_error: %s: Server closed TLS connection", func); g_writeln("xrdp_tls_print_error: %s: Server closed TLS connection",
return 1; func);
return 1;
case SSL_ERROR_WANT_READ:
g_writeln("xrdp_tls_print_error: SSL_ERROR_WANT_READ"); case SSL_ERROR_WANT_READ:
return 0; g_writeln("xrdp_tls_print_error: SSL_ERROR_WANT_READ");
return 0;
case SSL_ERROR_WANT_WRITE:
g_writeln("xrdp_tls_print_error: SSL_ERROR_WANT_WRITE"); case SSL_ERROR_WANT_WRITE:
return 0; g_writeln("xrdp_tls_print_error: SSL_ERROR_WANT_WRITE");
return 0;
case SSL_ERROR_SYSCALL:
g_writeln("xrdp_tls_print_error: %s: I/O error", func); case SSL_ERROR_SYSCALL:
return 1; g_writeln("xrdp_tls_print_error: %s: I/O error", func);
return 1;
case SSL_ERROR_SSL:
g_writeln("xrdp_tls_print_error: %s: Failure in SSL library (protocol error?)", func); case SSL_ERROR_SSL:
return 1; g_writeln(
"xrdp_tls_print_error: %s: Failure in SSL library (protocol error?)",
default: func);
g_writeln("xrdp_tls_print_error: %s: Unknown error", func); return 1;
return 1;
} default:
g_writeln("xrdp_tls_print_error: %s: Unknown error", func);
return 1;
}
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_tls_disconnect(struct xrdp_tls *self) xrdp_tls_disconnect(struct xrdp_tls *self)
{ {
int status = SSL_shutdown(self->ssl); int status = SSL_shutdown(self->ssl);
while (status != 1) while (status != 1)
{ {
status = SSL_shutdown(self->ssl); status = SSL_shutdown(self->ssl);
if (status <= 0) { if (status <= 0)
if (xrdp_tls_print_error("SSL_shutdown", self->ssl, status)) {
{ if (xrdp_tls_print_error("SSL_shutdown", self->ssl, status))
return 1; {
} return 1;
} }
} }
return 0; }
return 0;
} }
/*****************************************************************************/ /*****************************************************************************/
void APP_CC void APP_CC
xrdp_tls_delete(struct xrdp_tls *self) xrdp_tls_delete(struct xrdp_tls *self)
{ {
if (self != NULL) if (self != NULL)
{ {
if (self->ssl) if (self->ssl)
SSL_free(self->ssl); SSL_free(self->ssl);
if (self->ctx) if (self->ctx)
SSL_CTX_free(self->ctx); SSL_CTX_free(self->ctx);
g_free(self); g_free(self);
} }
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_tls_read(struct xrdp_tls *tls, unsigned char *data, int length) xrdp_tls_read(struct xrdp_tls *tls, unsigned char *data, int length)
{ {
int status; int status;
status = SSL_read(tls->ssl, data, length);
switch (SSL_get_error(tls->ssl, status)) status = SSL_read(tls->ssl, data, length);
{
case SSL_ERROR_NONE:
break;
case SSL_ERROR_WANT_READ: switch (SSL_get_error(tls->ssl, status))
case SSL_ERROR_WANT_WRITE: {
status = 0; case SSL_ERROR_NONE:
break; break;
default: case SSL_ERROR_WANT_READ:
xrdp_tls_print_error("SSL_read", tls->ssl, status); case SSL_ERROR_WANT_WRITE:
status = -1; status = 0;
break; break;
}
default:
xrdp_tls_print_error("SSL_read", tls->ssl, status);
status = -1;
break;
}
return status; return status;
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_tls_write(struct xrdp_tls *tls, unsigned char *data, int length) xrdp_tls_write(struct xrdp_tls *tls, unsigned char *data, int length)
{ {
int status; int status;
status = SSL_write(tls->ssl, data, length);
switch (SSL_get_error(tls->ssl, status)) status = SSL_write(tls->ssl, data, length);
{
case SSL_ERROR_NONE:
break;
case SSL_ERROR_WANT_READ: switch (SSL_get_error(tls->ssl, status))
case SSL_ERROR_WANT_WRITE: {
status = 0; case SSL_ERROR_NONE:
break; break;
default: case SSL_ERROR_WANT_READ:
xrdp_tls_print_error("SSL_write", tls->ssl, status); case SSL_ERROR_WANT_WRITE:
status = -1; status = 0;
break; break;
}
default:
xrdp_tls_print_error("SSL_write", tls->ssl, status);
status = -1;
break;
}
return status; return status;
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
@ -261,7 +274,7 @@ xrdp_tls_force_read_s(struct trans *self, struct stream *in_s, int size)
return 1; return 1;
} }
rcvd = xrdp_tls_read(self->tls, in_s->end, size); rcvd = xrdp_tls_read(self->tls, in_s->end, size);
if (rcvd == -1) if (rcvd == -1)
{ {
@ -317,7 +330,7 @@ xrdp_tls_force_write_s(struct trans *self, struct stream *out_s)
return 1; return 1;
} }
size = (int)(out_s->end - out_s->data); size = (int) (out_s->end - out_s->data);
total = 0; total = 0;
if (xrdp_tls_send_waiting(self, 1) != 0) if (xrdp_tls_send_waiting(self, 1) != 0)
@ -328,7 +341,7 @@ xrdp_tls_force_write_s(struct trans *self, struct stream *out_s)
while (total < size) while (total < size)
{ {
sent = xrdp_tls_write(self->tls, out_s->data + total, size - total); sent = xrdp_tls_write(self->tls, out_s->data + total, size - total);
if (sent == -1) if (sent == -1)
{ {

Write Preview
Loading…
Cancel
Save