Add a parameter for separate SSL key

This commit is contained in:
Lauri Kasanen
2021-01-15 13:07:53 +02:00
parent 481b063eb7
commit 83c83f43ef
4 changed files with 19 additions and 8 deletions

View File

@@ -315,6 +315,12 @@ Listen for websocket connections on this port, default 6800.
SSL pem cert to use for websocket connections, default empty/not used.
.
.TP
.B \-key \fIpath\fP
SSL pem key to use for websocket connections, default empty/not used.
Only use this if you have the cert and key in separate files. If they
are in the same file, use \fB-cert\fP.
.
.TP
.B \-sslOnly
Require SSL for websocket connections. Default off, non-SSL allowed.
.

View File

@@ -87,6 +87,7 @@ rfb::BoolParameter noWebsocket("noWebsocket",
false);
rfb::IntParameter websocketPort("websocketPort", "websocket port to listen for", 6800);
rfb::StringParameter cert("cert", "SSL pem cert to use for websocket connections", "");
rfb::StringParameter certkey("key", "SSL pem key to use for websocket connections (if separate)", "");
rfb::BoolParameter sslonly("sslOnly", "Require SSL for websockets", false);
rfb::StringParameter basicauth("BasicAuth", "user:pass for HTTP basic auth for websockets", "");
rfb::StringParameter interface("interface",
@@ -224,7 +225,7 @@ void vncExtensionInit(void)
if (!noWebsocket)
network::createWebsocketListeners(&listeners, websocketPort,
localhostOnly ? "local" : addr,
sslonly, cert, basicauth, httpDir);
sslonly, cert, certkey, basicauth, httpDir);
else if (localhostOnly)
network::createLocalTcpListeners(&listeners, port);
else