From b98ff6914590467877be8a837cffe4ca245dbe7d Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 14 Oct 2022 13:33:09 +0200 Subject: [PATCH] Don't enable RSA-AES by default in servers These require a key to have been set up on the server beforehand, so they do not give a good default experience as clients will be unable to connect. --- common/rfb/SecurityServer.cxx | 3 --- unix/x0vncserver/x0vncserver.man | 2 +- unix/xserver/hw/vnc/Xvnc.man | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/common/rfb/SecurityServer.cxx b/common/rfb/SecurityServer.cxx index 04022a90..1d1150ad 100644 --- a/common/rfb/SecurityServer.cxx +++ b/common/rfb/SecurityServer.cxx @@ -50,9 +50,6 @@ StringParameter SecurityServer::secTypes ")", #ifdef HAVE_GNUTLS "TLSVnc," -#endif -#ifdef HAVE_NETTLE - "RA2_256,RA2,RA2ne_256,RA2ne," #endif "VncAuth", ConfServer); diff --git a/unix/x0vncserver/x0vncserver.man b/unix/x0vncserver/x0vncserver.man index 5fc4d586..c36ae34e 100644 --- a/unix/x0vncserver/x0vncserver.man +++ b/unix/x0vncserver/x0vncserver.man @@ -106,7 +106,7 @@ Specify which security scheme to use for incoming connections. Valid values are a comma separated list of \fBNone\fP, \fBVncAuth\fP, \fBPlain\fP, \fBTLSNone\fP, \fBTLSVnc\fP, \fBTLSPlain\fP, \fBX509None\fP, \fBX509Vnc\fP, \fBX509Plain\fP, \fBRA2\fP, \fBRA2ne\fP, \fBRA2_256\fP and \fBRA2ne_256\fP. -Default is \fBTLSVnc,RA2_256,RA2,RA2ne_256,RA2ne,VncAuth\fP. +Default is \fBTLSVnc,VncAuth\fP. . .TP .B \-rfbauth \fIpasswd-file\fP, \-PasswordFile \fIpasswd-file\fP diff --git a/unix/xserver/hw/vnc/Xvnc.man b/unix/xserver/hw/vnc/Xvnc.man index c8806bf0..ea87deaf 100644 --- a/unix/xserver/hw/vnc/Xvnc.man +++ b/unix/xserver/hw/vnc/Xvnc.man @@ -188,7 +188,7 @@ Specify which security scheme to use for incoming connections. Valid values are a comma separated list of \fBNone\fP, \fBVncAuth\fP, \fBPlain\fP, \fBTLSNone\fP, \fBTLSVnc\fP, \fBTLSPlain\fP, \fBX509None\fP, \fBX509Vnc\fP, \fBX509Plain\fP, \fBRA2\fP, \fBRA2ne\fP, \fBRA2_256\fP and \fBRA2ne_256\fP. -Default is \fBTLSVnc,RA2_256,RA2,RA2ne_256,RA2ne,VncAuth\fP. +Default is \fBTLSVnc,VncAuth\fP. . .TP .B \-Password \fIpassword\fP -- 2.39.5