|
 |
3994e4c |
diff -up tigervnc-1.4.2/common/rfb/SecurityClient.cxx.rh692048 tigervnc-1.4.2/common/rfb/SecurityClient.cxx
|
|
|
3994e4c |
--- tigervnc-1.4.2/common/rfb/SecurityClient.cxx.rh692048 2015-02-12 18:32:50.168861186 +0000
|
|
|
3994e4c |
+++ tigervnc-1.4.2/common/rfb/SecurityClient.cxx 2015-02-12 18:33:13.168003696 +0000
|
|
|
3994e4c |
@@ -49,7 +49,7 @@ StringParameter SecurityClient::secTypes
|
|
|
3994e4c |
#endif
|
|
|
3994e4c |
")",
|
|
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
|
|
|
3994e4c |
diff -up tigervnc-1.4.2/common/rfb/Security.cxx.rh692048 tigervnc-1.4.2/common/rfb/Security.cxx
|
|
|
3994e4c |
--- tigervnc-1.4.2/common/rfb/Security.cxx.rh692048 2015-01-23 23:37:23.000000000 +0000
|
|
|
3994e4c |
+++ tigervnc-1.4.2/common/rfb/Security.cxx 2015-02-12 18:32:50.168861186 +0000
|
|
|
3994e4c |
@@ -68,7 +68,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);
|
|
|
3994e4c |
@@ -106,8 +105,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 |
}
|
|
|
3994e4c |
diff -up tigervnc-1.4.2/common/rfb/SecurityServer.cxx.rh692048 tigervnc-1.4.2/common/rfb/SecurityServer.cxx
|
|
|
3994e4c |
--- tigervnc-1.4.2/common/rfb/SecurityServer.cxx.rh692048 2015-02-12 18:32:50.168861186 +0000
|
|
|
3994e4c |
+++ tigervnc-1.4.2/common/rfb/SecurityServer.cxx 2015-02-12 18:33:24.977076868 +0000
|
|
|
3994e4c |
@@ -43,7 +43,7 @@ StringParameter SecurityServer::secTypes
|
|
|
3994e4c |
#endif
|
|
|
3994e4c |
")",
|
|
Adam Tkac |
3a8abef |
#ifdef HAVE_GNUTLS
|
|
|
3994e4c |
- "TLSVnc,VncAuth",
|
|
Adam Tkac |
3a8abef |
+ "VncAuth",
|
|
Adam Tkac |
3a8abef |
#else
|
|
Adam Tkac |
3a8abef |
"VncAuth",
|
|
Adam Tkac |
3a8abef |
#endif
|