diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-07-21 09:10:54 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-07-21 09:10:54 +0000 |
| commit | f39671def2af442dde86764445b20714acbba0b0 (patch) | |
| tree | 29841c38a08e438a01bf30b3c68e3dff77279a65 /common/rfb/Security.cxx | |
| parent | f5f6a00dfb329b5e4b8c8349f8cac8b0036abbc9 (diff) | |
| download | tigervnc-f39671def2af442dde86764445b20714acbba0b0.tar.gz tigervnc-f39671def2af442dde86764445b20714acbba0b0.zip | |
[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
Diffstat (limited to 'common/rfb/Security.cxx')
| -rw-r--r-- | common/rfb/Security.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/common/rfb/Security.cxx b/common/rfb/Security.cxx index 37ecc153..6462edcf 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 @@ SSecurity* Security::GetSSecurity(U32 secType) 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 } |