[Cleanup] Merge SSecurityTLS and SSecurityX509 classes into SSecurityTLSBase class.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4107 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index 37ecc15..6462edc 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -41,8 +41,7 @@
#ifdef HAVE_GNUTLS
#include <rfb/CSecurityTLS.h>
#include <rfb/CSecurityX509.h>
-#include <rfb/SSecurityTLS.h>
-#include <rfb/SSecurityX509.h>
+#include <rfb/SSecurityTLSBase.h>
#endif
#include <rfb/util.h>
@@ -125,13 +124,13 @@
case secTypeVeNCrypt: return new SSecurityVeNCrypt(this);
#ifdef HAVE_GNUTLS
case secTypeTLSNone:
- return new SSecurityStack(secTypeTLSNone, new SSecurityTLS());
+ return new SSecurityStack(secTypeTLSNone, new SSecurityTLSBase(true));
case secTypeTLSVnc:
- return new SSecurityStack(secTypeTLSVnc, new SSecurityTLS(), new SSecurityVncAuth());
+ return new SSecurityStack(secTypeTLSVnc, new SSecurityTLSBase(true), new SSecurityVncAuth());
case secTypeX509None:
- return new SSecurityStack(secTypeX509None, new SSecurityX509());
+ return new SSecurityStack(secTypeX509None, new SSecurityTLSBase(false));
case secTypeX509Vnc:
- return new SSecurityStack(secTypeX509None, new SSecurityX509(), new SSecurityVncAuth());
+ return new SSecurityStack(secTypeX509None, new SSecurityTLSBase(false), new SSecurityVncAuth());
#endif
}