Make the VeNCrypt security type implicit

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4301 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index dba14fdb46a6fbd10ee2838cbd50e097fd6140ea..e51c8919e8d0121cc96db1673df8fd15be8d6602 100644 (file)
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -67,6 +67,7 @@ const std::list<rdr::U8> Security::GetEnabledSecTypes(void)
   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 @@ bool Security::IsSupported(U32 secType)
   for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
     if (*i == secType)
       return true;
+  if (secType == secTypeVeNCrypt)
+    return true;
 
   return false;
 }

diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx
index 0b69298e35ce7b5074e4ab47bd1eb6f989d54c33..4173c74d2ebdf371f38a355ec38115df6fdf58e4 100644 (file)
--- a/common/rfb/SecurityClient.cxx
+++ b/common/rfb/SecurityClient.cxx
@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes
 ("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

diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx
index e3ac4059da005af05893f7ca75c391148b88ae71..3866fa3513db55cd99b68090da74ab8f0b4f496e 100644 (file)
--- a/common/rfb/SecurityServer.cxx
+++ b/common/rfb/SecurityServer.cxx
@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes
 ("SecurityTypes",
  "Specify which security scheme to use (None, VncAuth)",
 #ifdef HAVE_GNUTLS
- "VeNCrypt,TLSVnc,VncAuth",
+ "TLSVnc,VncAuth",
 #else
  "VncAuth",
 #endif