Revision: 4301
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4301&view=rev
Author: dcommander
Date: 2011-02-21 13:14:16 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
Make the VeNCrypt security type implicit
Modified Paths:
--------------
trunk/common/rfb/Security.cxx
trunk/common/rfb/SecurityClient.cxx
trunk/common/rfb/SecurityServer.cxx
Modified: trunk/common/rfb/Security.cxx
===================================================================
--- trunk/common/rfb/Security.cxx 2011-02-21 12:55:24 UTC (rev 4300)
+++ trunk/common/rfb/Security.cxx 2011-02-21 13:14:16 UTC (rev 4301)
@@ -67,6 +67,7 @@
list<rdr::U8> result;
list<U32>::iterator i;
+ result.push_back(secTypeVeNCrypt);
for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
if (*i < 0x100)
result.push_back(*i);
@@ -104,6 +105,8 @@
for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
if (*i == secType)
return true;
+ if (secType == secTypeVeNCrypt)
+ return true;
return false;
}
Modified: trunk/common/rfb/SecurityClient.cxx
===================================================================
--- trunk/common/rfb/SecurityClient.cxx 2011-02-21 12:55:24 UTC (rev 4300)
+++ trunk/common/rfb/SecurityClient.cxx 2011-02-21 13:14:16 UTC (rev 4301)
@@ -45,7 +45,7 @@
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
#ifdef HAVE_GNUTLS
- "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
+ "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
#else
"VncAuth,None",
#endif
Modified: trunk/common/rfb/SecurityServer.cxx
===================================================================
--- trunk/common/rfb/SecurityServer.cxx 2011-02-21 12:55:24 UTC (rev 4300)
+++ trunk/common/rfb/SecurityServer.cxx 2011-02-21 13:14:16 UTC (rev 4301)
@@ -39,7 +39,7 @@
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
#ifdef HAVE_GNUTLS
- "VeNCrypt,TLSVnc,VncAuth",
+ "TLSVnc,VncAuth",
#else
"VncAuth",
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
