Signed-off-by: Martin Koegler <mkoeg...@auto.tuwien.ac.at>
---
common/rfb/SSecurityVeNCrypt.cxx | 10 ----------
common/rfb/SSecurityVeNCrypt.h | 2 --
common/rfb/Security.cxx | 12 ++++++++++++
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/common/rfb/SSecurityVeNCrypt.cxx b/common/rfb/SSecurityVeNCrypt.cxx
index 3cdab8e..10d2f30 100644
--- a/common/rfb/SSecurityVeNCrypt.cxx
+++ b/common/rfb/SSecurityVeNCrypt.cxx
@@ -38,16 +38,6 @@ using namespace std;
static LogWriter vlog("SVeNCrypt");
-StringParameter SSecurityVeNCrypt::X509_CertFile
-("x509cert",
- "specifies path to the x509 certificate in PEM format",
- "", ConfServer);
-
-StringParameter SSecurityVeNCrypt::X509_KeyFile
-("x509key",
- "specifies path to the key of the x509 certificate in PEM format",
- "", ConfServer);
-
SSecurityVeNCrypt::SSecurityVeNCrypt(Security* sec) : security(sec)
{
ssecurityStack = NULL;
diff --git a/common/rfb/SSecurityVeNCrypt.h b/common/rfb/SSecurityVeNCrypt.h
index bd0a241..e45fe6f 100644
--- a/common/rfb/SSecurityVeNCrypt.h
+++ b/common/rfb/SSecurityVeNCrypt.h
@@ -41,8 +41,6 @@ namespace rfb {
virtual int getType() const { return secTypeVeNCrypt; }
virtual const char* getUserName() const { return NULL; }
- static StringParameter X509_CertFile, X509_KeyFile;
-
protected:
SSecurity *ssecurityStack;
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index d0e8290..133aec2 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -58,6 +58,18 @@ StringParameter Security::secTypes
"TLSVnc, TLSPlain, X509None, X509Vnc, X509Plain)",
"VncAuth");
+#if 0 /* currently unused */
+StringParameter X509_CertFile
+("x509cert",
+ "specifies path to the x509 certificate in PEM format",
+ "");
+
+StringParameter X509_KeyFile
+("x509key",
+ "specifies path to the key of the x509 certificate in PEM format",
+ "");
+#endif
+
void Security::enableClientTypes()
{
/* override default value */
--
1.6.4.2
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Tigervnc-devel mailing list
Tigervnc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-devel
