mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Final cleanups - merge ready.

This commit is contained in:
Dan Bungert 2013-10-28 16:59:02 -06:00
parent f02daaa2d5
commit 66ecabb647
6 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/cli/xfreerdp.c
View File

@ -42,8 +42,6 @@ int main(int argc, char* argv[])
rdpSettings* settings;
RDP_CLIENT_ENTRY_POINTS clientEntryPoints;
setvbuf(stderr, NULL, _IONBF, 0);
ZeroMemory(&clientEntryPoints, sizeof(RDP_CLIENT_ENTRY_POINTS));
clientEntryPoints.Size = sizeof(RDP_CLIENT_ENTRY_POINTS);
clientEntryPoints.Version = RDP_CLIENT_INTERFACE_VERSION;

8
libfreerdp/core/connection.c
View File

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

2
libfreerdp/core/gateway/rpc_client.c
View File

@ -432,14 +432,12 @@ RPC_PDU* rpc_recv_dequeue_pdu(rdpRpc* rpc)
pdu = (RPC_PDU*) Queue_Dequeue(rpc->client->ReceiveQueue);
#ifdef WITH_DEBUG_TSG
/*
if (pdu)
{
fprintf(stderr, "Receiving PDU (length: %d, CallId: %d)\n", pdu->s->length, pdu->CallId);
winpr_HexDump(Stream_Buffer(pdu->s), Stream_Length(pdu->s));
fprintf(stderr, "\n");
}
*/
#endif
return pdu;

1
libfreerdp/core/nla.c
View File

@ -348,7 +348,6 @@ int credssp_client_authenticate(rdpCredssp* credssp)
if (credssp_recv(credssp) < 0)
return -1;
/* Verify Server Public Key Echo */
status = credssp_decrypt_public_key_echo(credssp);

31
libfreerdp/core/transport.c
View File

@ -106,11 +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)
{
/*
printf("transport_bio_tsg_callback: mode: %d argp: %p argi: %d argl: %d ret: %d\n",
mode, argp, argi, argl, ret);
*/
return 1;
}
@ -152,19 +147,16 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, int size)
static int transport_bio_tsg_puts(BIO* bio, const char* str)
{
/* printf("transport_bio_tsg_puts: %d\n", strlen(str)); */
return 1;
}
static int transport_bio_tsg_gets(BIO* bio, char* str, int size)
{
/* printf("transport_bio_tsg_gets: %d\n", size); */
return 1;
}
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;
}
@ -173,8 +165,6 @@ static long transport_bio_tsg_ctrl(BIO* bio, int cmd, long arg1, void* arg2)
static int transport_bio_tsg_new(BIO* bio)
{
/* printf("transport_bio_tsg_new\n"); */
bio->init = 1;
bio->num = 0;
bio->ptr = NULL;
@ -185,7 +175,6 @@ static int transport_bio_tsg_new(BIO* bio)
static int transport_bio_tsg_free(BIO* bio)
{
/* printf("transport_bio_tsg_free\n"); */
return 1;
}
@ -400,7 +389,7 @@ BOOL transport_accept_nla(rdpTransport* transport)
if (transport->TlsIn == NULL)
transport->TlsIn = tls_new(transport->settings);
if (transport->TlsOut == NULL)
transport->TlsOut = transport->TlsIn;
@ -496,24 +485,6 @@ UINT32 nla_header_length(wStream* s)
return length;
}
char *want(rdpTls *tls)
{
int what = SSL_want(tls->ssl);
switch(what)
{
case SSL_NOTHING:
return "NOTHING";
case SSL_WRITING:
return "WRITING";
case SSL_READING:
return "READING";
case SSL_X509_LOOKUP:
return "X509_LOOKUP";
default:
return "UNKNOWN";
}
}
int transport_read_layer(rdpTransport* transport, UINT8* data, int bytes)
{
int read = 0;

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)
{
/* printf("tls_ssl_info_callback: type: %d val: %d\n", type, val); */
if (type & SSL_CB_HANDSHAKE_START)
{