[Development] Merge CSecurityTLS and CSecurityX509 classes into CSecurityTLSBase class.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4109 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx
index d2f40be..18fc56f 100644
--- a/common/rfb/Security.cxx
+++ b/common/rfb/Security.cxx
@@ -39,8 +39,7 @@
#include <rfb/SSecurityVncAuth.h>
#include <rfb/SSecurityVeNCrypt.h>
#ifdef HAVE_GNUTLS
-#include <rfb/CSecurityTLS.h>
-#include <rfb/CSecurityX509.h>
+#include <rfb/CSecurityTLSBase.h>
#include <rfb/SSecurityTLS.h>
#endif
#include <rfb/util.h>
@@ -152,16 +151,16 @@
#ifdef HAVE_GNUTLS
case secTypeTLSNone:
return new CSecurityStack(secTypeTLSNone, "TLS with no password",
- new CSecurityTLS());
+ new CSecurityTLSBase(true));
case secTypeTLSVnc:
return new CSecurityStack(secTypeTLSVnc, "TLS with VNCAuth",
- new CSecurityTLS(), new CSecurityVncAuth());
+ new CSecurityTLSBase(true), new CSecurityVncAuth());
case secTypeX509None:
return new CSecurityStack(secTypeX509None, "X509 with no password",
- new CSecurityX509());
+ new CSecurityTLSBase(false));
case secTypeX509Vnc:
return new CSecurityStack(secTypeX509None, "X509 with VNCAuth",
- new CSecurityX509(), new CSecurityVncAuth());
+ new CSecurityTLSBase(false), new CSecurityVncAuth());
#endif
}