tigervnc-rh692048.patch

   1 diff -up tigervnc-1.4.2/common/rfb/SecurityClient.cxx.rh692048 tigervnc-1.4.2/common/rfb/SecurityClient.cxx
   2 --- tigervnc-1.4.2/common/rfb/SecurityClient.cxx.rh692048       2015-02-12 18:32:50.168861186 +0000
   3 +++ tigervnc-1.4.2/common/rfb/SecurityClient.cxx        2015-02-12 18:33:13.168003696 +0000
   4 @@ -49,7 +49,7 @@ StringParameter SecurityClient::secTypes
   5  #endif
   6   ")",
   7  #ifdef HAVE_GNUTLS
   8 - "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
   9 + "VeNCrypt,X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None",
  10  #else
  11   "VncAuth,None",
  12  #endif
  13 diff -up tigervnc-1.4.2/common/rfb/Security.cxx.rh692048 tigervnc-1.4.2/common/rfb/Security.cxx
  14 --- tigervnc-1.4.2/common/rfb/Security.cxx.rh692048     2015-01-23 23:37:23.000000000 +0000
  15 +++ tigervnc-1.4.2/common/rfb/Security.cxx      2015-02-12 18:32:50.168861186 +0000
  16 @@ -68,7 +68,6 @@ const std::list<rdr::U8> Security::GetEn
  17    list<rdr::U8> result;
  18    list<U32>::iterator i;
  19
  20 -  result.push_back(secTypeVeNCrypt);
  21    for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
  22      if (*i < 0x100)
  23        result.push_back(*i);
  24 @@ -106,8 +105,6 @@ bool Security::IsSupported(U32 secType)
  25    for (i = enabledSecTypes.begin(); i != enabledSecTypes.end(); i++)
  26      if (*i == secType)
  27        return true;
  28 -  if (secType == secTypeVeNCrypt)
  29 -    return true;
  30
  31    return false;
  32  }
  33 diff -up tigervnc-1.4.2/common/rfb/SecurityServer.cxx.rh692048 tigervnc-1.4.2/common/rfb/SecurityServer.cxx
  34 --- tigervnc-1.4.2/common/rfb/SecurityServer.cxx.rh692048       2015-02-12 18:32:50.168861186 +0000
  35 +++ tigervnc-1.4.2/common/rfb/SecurityServer.cxx        2015-02-12 18:33:24.977076868 +0000
  36 @@ -43,7 +43,7 @@ StringParameter SecurityServer::secTypes
  37  #endif
  38   ")",
  39  #ifdef HAVE_GNUTLS
  40 - "TLSVnc,VncAuth",
  41 + "VncAuth",
  42  #else
  43   "VncAuth",
  44  #endif