From 090dc8b4219addf16c83cc4d4c28037715c1e9e7 Mon Sep 17 00:00:00 2001
From: Riley McArdle <riley@mremoteng.org>
Date: Fri, 29 Jan 2010 15:52:51 -0600
Subject: [PATCH] Added support for Credential Security Support Provider
 (CredSSP) which is required for Network Level Authentication (NLA).

---
 mRemoteV1/App/App.Runtime.vb                    | 2 +-
 mRemoteV1/CHANGELOG.TXT                         | 1 +
 mRemoteV1/Connection/Connection.Protocol.RDP.vb | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index 3cb263ee..e78b9724 100644
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -1433,7 +1433,7 @@ Namespace App
                     Dim ReasonCode As String = Reason(0)
                     Dim ReasonDescription As String = Reason(1)
                     If ReasonCode > 3 Then
-                        mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & ReasonDescription & vbNewLine & "Error code " & ReasonCode)
+                        mC.AddMessage(Messages.MessageClass.WarningMsg, "RDP Disconnected!" & vbNewLine & ReasonDescription & vbNewLine & "Error code " & ReasonCode & ".")
                     End If
                 End If
             Catch ex As Exception
diff --git a/mRemoteV1/CHANGELOG.TXT b/mRemoteV1/CHANGELOG.TXT
index f35607ed..10bb030f 100644
--- a/mRemoteV1/CHANGELOG.TXT
+++ b/mRemoteV1/CHANGELOG.TXT
@@ -8,6 +8,7 @@
   Added View->Reset Layout menu item
   Added F11 shortcut key to View->Full Screen
   Improved RDP error reporting
+  Added support for Credential Security Support Provider (CredSSP) which is required for Network Level Authentication (NLA)
 
 1.62:
   Switched to VncSharp, an open source VNC component
diff --git a/mRemoteV1/Connection/Connection.Protocol.RDP.vb b/mRemoteV1/Connection/Connection.Protocol.RDP.vb
index 9fb5476d..bd13f9be 100644
--- a/mRemoteV1/Connection/Connection.Protocol.RDP.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.RDP.vb
@@ -33,14 +33,14 @@ Namespace Connection
 #End Region
 
 #Region "Private Declarations"
-            Private RDP As AxMsRdpClient5
+            Private RDP As AxMsRdpClient6NotSafeForScripting
             Private Info As Connection.Info
             Private RDPVersion As Version
 #End Region
 
 #Region "Public Methods"
             Public Sub New()
-                Me.Control = New AxMsRdpClient5
+                Me.Control = New AxMsRdpClient6NotSafeForScripting
             End Sub
 
             Public Overrides Function SetProps() As Boolean
@@ -79,6 +79,7 @@ Namespace Connection
                     RDP.AdvancedSettings2.keepAliveInterval = 60000 'in milliseconds (10.000 = 10 seconds)
                     RDP.AdvancedSettings5.AuthenticationLevel = 0
                     RDP.AdvancedSettings.EncryptionEnabled = 1
+                    RDP.AdvancedSettings7.EnableCredSspSupport = True
 
                     RDP.AdvancedSettings2.overallConnectionTimeout = 20