Remove VeNCrypt settings from the GUI as lower layers will always be forcing

it on anyway.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4681 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/vncviewer/OptionsDialog.cxx b/vncviewer/OptionsDialog.cxx
index 862914041876f9568b38a5daa50bcbec5f9094b1..f77466ecba94e952ea7def39f4ba04b5e1d1be76 100644 (file)
--- a/vncviewer/OptionsDialog.cxx
+++ b/vncviewer/OptionsDialog.cxx
@@ -191,8 +191,6 @@ void OptionsDialog::loadOptions(void)
    list<U32> secTypesExt;
    list<U32>::iterator iterExt;
 
-  vencryptCheckbox->value(false);
-
   encNoneCheckbox->value(false);
   encTLSCheckbox->value(false);
   encX509Checkbox->value(false);
@@ -204,9 +202,6 @@ void OptionsDialog::loadOptions(void)
   secTypes = security.GetEnabledSecTypes();
   for (iter = secTypes.begin(); iter != secTypes.end(); ++iter) {
     switch (*iter) {
-    case secTypeVeNCrypt:
-      vencryptCheckbox->value(true);
-      break;
     case secTypeNone:
       encNoneCheckbox->value(true);
       authNoneCheckbox->value(true);
@@ -255,7 +250,6 @@ void OptionsDialog::loadOptions(void)
   caInput->value(CSecurityTLS::x509ca);
   crlInput->value(CSecurityTLS::x509crl);
 
-  handleVencrypt(vencryptCheckbox, this);
   handleX509(encX509Checkbox, this);
 #endif
 
@@ -319,33 +313,28 @@ void OptionsDialog::storeOptions(void)
       security.EnableSecType(secTypeNone);
     if (authVncCheckbox->value())
       security.EnableSecType(secTypeVncAuth);
-
-    if (vencryptCheckbox->value()) {
-      if (authPlainCheckbox->value())
-        security.EnableSecType(secTypePlain);
-    }
+    if (authPlainCheckbox->value())
+      security.EnableSecType(secTypePlain);
   }
 
-  if (vencryptCheckbox->value()) {
-    /* Process security types which use TLS encryption */
-    if (encTLSCheckbox->value()) {
-      if (authNoneCheckbox->value())
-        security.EnableSecType(secTypeTLSNone);
-      if (authVncCheckbox->value())
-        security.EnableSecType(secTypeTLSVnc);
-      if (authPlainCheckbox->value())
-        security.EnableSecType(secTypeTLSPlain);
-    }
+  /* Process security types which use TLS encryption */
+  if (encTLSCheckbox->value()) {
+    if (authNoneCheckbox->value())
+      security.EnableSecType(secTypeTLSNone);
+    if (authVncCheckbox->value())
+      security.EnableSecType(secTypeTLSVnc);
+    if (authPlainCheckbox->value())
+      security.EnableSecType(secTypeTLSPlain);
+  }
 
-    /* Process security types which use X509 encryption */
-    if (encX509Checkbox->value()) {
-      if (authNoneCheckbox->value())
-        security.EnableSecType(secTypeX509None);
-      if (authVncCheckbox->value())
-        security.EnableSecType(secTypeX509Vnc);
-      if (authPlainCheckbox->value())
-        security.EnableSecType(secTypeX509Plain);
-    }
+  /* Process security types which use X509 encryption */
+  if (encX509Checkbox->value()) {
+    if (authNoneCheckbox->value())
+      security.EnableSecType(secTypeX509None);
+    if (authVncCheckbox->value())
+      security.EnableSecType(secTypeX509Vnc);
+    if (authPlainCheckbox->value())
+      security.EnableSecType(secTypeX509Plain);
   }
 
   SecurityClient::secTypes.setParam(security.ToString());
@@ -552,14 +541,6 @@ void OptionsDialog::createSecurityPage(int tx, int ty, int tw, int th)
 
   orig_tx = tx;
 
-  /* Security */
-  vencryptCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
-                                                  CHECK_MIN_WIDTH,
-                                                  CHECK_HEIGHT,
-                                                  _("Extended encryption and authentication methods (VeNCrypt)")));
-  vencryptCheckbox->callback(handleVencrypt, this);
-  ty += CHECK_HEIGHT + INNER_MARGIN;
-
   /* Encryption */
   ty += GROUP_LABEL_OFFSET;
   height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 4 + CHECK_HEIGHT * 3 + (INPUT_LABEL_OFFSET + INPUT_HEIGHT) * 2;
@@ -614,7 +595,6 @@ void OptionsDialog::createSecurityPage(int tx, int ty, int tw, int th)
   ty += INNER_MARGIN;
 
   /* Authentication */
-  /* Encryption */
   ty += GROUP_LABEL_OFFSET;
   height = GROUP_MARGIN * 2 + TIGHT_MARGIN * 2 + CHECK_HEIGHT * 3;
   authenticationGroup = new Fl_Group(tx, ty, width, height, _("Authentication"));
@@ -775,20 +755,6 @@ void OptionsDialog::handleJpeg(Fl_Widget *widget, void *data)
 }
 
 
-void OptionsDialog::handleVencrypt(Fl_Widget *widget, void *data)
-{
-  OptionsDialog *dialog = (OptionsDialog*)data;
-
-  if (dialog->vencryptCheckbox->value()) {
-    dialog->encryptionGroup->activate();
-    dialog->authPlainCheckbox->activate();
-  } else {
-    dialog->encryptionGroup->deactivate();
-    dialog->authPlainCheckbox->deactivate();
-  }
-}
-
-
 void OptionsDialog::handleX509(Fl_Widget *widget, void *data)
 {
   OptionsDialog *dialog = (OptionsDialog*)data;

diff --git a/vncviewer/OptionsDialog.h b/vncviewer/OptionsDialog.h
index dfe2b656159c9cf924e143e51c1ccc6f5ce3ec8a..5c90749e825f5b378450ffa9d4942ad9a09701be 100644 (file)
--- a/vncviewer/OptionsDialog.h
+++ b/vncviewer/OptionsDialog.h
@@ -56,7 +56,6 @@ protected:
   static void handleCompression(Fl_Widget *widget, void *data);
   static void handleJpeg(Fl_Widget *widget, void *data);
 
-  static void handleVencrypt(Fl_Widget *widget, void *data);
   static void handleX509(Fl_Widget *widget, void *data);
 
   static void handleCancel(Fl_Widget *widget, void *data);
@@ -86,8 +85,6 @@ protected:
   Fl_Int_Input *jpegInput;
 
   /* Security */
-  Fl_Check_Button *vencryptCheckbox;
-
   Fl_Group *encryptionGroup;
   Fl_Check_Button *encNoneCheckbox;
   Fl_Check_Button *encTLSCheckbox;