mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libfreerdp-core: merge with TSG TLS update

Browse Source
This commit is contained in:
Marc-André Moreau 2013-10-28 20:20:18 -04:00
commit 8c4b1361d1
6 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libfreerdp/core/connection.c
View File

@ -209,14 +209,6 @@ BOOL rdp_client_connect(rdpRdp* rdp)
nego_set_cookie(rdp->nego, cookie); nego_set_cookie(rdp->nego, cookie);
free(cookie); free(cookie);
settings->RdpSecurity = TRUE;
settings->TlsSecurity = FALSE;
settings->NlaSecurity = FALSE;
settings->ExtSecurity = FALSE;
//settings->TlsSecurity = TRUE;
//settings->NlaSecurity = TRUE;
} }
else else
{ {

7
libfreerdp/core/nego.c
View File

@ -43,11 +43,16 @@ static const char* const NEGO_STATE_STRINGS[] =
"NEGO_STATE_FINAL" "NEGO_STATE_FINAL"
}; };
static const char PROTOCOL_SECURITY_STRINGS[4][4] = static const char PROTOCOL_SECURITY_STRINGS[9][4] =
{ {
"RDP", "RDP",
"TLS", "TLS",
"NLA", "NLA",
"UNK",
"UNK",
"UNK",
"UNK",
"UNK",
"EXT" "EXT"
}; };

14
libfreerdp/core/nla.c
View File

@ -138,8 +138,18 @@ int credssp_ntlm_client_init(rdpCredssp* credssp)
(char*) credssp->identity.User, (char*) credssp->identity.Domain, (char*) credssp->identity.Password); (char*) credssp->identity.User, (char*) credssp->identity.Domain, (char*) credssp->identity.Password);
#endif #endif
sspi_SecBufferAlloc(&credssp->PublicKey, credssp->transport->TlsIn->PublicKeyLength); rdpTls *tls = NULL;
CopyMemory(credssp->PublicKey.pvBuffer, credssp->transport->TlsIn->PublicKey, credssp->transport->TlsIn->PublicKeyLength); if(credssp->transport->layer == TRANSPORT_LAYER_TLS) {
tls = credssp->transport->TlsIn;
} else if(credssp->transport->layer == TRANSPORT_LAYER_TSG_TLS) {
tls = credssp->transport->TsgTls;
} else {
fprintf(stderr, "Unknown NLA transport layer\n");
return 0;
}
sspi_SecBufferAlloc(&credssp->PublicKey, tls->PublicKeyLength);
CopyMemory(credssp->PublicKey.pvBuffer, tls->PublicKey, tls->PublicKeyLength);
length = sizeof(TERMSRV_SPN_PREFIX) + strlen(settings->ServerHostname); length = sizeof(TERMSRV_SPN_PREFIX) + strlen(settings->ServerHostname);

61
libfreerdp/core/transport.c
View File

