From 906800b173da0a20f23ac0cf063bb0f69e612738 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 17 Sep 2014 16:39:28 +0200 Subject: [PATCH] Give a correct list of valid security schemes --- common/rfb/SecurityClient.cxx | 6 +++++- common/rfb/SecurityServer.cxx | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/rfb/SecurityClient.cxx b/common/rfb/SecurityClient.cxx index 4173c74d..fe347128 100644 --- a/common/rfb/SecurityClient.cxx +++ b/common/rfb/SecurityClient.cxx @@ -43,7 +43,11 @@ UserMsgBox *CSecurityTLS::msg = NULL; StringParameter SecurityClient::secTypes ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", + "Specify which security scheme to use (None, VncAuth, Plain" +#ifdef HAVE_GNUTLS + ", TLSNone, TLSVnc, TLSPlain, X509None, X509Vnc, X509Plain" +#endif + ")", #ifdef HAVE_GNUTLS "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,VncAuth,None", #else diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx index 76ece770..5bd7b2c9 100644 --- a/common/rfb/SecurityServer.cxx +++ b/common/rfb/SecurityServer.cxx @@ -37,7 +37,11 @@ using namespace rfb; StringParameter SecurityServer::secTypes ("SecurityTypes", - "Specify which security scheme to use (None, VncAuth)", + "Specify which security scheme to use (None, VncAuth, Plain" +#ifdef HAVE_GNUTLS + ", TLSNone, TLSVnc, TLSPlain, X509None, X509Vnc, X509Plain" +#endif + ")", #ifdef HAVE_GNUTLS "VncAuth,TLSVnc", #else -- 2.39.5