diff options
Diffstat (limited to 'common/rfb/SecurityClient.cxx')
| -rw-r--r-- | common/rfb/SecurityClient.cxx | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx index 027d47df..d71941b5 100644 --- a/common/rfb/SecurityClient.cxx +++ b/common/rfb/SecurityClient.cxx @@ -25,12 +25,15 @@ #include <stdexcept> +#include <core/Configuration.h> + #include <rfb/CSecurityNone.h> #include <rfb/CSecurityStack.h> #include <rfb/CSecurityVeNCrypt.h> #include <rfb/CSecurityVncAuth.h> #include <rfb/CSecurityPlain.h> #include <rfb/Security.h> +#include <rfb/SecurityClient.h> #ifdef HAVE_GNUTLS #include <rfb/CSecurityTLS.h> #endif @@ -42,7 +45,7 @@ using namespace rfb; -StringParameter SecurityClient::secTypes +core::EnumListParameter SecurityClient::secTypes ("SecurityTypes", "Specify which security scheme to use (None, VncAuth, Plain" #ifdef HAVE_GNUTLS @@ -52,14 +55,22 @@ StringParameter SecurityClient::secTypes ", RA2, RA2ne, RA2_256, RA2ne_256, DH, MSLogonII" #endif ")", + { "None", "VncAuth", "Plain", +#ifdef HAVE_GNUTLS + "TLSNone", "TLSVnc", "TLSPlain", "X509None", "X509Vnc", "X509Plain", +#endif +#ifdef HAVE_NETTLE + "RA2", "RA2ne", "RA2_256", "RA2ne_256", "DH", "MSLogonII", +#endif + }, + { "None", "VncAuth", "Plain", #ifdef HAVE_GNUTLS - "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone," + "TLSNone", "TLSVnc", "TLSPlain", "X509None", "X509Vnc", "X509Plain", #endif #ifdef HAVE_NETTLE - "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII," + "RA2", "RA2ne", "RA2_256", "RA2ne_256", "DH", "MSLogonII", #endif - "VncAuth,None", -ConfViewer); + }); CSecurity* SecurityClient::GetCSecurity(CConnection* cc, uint32_t secType) { |