Remove unused CSecurity::description()

10 files changed, 3 insertions, 25 deletions

diff --git a/common/rfb/CSecurity.h b/common/rfb/CSecurity.h
index 12d1829b..476f8770 100644
--- 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 d07815f6..cb887914 100644
--- 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 4ea8c9d4..add7e776 100644
--- 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 5691fd48..6b8da8dd 100644
--- 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 4be507ec..56ac3fea 100644
--- 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 c21d9d8e..b2d68b6f 100644
--- 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 6040dd34..046cd8d0 100644
--- 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 1e2a7e68..d087b2a4 100644
--- 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 2da98177..3f1f315b 100644
--- 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 4d88d678..dcd28bae 100644
--- 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