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

libfreerdp/core/CMakeLists.txt

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

libfreerdp/core/nla.c

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

libfreerdp/core/transport.c

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

libfreerdp/core/transport.h

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

libfreerdp/crypto/CMakeLists.txt

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