diff options
Diffstat (limited to 'common/rfb/SecurityServer.cxx')
| -rw-r--r-- | common/rfb/SecurityServer.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx index d692f4fc..207e70f8 100644 --- a/common/rfb/SecurityServer.cxx +++ b/common/rfb/SecurityServer.cxx @@ -21,7 +21,11 @@ #include <config.h> #endif +#include <stdexcept> + #include <rfb/Security.h> +#include <rfb/SecurityServer.h> + #include <rfb/SSecurityNone.h> #include <rfb/SSecurityStack.h> #include <rfb/SSecurityPlain.h> @@ -36,7 +40,7 @@ using namespace rfb; -StringParameter SecurityServer::secTypes +core::EnumListParameter SecurityServer::secTypes ("SecurityTypes", "Specify which security scheme to use (None, VncAuth, Plain" #ifdef HAVE_GNUTLS @@ -46,11 +50,19 @@ StringParameter SecurityServer::secTypes ", RA2, RA2ne, RA2_256, RA2ne_256" #endif ")", + { "None", "VncAuth", "Plain", +#ifdef HAVE_GNUTLS + "TLSNone", "TLSVnc", "TLSPlain", "X509None", "X509Vnc", "X509Plain", +#endif +#ifdef HAVE_NETTLE + "RA2", "RA2ne", "RA2_256", "RA2ne_256", +#endif + }, + { #ifdef HAVE_GNUTLS - "TLSVnc," + "TLSVnc", #endif - "VncAuth", -ConfServer); + "VncAuth"}); SSecurity* SecurityServer::GetSSecurity(SConnection* sc, uint32_t secType) { |