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

libfreerdp-crypto: move nla.c to libfreerdp-core

Browse Source
This commit is contained in:
Marc-André Moreau 2012-11-14 21:19:17 -05:00
parent 98dcdcfb8f
commit f19f3a6024
6 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/core/CMakeLists.txt
View File

@ -32,6 +32,8 @@ set(${MODULE_PREFIX}_SRCS
gcc.h gcc.h
mcs.c mcs.c
mcs.h mcs.h
nla.c
nla.h
nego.c nego.c
nego.h nego.h
info.c info.c

3
libfreerdp/crypto/nla.c → libfreerdp/core/nla.c
View File

@ -27,7 +27,6 @@
#include <unistd.h> #include <unistd.h>
#endif #endif
#include <freerdp/crypto/nla.h>
#include <freerdp/crypto/tls.h> #include <freerdp/crypto/tls.h>
#include <winpr/crt.h> #include <winpr/crt.h>
@ -37,6 +36,8 @@
#include <winpr/library.h> #include <winpr/library.h>
#include <winpr/registry.h> #include <winpr/registry.h>
#include "nla.h"
/** /**
* TSRequest ::= SEQUENCE { * TSRequest ::= SEQUENCE {
* version [0] INTEGER, * version [0] INTEGER,

0
include/freerdp/crypto/nla.h → libfreerdp/core/nla.h
View File

5
libfreerdp/core/transport.c
View File

@ -47,8 +47,6 @@
#include "fastpath.h" #include "fastpath.h"
#include "transport.h" #include "transport.h"
#include <freerdp/crypto/nla.h>
#define BUFFER_SIZE 16384 #define BUFFER_SIZE 16384
STREAM* transport_recv_stream_init(rdpTransport* transport, int size) STREAM* transport_recv_stream_init(rdpTransport* transport, int size)
@ -89,6 +87,8 @@ BOOL transport_connect_rdp(rdpTransport* transport)
BOOL transport_connect_tls(rdpTransport* transport) BOOL transport_connect_tls(rdpTransport* transport)
{ {
if (transport->layer != TRANSPORT_LAYER_TSG)
{
if (transport->TlsIn == NULL) if (transport->TlsIn == NULL)
transport->TlsIn = tls_new(transport->settings); transport->TlsIn = tls_new(transport->settings);
@ -108,6 +108,7 @@ BOOL transport_connect_tls(rdpTransport* transport)
return FALSE; return FALSE;
} }
}
return TRUE; return TRUE;
} }

2
libfreerdp/core/transport.h
View File

@ -32,10 +32,10 @@ typedef struct rdp_transport rdpTransport;
#include "tcp.h" #include "tcp.h"
#include "tsg.h" #include "tsg.h"
#include "nla.h"
#include <winpr/sspi.h> #include <winpr/sspi.h>
#include <freerdp/crypto/tls.h> #include <freerdp/crypto/tls.h>
#include <freerdp/crypto/nla.h>
#include <time.h> #include <time.h>
#include <freerdp/types.h> #include <freerdp/types.h>

1
libfreerdp/crypto/CMakeLists.txt
View File

@ -23,7 +23,6 @@ set(${MODULE_PREFIX}_SRCS
der.c der.c
ber.c ber.c
per.c per.c
nla.c
certificate.c certificate.c
crypto.c crypto.c
tls.c) tls.c)