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 dba14fd..e51c891 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -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;
}
diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx
index 0b69298..4173c74 100644
--- a/common/rfb/SecurityClient.cxx
+++ b/common/rfb/SecurityClient.cxx
@@ -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
diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx
index e3ac405..3866fa3 100644
--- a/common/rfb/SecurityServer.cxx
+++ b/common/rfb/SecurityServer.cxx
@@ -39,7 +39,7 @@
("SecurityTypes",
"Specify which security scheme to use (None, VncAuth)",
#ifdef HAVE_GNUTLS
- "VeNCrypt,TLSVnc,VncAuth",
+ "TLSVnc,VncAuth",
#else
"VncAuth",
#endif