|
Adam Tkac |
3a8abef |
diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx
|
|
Adam Tkac |
3a8abef |
--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100
|
|
Adam Tkac |
3a8abef |
+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityClient.cxx 2011-03-31 09:47:34.519099718 +0200
|
|
Adam Tkac |
3a8abef |
@@ -45,7 +45,7 @@ StringParameter SecurityClient::secTypes
|
|
Adam Tkac |
3a8abef |
("SecurityTypes",
|
|
Adam Tkac |
3a8abef |
"Specify which security scheme to use (None, VncAuth)",
|
|
Adam Tkac |
3a8abef |
#ifdef HAVE_GNUTLS
|
|
Adam Tkac |
3a8abef |
- "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
|
|
Adam Tkac |
3a8abef |
+ "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
|
|
Adam Tkac |
3a8abef |
#else
|
|
Adam Tkac |
3a8abef |
"VncAuth,None",
|
|
Adam Tkac |
3a8abef |
#endif
|
|
Adam Tkac |
3a8abef |
diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx
|
|
Adam Tkac |
3a8abef |
--- tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx.rh690245 2011-02-21 14:14:16.000000000 +0100
|
|
Adam Tkac |
3a8abef |
+++ tigervnc-1.0.90-20110314svn4359/common/rfb/Security.cxx 2011-03-31 09:47:34.519099718 +0200
|
|
Adam Tkac |
3a8abef |
@@ -67,7 +67,6 @@ const std::list<rdr::U8> Security::GetEn
|
|
Adam Tkac |
3a8abef |
list<rdr::U8> result;
|
|
Adam Tkac |
3a8abef |
list<U32>::iterator i;
|
|
Adam Tkac |
3a8abef |
|
|
Adam Tkac |
3a8abef |
- result.push_back(secTypeVeNCrypt);
|
|
Adam Tkac |
3a8abef |
for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
|
|
Adam Tkac |
3a8abef |
if (*i < 0x100)
|
|
Adam Tkac |
3a8abef |
result.push_back(*i);
|
|
Adam Tkac |
3a8abef |
@@ -105,8 +104,6 @@ bool Security::IsSupported(U32 secType)
|
|
Adam Tkac |
3a8abef |
for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
|
|
Adam Tkac |
3a8abef |
if (*i == secType)
|
|
Adam Tkac |
3a8abef |
return true;
|
|
Adam Tkac |
3a8abef |
- if (secType == secTypeVeNCrypt)
|
|
Adam Tkac |
3a8abef |
- return true;
|
|
Adam Tkac |
3a8abef |
|
|
Adam Tkac |
3a8abef |
return false;
|
|
Adam Tkac |
3a8abef |
}
|
|
Adam Tkac |
3a8abef |
diff -up tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx
|
|
Adam Tkac |
3a8abef |
--- tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx.rh690245 2011-02-21 14:50:17.000000000 +0100
|
|
Adam Tkac |
3a8abef |
+++ tigervnc-1.0.90-20110314svn4359/common/rfb/SecurityServer.cxx 2011-03-31 10:06:43.595362302 +0200
|
|
Adam Tkac |
3a8abef |
@@ -39,7 +39,7 @@ StringParameter SecurityServer::secTypes
|
|
Adam Tkac |
3a8abef |
("SecurityTypes",
|
|
Adam Tkac |
3a8abef |
"Specify which security scheme to use (None, VncAuth)",
|
|
Adam Tkac |
3a8abef |
#ifdef HAVE_GNUTLS
|
|
Adam Tkac |
3a8abef |
- "VncAuth,TLSVnc",
|
|
Adam Tkac |
3a8abef |
+ "VncAuth",
|
|
Adam Tkac |
3a8abef |
#else
|
|
Adam Tkac |
3a8abef |
"VncAuth",
|
|
Adam Tkac |
3a8abef |
#endif
|