Merge branch 'master' of github.com:FreeRDP/FreeRDP

libfreerdp-core/security.c

@@ -358,6 +358,9 @@ boolean security_establish_keys(uint8* client_random, rdpRdp* rdp)
 
 		printf("FIPS Compliant encryption level.\n");
 
+		/* disable fastpath input; it doesnt handle FIPS encryption yet */
+		rdp->settings->fastpath_input = false;
+
 		sha1 = crypto_sha1_init();
 		crypto_sha1_update(sha1, client_random + 16, 16);
 		crypto_sha1_update(sha1, server_random + 16, 16);

libfreerdp-core/transport.c

@@ -26,8 +26,6 @@
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/hexdump.h>
 
-#include <freerdp/auth/credssp.h>
-
 #include <time.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -41,6 +39,8 @@
 #include "fastpath.h"
 #include "transport.h"
 
+#include <freerdp/auth/credssp.h>
+
 #define BUFFER_SIZE 16384
 
 STREAM* transport_recv_stream_init(rdpTransport* transport, int size)