diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-02-21 13:14:16 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-02-21 13:14:16 +0000 |
| commit | 674bf066980a0d84612270ba6296bae84f2a0596 (patch) | |
| tree | d4de7959a66721143070c2a53f3e9cceac643861 /common | |
| parent | 7cb47d6b3cd25e1a22a0a3d09f045a54a577c23a (diff) | |
| download | tigervnc-674bf066980a0d84612270ba6296bae84f2a0596.tar.gz tigervnc-674bf066980a0d84612270ba6296bae84f2a0596.zip | |
Make the VeNCrypt security type implicit
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4301 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common')
| -rw-r--r-- | common/rfb/Security.cxx | 3 | ||||
| -rw-r--r-- | common/rfb/SecurityClient.cxx | 2 | ||||
| -rw-r--r-- | common/rfb/SecurityServer.cxx | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx index dba14fdb..e51c8919 100644 --- 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 0b69298e..4173c74d 100644 --- 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 e3ac4059..3866fa35 100644 --- 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 |