From 3a8745dd52035db8c18bf1d3e641d141b716ec06 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Thu, 8 Aug 2019 16:23:27 -0400 Subject: [PATCH] GUACAMOLE-514: Remove x509 additions. --- .../org/apache/guacamole/protocols/vnc.json | 16 ---------------- guacamole/src/main/webapp/translations/en.json | 4 ---- 2 files changed, 20 deletions(-) diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json index b1b3b75f3..4ee432e3b 100644 --- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json +++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/vnc.json @@ -26,22 +26,6 @@ { "name" : "password", "type" : "PASSWORD" - }, - { - "name" : "client-cert", - "type" : "MULTILINE" - }, - { - "name" : "client-key", - "type" : "MULTILINE" - }, - { - "name" : "ca-cert", - "type" : "MULTILINE" - }, - { - "name" : "ca-crl", - "type" : "TEXT" } ] }, diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json index cbe06b2aa..f29f3ceea 100644 --- a/guacamole/src/main/webapp/translations/en.json +++ b/guacamole/src/main/webapp/translations/en.json @@ -647,10 +647,6 @@ "PROTOCOL_VNC" : { "FIELD_HEADER_AUDIO_SERVERNAME" : "Audio server name:", - "FIELD_HEADER_CA_CERT" : "CA certificate:", - "FIELD_HEADER_CA_CRL" : "CA CRL location:", - "FIELD_HEADER_CLIENT_CERT" : "Client certificate:", - "FIELD_HEADER_CLIENT_KEY" : "Client private key:", "FIELD_HEADER_CLIPBOARD_ENCODING" : "Encoding:", "FIELD_HEADER_COLOR_DEPTH" : "Color depth:", "FIELD_HEADER_CREATE_RECORDING_PATH" : "Automatically create recording path:",