git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4301 3789f03b-4d11-0410-bbf8-ca57d06f2519tags/v1.0.90
@@ -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; | |||
} |
@@ -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 |
@@ -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 |