diff options
| author | Adam Tkac <atkac@redhat.com> | 2010-07-21 09:23:25 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@redhat.com> | 2010-07-21 09:23:25 +0000 |
| commit | 0e61c34932211b0f230f3a04000e81feb1382604 (patch) | |
| tree | 6114a7e544eefffad7dc686f4b90360d5e1c9eb5 /common/rfb/Security.cxx | |
| parent | 21b61a5c03d3f4ac72965e3ca28c710e2f54b35d (diff) | |
| download | tigervnc-0e61c34932211b0f230f3a04000e81feb1382604.tar.gz tigervnc-0e61c34932211b0f230f3a04000e81feb1382604.zip | |
[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
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 d2f40bec..18fc56fa 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 @@ CSecurity* Security::GetCSecurity(U32 secType) #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 } |