From 674bf066980a0d84612270ba6296bae84f2a0596 Mon Sep 17 00:00:00 2001 From: DRC Date: Mon, 21 Feb 2011 13:14:16 +0000 Subject: [PATCH] Make the VeNCrypt security type implicit git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4301 3789f03b-4d11-0410-bbf8-ca57d06f2519 --- common/rfb/Security.cxx | 3 +++ common/rfb/SecurityClient.cxx | 2 +- 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 Security::GetEnabledSecTypes(void) list result; list::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 -- 2.39.5