Remove unused CSecurity::description()

diff --git a/common/rfb/CSecurity.h b/common/rfb/CSecurity.h
index 12d1829b87a59c2c0aac0016ac93c6b92b1588a9..476f8770f4878549af83e175a5c4ec7977ee07d8 100644 (file)
--- a/common/rfb/CSecurity.h
+++ b/common/rfb/CSecurity.h
@@ -48,7 +48,6 @@ namespace rfb {
     virtual ~CSecurity() {}
     virtual bool processMsg() = 0;
     virtual int getType() const = 0;
-    virtual const char* description() const = 0;
     virtual bool isSecure() const { return false; }
 
     /*

diff --git a/common/rfb/CSecurityNone.h b/common/rfb/CSecurityNone.h
index d07815f6f50ba47dcff9589bfb6329d18ac8e741..cb887914f7919e1e9ca3542a0580ee0c646d3f33 100644 (file)
--- a/common/rfb/CSecurityNone.h
+++ b/common/rfb/CSecurityNone.h
@@ -32,7 +32,6 @@ namespace rfb {
     CSecurityNone(CConnection* cc) : CSecurity(cc) {}
     virtual bool processMsg() { return true; }
     virtual int getType() const {return secTypeNone;}
-    virtual const char* description() const {return "No Encryption";}
   };
 }
 #endif

diff --git a/common/rfb/CSecurityPlain.h b/common/rfb/CSecurityPlain.h
index 4ea8c9d4724582231fc7701c245a2617c31f9318..add7e776ee9dcc6106a27e5199ed8421c5a47993 100644 (file)
--- a/common/rfb/CSecurityPlain.h
+++ b/common/rfb/CSecurityPlain.h
@@ -29,7 +29,6 @@ namespace rfb {
     CSecurityPlain(CConnection* cc) : CSecurity(cc) {}
     virtual bool processMsg();
     virtual int getType() const { return secTypePlain; }
-    virtual const char* description() const { return "ask for username and password"; }
   };
 }
 #endif

diff --git a/common/rfb/CSecurityStack.cxx b/common/rfb/CSecurityStack.cxx
index 5691fd48577f59e1c8dbaddc8d1de54de05e95ed..6b8da8ddd0f71b3bf2208d63ddba4dc197db4b32 100644 (file)
--- a/common/rfb/CSecurityStack.cxx
+++ b/common/rfb/CSecurityStack.cxx
@@ -25,9 +25,9 @@
 
 using namespace rfb;
 
-CSecurityStack::CSecurityStack(CConnection* cc, int Type, const char* Name,
+CSecurityStack::CSecurityStack(CConnection* cc, int Type,
                                CSecurity* s0, CSecurity* s1)
-  : CSecurity(cc), name(Name), type(Type)
+  : CSecurity(cc), type(Type)
 {
   state = 0;
   state0 = s0;

diff --git a/common/rfb/CSecurityStack.h b/common/rfb/CSecurityStack.h
index 4be507ecd79c31148e923898cd46f19acda5e8bc..56ac3fea6f8c3fc94a9b14dd772e58d352cc0210 100644 (file)
--- a/common/rfb/CSecurityStack.h
+++ b/common/rfb/CSecurityStack.h
@@ -27,18 +27,16 @@ namespace rfb {
 
   class CSecurityStack : public CSecurity {
   public:
-    CSecurityStack(CConnection* cc, int Type, const char *Name,
+    CSecurityStack(CConnection* cc, int Type,
                    CSecurity* s0 = NULL, CSecurity* s1 = NULL);
     ~CSecurityStack();
     virtual bool processMsg();
     virtual int getType() const {return type;};
-    virtual const char* description() const {return name;}
     virtual bool isSecure() const;
   protected:
     int state;
     CSecurity* state0;
     CSecurity* state1;
-    const char* name;
     int type;
   };
 }

diff --git a/common/rfb/CSecurityTLS.h b/common/rfb/CSecurityTLS.h
index c21d9d8e22124fec374a705cee95aa72ca717090..b2d68b6f4237a0cb5b26915d3aae55848275bcd7 100644 (file)
--- a/common/rfb/CSecurityTLS.h
+++ b/common/rfb/CSecurityTLS.h
@@ -41,8 +41,6 @@ namespace rfb {
     virtual ~CSecurityTLS();
     virtual bool processMsg();
     virtual int getType() const { return anon ? secTypeTLSNone : secTypeX509None; }
-    virtual const char* description() const
-      { return anon ? "TLS Encryption without VncAuth" : "X509 Encryption without VncAuth"; }
     virtual bool isSecure() const { return !anon; }
 
     static StringParameter X509CA;

diff --git a/common/rfb/CSecurityVeNCrypt.cxx b/common/rfb/CSecurityVeNCrypt.cxx
index 6040dd34691d4222d82a8afd4ad4e2dfec12a667..046cd8d00d74711800fe16f05b505c61664aa584 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.cxx
+++ b/common/rfb/CSecurityVeNCrypt.cxx
@@ -200,13 +200,6 @@ bool CSecurityVeNCrypt::processMsg()
   return csecurity->processMsg();
 }
 
-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 1e2a7e686ae689fec09186a5d16821eb0afa11ec..d087b2a42b3a92e3ca6d8d5ccd5e195f8aaa48f4 100644 (file)
--- a/common/rfb/CSecurityVeNCrypt.h
+++ b/common/rfb/CSecurityVeNCrypt.h
@@ -38,7 +38,6 @@ namespace rfb {
     ~CSecurityVeNCrypt();
     virtual bool processMsg();
     int getType() const {return chosenType;}
-    virtual const char* description() const;
     virtual bool isSecure() const;
 
   protected:

diff --git a/common/rfb/CSecurityVncAuth.h b/common/rfb/CSecurityVncAuth.h
index 2da98177f4564bfdbd3482cc933702eb017e9700..3f1f315b140094d13783d4f91e56972f142f75a3 100644 (file)
--- a/common/rfb/CSecurityVncAuth.h
+++ b/common/rfb/CSecurityVncAuth.h
@@ -29,7 +29,6 @@ namespace rfb {
     virtual ~CSecurityVncAuth() {}
     virtual bool processMsg();
     virtual int getType() const {return secTypeVncAuth;};
-    virtual const char* description() const {return "No Encryption";}
   };
 }
 #endif

diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx
index 4d88d678db9cff799be614a7ebc4ee1f1c7facb8..dcd28bae1609cee369bc0caed58c5ac2ed5e79e0 100644 (file)
--- a/common/rfb/SecurityClient.cxx
+++ b/common/rfb/SecurityClient.cxx
@@ -73,30 +73,24 @@ CSecurity* SecurityClient::GetCSecurity(CConnection* cc, U32 secType)
 #ifdef HAVE_GNUTLS
   case secTypeTLSNone:
     return new CSecurityStack(cc, secTypeTLSNone,
-                              "TLS with no password",
                               new CSecurityTLS(cc, true));
   case secTypeTLSVnc:
     return new CSecurityStack(cc, secTypeTLSVnc,
-                              "TLS with VNCAuth",
                               new CSecurityTLS(cc, true),
                               new CSecurityVncAuth(cc));
   case secTypeTLSPlain:
     return new CSecurityStack(cc, secTypeTLSPlain,
-                              "TLS with Username/Password",
                               new CSecurityTLS(cc, true),
                               new CSecurityPlain(cc));
   case secTypeX509None:
     return new CSecurityStack(cc, secTypeX509None,
-                              "X509 with no password",
                               new CSecurityTLS(cc, false));
   case secTypeX509Vnc:
     return new CSecurityStack(cc, secTypeX509Vnc,
-                              "X509 with VNCAuth",
                               new CSecurityTLS(cc, false),
                               new CSecurityVncAuth(cc));
   case secTypeX509Plain:
     return new CSecurityStack(cc, secTypeX509Plain,
-                              "X509 with Username/Password",
                               new CSecurityTLS(cc, false),
                               new CSecurityPlain(cc));
 #endif