[Rdesktop-commits] SF.net SVN: rdesktop:[1697] rdesktop/trunk

[<he...@us...>]

Revision: 1697
          http://sourceforge.net/p/rdesktop/code/1697
Author:   hean01
Date:     2013-03-18 11:56:37 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Make sure that CredSSP is not used for smartcard SSO.

Modified Paths:
--------------
    rdesktop/trunk/iso.c
    rdesktop/trunk/rdesktop.c

Modified: rdesktop/trunk/iso.c
===================================================================
--- rdesktop/trunk/iso.c	2013-02-05 12:23:57 UTC (rev 1696)
+++ rdesktop/trunk/iso.c	2013-03-18 11:56:37 UTC (rev 1697)
@@ -23,6 +23,7 @@
 
 extern RD_BOOL g_encryption;
 extern RDP_VERSION g_rdp_version;
+extern RD_BOOL g_use_password_as_pin;
 
 static RD_BOOL g_negotiate_rdp_protocol = True;
 
@@ -201,10 +202,13 @@
 
 	g_negotiate_rdp_protocol = True;
 
+	neg_proto = PROTOCOL_SSL;
+
 #ifdef WITH_CREDSSP
-	neg_proto = PROTOCOL_SSL | PROTOCOL_HYBRID;
-#else
-	neg_proto = PROTOCOL_SSL;
+	if (!g_use_password_as_pin)
+		neg_proto |= PROTOCOL_HYBRID;
+	else
+		warning("CredSSP will be disabled if smartcard SSO is used.");
 #endif
 
       retry:

Modified: rdesktop/trunk/rdesktop.c
===================================================================
--- rdesktop/trunk/rdesktop.c	2013-02-05 12:23:57 UTC (rev 1696)
+++ rdesktop/trunk/rdesktop.c	2013-03-18 11:56:37 UTC (rev 1697)
@@ -101,6 +101,7 @@
 RD_BOOL g_owncolmap = False;
 RD_BOOL g_ownbackstore = True;	/* We can't rely on external BackingStore */
 RD_BOOL g_seamless_rdp = False;
+RD_BOOL g_use_password_as_pin = False;
 char g_seamless_shell[512];
 char g_seamless_spawn_cmd[512];
 RD_BOOL g_user_quit = False;
@@ -583,6 +584,7 @@
 #ifdef WITH_SCARD
 			case 'i':
 				flags |= RDP_LOGON_PASSWORD_IS_SC_PIN;
+				g_use_password_as_pin = True;
 				break;
 #endif
 			case 't':

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.