@ -77,7 +77,7 @@ BOOL transport_disconnect(rdpTransport* transport)
if (transport->layer == TRANSPORT_LAYER_TLS) if (transport->layer == TRANSPORT_LAYER_TLS)
status &= tls_disconnect(transport->TlsIn); status &= tls_disconnect(transport->TlsIn);
if (transport->layer == TRANSPORT_LAYER_TSG) if (transport->layer == TRANSPORT_LAYER_TSG || transport->layer == TRANSPORT_LAYER_TSG_TLS)
{ {
tsg_disconnect(transport->tsg); tsg_disconnect(transport->tsg);
} }
@ -106,9 +106,6 @@ BOOL transport_connect_rdp(rdpTransport* transport)
long transport_bio_tsg_callback(BIO* bio, int mode, const char* argp, int argi, long argl, long ret) long transport_bio_tsg_callback(BIO* bio, int mode, const char* argp, int argi, long argl, long ret)
{ {
printf("transport_bio_tsg_callback: mode: %d argp: %p argi: %d argl: %d ret: %d\n",
mode, argp, argi, argl, ret);
return 1; return 1;
} }
@ -117,13 +114,9 @@ static int transport_bio_tsg_write(BIO* bio, const char* buf, int num)
int status; int status;
rdpTsg* tsg; rdpTsg* tsg;
printf("transport_bio_tsg_write: %d\n", num);
tsg = (rdpTsg*) bio->ptr; tsg = (rdpTsg*) bio->ptr;
status = tsg_write(tsg, (BYTE*) buf, num); status = tsg_write(tsg, (BYTE*) buf, num);
printf("tsg_write: %d\n", status);
BIO_clear_retry_flags(bio); BIO_clear_retry_flags(bio);
if (status <= 0) if (status <= 0)
@ -139,13 +132,9 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, int size)
int status; int status;
rdpTsg* tsg; rdpTsg* tsg;
printf("transport_bio_tsg_read: %d\n", size);
tsg = (rdpTsg*) bio->ptr; tsg = (rdpTsg*) bio->ptr;
status = tsg_read(bio->ptr, (BYTE*) buf, size); status = tsg_read(bio->ptr, (BYTE*) buf, size);
printf("tsg_read: %d\n", status);
BIO_clear_retry_flags(bio); BIO_clear_retry_flags(bio);
if (status <= 0) if (status <= 0)
@ -153,31 +142,31 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, int size)
BIO_set_retry_read(bio); BIO_set_retry_read(bio);
} }
return status; return status > 0 ? status : -1;
} }
static int transport_bio_tsg_puts(BIO* bio, const char* str) static int transport_bio_tsg_puts(BIO* bio, const char* str)
{ {
printf("transport_bio_tsg_puts: %d\n", strlen(str));
return 1; return 1;
} }
static int transport_bio_tsg_gets(BIO* bio, char* str, int size) static int transport_bio_tsg_gets(BIO* bio, char* str, int size)
{ {
printf("transport_bio_tsg_gets: %d\n", size);
return 1; return 1;
} }
static long transport_bio_tsg_ctrl(BIO* bio, int cmd, long arg1, void* arg2) static long transport_bio_tsg_ctrl(BIO* bio, int cmd, long arg1, void* arg2)
{ {
printf("transport_bio_tsg_ctrl: cmd: %d arg1: %d arg2: %p\n", cmd, arg1, arg2); if (cmd == BIO_CTRL_FLUSH)
return 1; {
return 1;
}
return 0;
} }
static int transport_bio_tsg_new(BIO* bio) static int transport_bio_tsg_new(BIO* bio)
{ {
printf("transport_bio_tsg_new\n");
bio->init = 1; bio->init = 1;
bio->num = 0; bio->num = 0;
bio->ptr = NULL; bio->ptr = NULL;
@ -188,7 +177,6 @@ static int transport_bio_tsg_new(BIO* bio)
static int transport_bio_tsg_free(BIO* bio) static int transport_bio_tsg_free(BIO* bio)
{ {
printf("transport_bio_tsg_free\n");
return 1; return 1;
} }
@ -217,28 +205,21 @@ BOOL transport_connect_tls(rdpTransport* transport)
{ {
if (transport->layer == TRANSPORT_LAYER_TSG) if (transport->layer == TRANSPORT_LAYER_TSG)
{ {
if (!transport->TlsIn) transport->TsgTls = tls_new(transport->settings);
transport->TlsIn = tls_new(transport->settings);
if (!transport->TlsOut) transport->TsgTls->methods = BIO_s_tsg();
transport->TlsOut = transport->TlsIn; transport->TsgTls->tsg = (void*) transport->tsg;
transport->TlsIn->methods = BIO_s_tsg(); transport->layer = TRANSPORT_LAYER_TSG_TLS;
transport->TlsIn->tsg = (void*) transport->tsg;
transport->layer = TRANSPORT_LAYER_TLS; if (tls_connect(transport->TsgTls) != TRUE)
if (tls_connect(transport->TlsIn) != TRUE)
{ {
if (!connectErrorCode) if (!connectErrorCode)
connectErrorCode = TLSCONNECTERROR; connectErrorCode = TLSCONNECTERROR;
tls_free(transport->TlsIn); tls_free(transport->TsgTls);
if (transport->TlsIn == transport->TlsOut) transport->TsgTls = NULL;
transport->TlsIn = transport->TlsOut = NULL;
else
transport->TlsIn = NULL;
return FALSE; return FALSE;
} }
@ -278,9 +259,6 @@ BOOL transport_connect_nla(rdpTransport* transport)
freerdp* instance; freerdp* instance;
rdpSettings* settings; rdpSettings* settings;
if (transport->layer == TRANSPORT_LAYER_TSG)
return TRUE;
if (!transport_connect_tls(transport)) if (!transport_connect_tls(transport))
return FALSE; return FALSE;
@ -522,6 +500,9 @@ int transport_read_layer(rdpTransport* transport, UINT8* data, int bytes)
status = tcp_read(transport->TcpIn, data + read, bytes - read); status = tcp_read(transport->TcpIn, data + read, bytes - read);
else if (transport->layer == TRANSPORT_LAYER_TSG) else if (transport->layer == TRANSPORT_LAYER_TSG)
status = tsg_read(transport->tsg, data + read, bytes - read); status = tsg_read(transport->tsg, data + read, bytes - read);
else if (transport->layer == TRANSPORT_LAYER_TSG_TLS) {
status = tls_read(transport->TsgTls, data + read, bytes - read);
}
/* blocking means that we can't continue until this is read */ /* blocking means that we can't continue until this is read */
@ -687,6 +668,8 @@ int transport_write(rdpTransport* transport, wStream* s)
status = tcp_write(transport->TcpOut, Stream_Pointer(s), length); status = tcp_write(transport->TcpOut, Stream_Pointer(s), length);
else if (transport->layer == TRANSPORT_LAYER_TSG) else if (transport->layer == TRANSPORT_LAYER_TSG)
status = tsg_write(transport->tsg, Stream_Pointer(s), length); status = tsg_write(transport->tsg, Stream_Pointer(s), length);
else if (transport->layer == TRANSPORT_LAYER_TSG_TLS)
status = tls_write(transport->TsgTls, Stream_Pointer(s), length);
if (status < 0) if (status < 0)
break; /* error occurred */ break; /* error occurred */
@ -705,6 +688,8 @@ int transport_write(rdpTransport* transport, wStream* s)
tls_wait_write(transport->TlsOut); tls_wait_write(transport->TlsOut);
else if (transport->layer == TRANSPORT_LAYER_TCP) else if (transport->layer == TRANSPORT_LAYER_TCP)
tcp_wait_write(transport->TcpOut); tcp_wait_write(transport->TcpOut);
else if (transport->layer == TRANSPORT_LAYER_TSG_TLS)
tls_wait_write(transport->TsgTls);
else else
USleep(transport->SleepInterval); USleep(transport->SleepInterval);
} }
@ -931,7 +916,7 @@ BOOL transport_set_blocking_mode(rdpTransport* transport, BOOL blocking)
status &= tcp_set_blocking_mode(transport->TcpIn, blocking); status &= tcp_set_blocking_mode(transport->TcpIn, blocking);
} }
if (transport->layer == TRANSPORT_LAYER_TSG) if (transport->layer == TRANSPORT_LAYER_TSG || transport->layer == TRANSPORT_LAYER_TSG_TLS)
{ {
tsg_set_blocking_mode(transport->tsg, blocking); tsg_set_blocking_mode(transport->tsg, blocking);
} }

1
libfreerdp/core/transport.h
View File

@ -59,6 +59,7 @@ struct rdp_transport
rdpTcp* TcpOut; rdpTcp* TcpOut;
rdpTls* TlsIn; rdpTls* TlsIn;
rdpTls* TlsOut; rdpTls* TlsOut;
rdpTls* TsgTls;
rdpCredssp* credssp; rdpCredssp* credssp;
rdpSettings* settings; rdpSettings* settings;
UINT32 SleepInterval; UINT32 SleepInterval;

2
libfreerdp/crypto/tls.c
View File

@ -99,8 +99,6 @@ SecPkgContext_Bindings* tls_get_channel_bindings(X509* cert)
static void tls_ssl_info_callback(const SSL* ssl, int type, int val) static void tls_ssl_info_callback(const SSL* ssl, int type, int val)
{ {
printf("tls_ssl_info_callback: type: %d val: %d\n");
if (type & SSL_CB_HANDSHAKE_START) if (type & SSL_CB_HANDSHAKE_START)
{ {