Diff

Differences From Artifact [8f0230cb9b]:

To Artifact [61e9f3d921]:


766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
		disaster2:;
	    }
	}
    }
}

void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
		      int midsession, int protocol)
{
    struct controlset *s;
    struct sessionsaver_data *ssd;
    struct charclass_data *ccd;
    struct colour_data *cd;
    struct environ_data *ed;
    struct portfwd_data *pfd;







|







766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
		disaster2:;
	    }
	}
    }
}

void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
		      int midsession, int protocol, int protcfginfo)
{
    struct controlset *s;
    struct sessionsaver_data *ssd;
    struct charclass_data *ccd;
    struct colour_data *cd;
    struct environ_data *ed;
    struct portfwd_data *pfd;
1579
1580
1581
1582
1583
1584
1585
1586

1587

1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612

1613
1614
1615
1616
1617
1618
1619
			  HELPCTX(ssh_ciphers),
			  dlg_stdcheckbox_handler,
			  I(offsetof(Config,ssh2_des_cbc)));
	}

	/*
	 * The Connection/SSH/Kex panel. (Owing to repeat key
	 * exchange, this is all meaningful in mid-session.)

	 */

	ctrl_settitle(b, "Connection/SSH/Kex",
		      "Options controlling SSH key exchange");

	s = ctrl_getset(b, "Connection/SSH/Kex", "main",
			"Key exchange algorithm options");
	c = ctrl_draglist(s, "Algorithm selection policy", 's',
			  HELPCTX(ssh_kexlist),
			  kexlist_handler, P(NULL));
	c->listbox.height = 5;

	s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
			"Options controlling key re-exchange");

	ctrl_editbox(s, "Max minutes before rekey (0 for no limit)", 't', 20,
		     HELPCTX(ssh_kex_repeat),
		     dlg_stdeditbox_handler,
		     I(offsetof(Config,ssh_rekey_time)),
		     I(-1));
	ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
		     HELPCTX(ssh_kex_repeat),
		     dlg_stdeditbox_handler,
		     I(offsetof(Config,ssh_rekey_data)),
		     I(16));
	ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
		  HELPCTX(ssh_kex_repeat));


	if (!midsession) {

	    /*
	     * The Connection/SSH/Auth panel.
	     */
	    ctrl_settitle(b, "Connection/SSH/Auth",







|
>

>
|
|

|
|
|
|
|
|

|
|

|
|
|
|
|
|
|
|
|
|
|
|
>







1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
			  HELPCTX(ssh_ciphers),
			  dlg_stdcheckbox_handler,
			  I(offsetof(Config,ssh2_des_cbc)));
	}

	/*
	 * The Connection/SSH/Kex panel. (Owing to repeat key
	 * exchange, this is all meaningful in mid-session _if_
	 * we're using SSH2 or haven't decided yet.)
	 */
	if (protcfginfo != 1) {
	    ctrl_settitle(b, "Connection/SSH/Kex",
			  "Options controlling SSH key exchange");

	    s = ctrl_getset(b, "Connection/SSH/Kex", "main",
			    "Key exchange algorithm options");
	    c = ctrl_draglist(s, "Algorithm selection policy", 's',
			      HELPCTX(ssh_kexlist),
			      kexlist_handler, P(NULL));
	    c->listbox.height = 5;

	    s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
			    "Options controlling key re-exchange");

	    ctrl_editbox(s, "Max minutes before rekey (0 for no limit)", 't', 20,
			 HELPCTX(ssh_kex_repeat),
			 dlg_stdeditbox_handler,
			 I(offsetof(Config,ssh_rekey_time)),
			 I(-1));
	    ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
			 HELPCTX(ssh_kex_repeat),
			 dlg_stdeditbox_handler,
			 I(offsetof(Config,ssh_rekey_data)),
			 I(16));
	    ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
		      HELPCTX(ssh_kex_repeat));
	}

	if (!midsession) {

	    /*
	     * The Connection/SSH/Auth panel.
	     */
	    ctrl_settitle(b, "Connection/SSH/Auth",