Use better security method description when using VeNCrypt

The sub-modules generally provide a better description than just the
short security method name.

diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index 4a25245a2eb0a50c3ecc976b743c7782a2a40ec6..f9597cc7ee9907cf7ef016ce549f506ecea7568a 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -191,6 +191,13 @@ bool CSecurityVeNCrypt::processMsg(CConnection* cc)
   return csecurity->processMsg(cc);
 }
 
+const char* CSecurityVeNCrypt::description() const
+{
+  if (csecurity)
+    return csecurity->description();
+  return "VeNCrypt";
+}
+
 bool CSecurityVeNCrypt::isSecure() const
 {
   if (csecurity && csecurity->isSecure())

diff --git a/common/rfb/CSecurityVeNCrypt.h b/common/rfb/CSecurityVeNCrypt.h
index 1ff0c020c2fcedb0cfd15b7858af030382e216bd..6d978c75e9c31c86d538dedeea1a7b9f8378d682 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.h
+++ b/common/rfb/CSecurityVeNCrypt.h
@@ -38,7 +38,7 @@ namespace rfb {
     ~CSecurityVeNCrypt();
     virtual bool processMsg(CConnection* cc);// { return true; }
     int getType() const {return chosenType;}
-    virtual const char* description() const { return secTypeName(chosenType); }
+    virtual const char* description() const;
     virtual bool isSecure() const;
 
   protected: