OSDN -- Develop and Download Open Source Software

[Ttssh2-commit] [5901] チケット #35164 ホスト鍵の自動更新のGUI設定

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2015年 6月 2日 (火) 22:43:24 JST 

Revision: 5901
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5901
Author:   yutakapon
Date:     2015-06-02 22:43:23 +0900 (Tue, 02 Jun 2015)
Log Message:
-----------
チケット #35164 ホスト鍵の自動更新のGUI設定

TTSSHのsetupダイアログに、「ホスト公開鍵の自動更新(hostkey rotation)」を追加した。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/35164

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/installer/release/lang/Korean.lng
    trunk/installer/release/lang/Russian.lng
    trunk/installer/release/lang/Simplified Chinese.lng
    trunk/installer/release/lang/Traditional Chinese.lng
    trunk/ttssh2/ttxssh/resource.h
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h
    trunk/ttssh2/ttxssh/ttxssh.rc

-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/English.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -699,6 +699,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=&Verify hostkey fingerprint by DNS
 DLG_SSHSETUP_NOTICE=All options take effect the next time a session is started.
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choose a read/write known-hosts file
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=Choose a read-only known-hosts file to add

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/French.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -699,6 +699,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=&Verify hostkey fingerprint by DNS
 DLG_SSHSETUP_NOTICE=Toutes options actives prochaine ouverture de session
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choisir un fichier h\xF4tes connus en R/W
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=Choisir un fichier h\xF4tes connus en lect. seule \xE0 ajouter

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/German.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -698,6 +698,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=&Verify hostkey fingerprint by DNS
 DLG_SSHSETUP_NOTICE=Die Einstellungen werden beim Start der n\xE4chsten Sitzung aktiv.
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choose a read/write known-hosts file
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=Choose a read-only known-hosts file to add

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/Japanese.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -699,6 +699,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=\x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9(&O)
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=\x83z\x83X\x83g\x83L\x81[\x82̌\xAE\x8Ew\x96\xE4\x82\xF0DNS\x82Ŋm\x94F\x82\xB7\x82\xE9(&V)
 DLG_SSHSETUP_NOTICE=\x82\xA2\x82\xB8\x82\xEA\x82̕ύX\x82\xE0\x8E\x9F\x89\xF1\x82̃Z\x83b\x83V\x83\x87\x83\x93\x88ȍ~\x97L\x8C\xF8\x82ɂȂ\xE8\x82܂\xB7.
+DLG_SSHSETUP_HOSTKEY_ROTATION=\x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82̎\xA9\x93\xAE\x8DX\x90V(&N)
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=\x96\xB3\x8C\xF8
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=\x97L\x8C\xF8
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=\x8Am\x94F\x95t\x82\xAB\x97L\x8C\xF8
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=\x93ǂݏ\x91\x82\xAB\x97pknownhosts\x83t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=\x92lj\xC1\x82\xB7\x82\xE9\x93ǂݎ\xE6\x82\xE8\x90\xEA\x97pknownhosts\x83t\x83@\x83C\x83\x8B\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2

Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/Korean.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -700,6 +700,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=agent \xC6\xF7\xBF\xF6\xB5\xF9 Ȯ\xC0\xCE(&O)
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=DNS\xB7\xCE ȣ\xBD\xBAƮŰ \xC1\xF6\xB9\xAE\xC0\xBB \xB0\xCB\xC1\xF5(&V)
 DLG_SSHSETUP_NOTICE=\xB8\xF0\xB5\xE7 \xBC\xB3\xC1\xA4\xC0\xBA \xB4\xD9\xC0\xBD \xBC\xBC\xBC\xC7\xC0\xCC \xBD\xC3\xC0۵\xC9 \xB6\xA7 \xB9ݿ\xB5\xB5˴ϴ\xD9.
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=\xC0а\x{DFB2}\xB1\xE2\xC0\xC7 known-host \xC6\xC4\xC0\xCF\xC0\xBB \xBC\xB1\xC5\xC3\xC7ϼ\xBC\xBF\xE4
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=\xC3߰\xA1\xC7ϱ\xE2 \xC0\xA7\xC7\xD1 \xC0б\xE2\xC0\xFC\xBF\xEB\xC0\xC7 known-host \xC6\xC4\xC0\xCF\xC0\xBB \xBC\xB1\xC5\xC3\xC7ϼ\xBC\xBF\xE4

Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/Russian.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -700,6 +700,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=&\xCF\xEE\xE4\xF2\xE2\xE5\xF0\xE4\xE8\xF2\xFC \xE0\xE3\xE5\xED\xF2\xE0 \xEF\xE5\xF0\xE5\xF1\xFB\xEB\xEA\xE8
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=&\xCF\xF0\xEE\xE2\xE5\xF0\xE8\xF2\xFC \xEA\xEB\xFE\xF7 \xF5\xEE\xF1\xF2\xE0 \xE2 DNS
 DLG_SSHSETUP_NOTICE=\xC2\xF1\xE5 \xEF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xE2\xF1\xF2\xF3\xEF\xFF\xF2 \xE2 \xF1\xE8\xEB\xF3 \xE2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE9 \xF1\xE5\xF1\xF1\xE8\xE8.
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB \xF7\xF2\xE5\xED\xE8\xFF/\xE7\xE0\xEF\xE8\xF1\xE8 \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=\xC2\xFB\xE1\xE5\xF0\xE8\xF2\xE5 \xF4\xE0\xE9\xEB \xF7\xF2\xE5\xED\xE8\xFF \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2, \xF7\xF2\xEE\xE1\xFB \xE4\xEE\xE1\xE0\xE2\xE8\xF2\xFC

Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/Simplified Chinese.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -700,6 +700,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=ȷ\xC8ϴ\xFA\xC0\xEDת\xB7\xA2(&O)
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=DNS\xD1\xE9֤\xD6\xF7\xBB\xFA\xC3\xDCԿָ\xCE\xC6(&V)
 DLG_SSHSETUP_NOTICE=\xCB\xF9\xD3и\xFC\xB8Ķ\xBC\xBD\xAB\xD4\xDA\xCF´λỰʱ\xC9\xFAЧ\xA1\xA3
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=ѡ\xD4\xF1һ\xB8\xF6\xBFɶ\xC1д\xB5\xC4hosts\xCEļ\xFE
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=׷\xBC\xD3һ\xB8\xF6ֻ\xB6\xC1\xB5\xC4hosts\xCEļ\xFE

Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/installer/release/lang/Traditional Chinese.lng	2015-06-02 13:43:23 UTC (rev 5901)
@@ -700,6 +700,10 @@
 DLG_SSHSETUP_FORWARDAGENTCONFIRM=\xBDT\xBB{\xA5N\xB2z\xC2\xE0\xB5o(&O)
 DLG_SSHSETUP_VERIFYHOSTKEYDNS=DNS\xC5\xE7\xC3ҥD\xBE\xF7\xB1K\xC6_\xAB\xFC\xAF\xBE(&V)
 DLG_SSHSETUP_NOTICE=\xA9Ҧ\xB3\xA7\xF3\xA7ﳣ\xB1N\xA6b\xA4U\xA6\xB8\xB3s\xBDu\xAEɥͮġC
+DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
+DLG_SSHSETUP_HOSTKEY_ROTATION_NO=No
+DLG_SSHSETUP_HOSTKEY_ROTATION_YES=Yes
+DLG_SSHSETUP_HOSTKEY_ROTATION_ASK=Ask
 
 FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=\xBF\xEF\xBEܤ@\xADӥiŪ\xBCg\xAA\xBAhosts\xA4\xE5\xA5\xF3
 FILEDLG_OPEN_KNOWNHOSTS_RO_TITLE=\xB0l\xA5[\xA4@\xADӥuŪ\xAA\xBAhosts\xA4\xE5\xA5\xF3

Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/ttssh2/ttxssh/resource.h	2015-06-02 13:43:23 UTC (rev 5901)
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ttxssh.rc
+// Microsoft Visual C++ \x82Ő\xB6\x90\xAC\x82\xB3\x82ꂽ\x83C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x81B
+// ttxssh.rc \x82Ŏg\x97p
 //
 #define IDC_ADD                         3
 #define IDC_REMOVE                      4
@@ -84,6 +84,7 @@
 #define IDC_HOSTTCPPROTOCOL             1047
 #define IDC_COMBO1                      1049
 #define IDC_SSH_VERSION                 1049
+#define IDC_HOSTKEY_ROTATION_COMBO      1049
 #define IDC_SSH_VERSION_LABEL           1050
 #define IDC_OPENSSL_VERSION             1051
 #define IDC_HEARTBEATLABEL              1052
@@ -203,6 +204,8 @@
 #define IDC_SFTP_CONSOLE                1208
 #define IDC_PUTTY_VERSION               1209
 #define IDC_ED25519_TYPE                1211
+#define IDC_HOSTKEY_ROTATION_STATIC     1212
+#define IDC_LIST1                       1213
 
 // Next default values for new objects
 // 
@@ -210,7 +213,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        111
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1212
+#define _APS_NEXT_CONTROL_VALUE         1214
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2015-06-02 13:43:23 UTC (rev 5901)
@@ -2928,9 +2928,21 @@
 	HWND hostkeyControl = GetDlgItem(dlg, IDC_SSHHOST_KEY_LIST);
 	HWND macControl = GetDlgItem(dlg, IDC_SSHMAC_LIST);
 	HWND compControl = GetDlgItem(dlg, IDC_SSHCOMP_LIST);
+	HWND hostkeyRotationControl = GetDlgItem(dlg, IDC_HOSTKEY_ROTATION_STATIC);
+	HWND hostkeyRotationControlList = GetDlgItem(dlg, IDC_HOSTKEY_ROTATION_COMBO);
 	int i;
 	int ch;
 	char uimsg[MAX_UIMSG];
+	char *rotationItem[SSH_UPDATE_HOSTKEYS_MAX] = {
+		"No",
+		"Yes",
+		"Ask",
+	};
+	char *rotationItemKey[SSH_UPDATE_HOSTKEYS_MAX] = {
+		"DLG_SSHSETUP_HOSTKEY_ROTATION_NO",
+		"DLG_SSHSETUP_HOSTKEY_ROTATION_YES",
+		"DLG_SSHSETUP_HOSTKEY_ROTATION_ASK",
+	};
 
 	GetWindowText(dlg, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_TITLE", pvar, uimsg);
@@ -3035,6 +3047,10 @@
 	UTIL_get_lang_msg("BTN_CANCEL", pvar, uimsg);
 	SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg);
 
+	GetDlgItemText(dlg, IDC_HOSTKEY_ROTATION_STATIC, uimsg, sizeof(uimsg));
+	UTIL_get_lang_msg("DLG_SSHSETUP_HOSTKEY_ROTATION", pvar, uimsg);
+	SetDlgItemText(dlg, IDC_HOSTKEY_ROTATION_STATIC, pvar->ts->UIMsg);
+
 	SendMessage(compressionControl, TBM_SETRANGE, TRUE, MAKELONG(0, 9));
 	SendMessage(compressionControl, TBM_SETPOS, TRUE,
 	            pvar->settings.CompressionLevel);
@@ -3176,6 +3192,17 @@
 	if (pvar->settings.VerifyHostKeyDNS) {
 		CheckDlgButton(dlg, IDC_VERIFYHOSTKEYDNS, TRUE);
 	}
+
+	// hostkey rotation(OpenSSH 6.8)
+	for (i = 0; i < SSH_UPDATE_HOSTKEYS_MAX; i++) {
+		UTIL_get_lang_msg(rotationItemKey[i], pvar, rotationItem[i]);
+		SendMessage(hostkeyRotationControlList, CB_INSERTSTRING, i, (LPARAM)pvar->ts->UIMsg);
+	}
+	ch = pvar->settings.UpdateHostkeys;
+	if (!(ch >= 0 && ch < SSH_UPDATE_HOSTKEYS_MAX))
+		ch = 0;
+	SendMessage(hostkeyRotationControlList, CB_SETCURSEL, ch, 0);
+
 }
 
 void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,
@@ -3429,6 +3456,12 @@
 	pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);
 	pvar->settings.ForwardAgentConfirm = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTCONFIRM);
 	pvar->settings.VerifyHostKeyDNS = IsDlgButtonChecked(dlg, IDC_VERIFYHOSTKEYDNS);
+
+	// hostkey rotation(OpenSSH 6.8)
+	i = SendMessage(GetDlgItem(dlg, IDC_HOSTKEY_ROTATION_COMBO), CB_GETCURSEL, 0, 0);
+	if (!(i >= 0 && i < SSH_UPDATE_HOSTKEYS_MAX))
+		i = 0;
+	pvar->settings.UpdateHostkeys = i;
 }
 
 static void move_cur_sel_delta(HWND listbox, int delta)
@@ -3584,6 +3617,9 @@
 			SendDlgItemMessage(dlg, IDC_NOTICEBANNER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+
+			SendDlgItemMessage(dlg, IDC_HOSTKEY_ROTATION_STATIC, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE, 0));
+			SendDlgItemMessage(dlg, IDC_HOSTKEY_ROTATION_COMBO, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE, 0));
 		}
 		else {
 			DlgSetupFont = NULL;

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2015-06-02 13:43:23 UTC (rev 5901)
@@ -109,6 +109,7 @@
 #define SSH_UPDATE_HOSTKEYS_NO	0
 #define SSH_UPDATE_HOSTKEYS_YES	1
 #define SSH_UPDATE_HOSTKEYS_ASK	2
+#define SSH_UPDATE_HOSTKEYS_MAX	3
 
 
 /*
@@ -169,7 +170,7 @@
 
 	char X11Display[128];
 
-	BOOL UpdateHostkeys;
+	int UpdateHostkeys;
 
 	int GexMinimalGroupSize;
 } TS_SSH;

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2015-06-02 09:07:33 UTC (rev 5900)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2015-06-02 13:43:23 UTC (rev 5901)
@@ -13,13 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// \x93\xFA\x96{\x8C\xEA resources
+// \x93\xFA\x96{\x8C\xEA (\x93\xFA\x96{) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN)
-#ifdef _WIN32
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 #pragma code_page(932)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -42,7 +40,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_SFTP_DIALOG, DIALOG
     BEGIN
@@ -54,7 +52,7 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // \x93\xFA\x96{\x8C\xEA resources
+#endif    // \x93\xFA\x96{\x8C\xEA (\x93\xFA\x96{) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -62,10 +60,8 @@
 // \x89p\x8C\xEA (\x95č\x91) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -157,7 +153,7 @@
     CONTROL         "S&erial",IDC_HOSTSERIAL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,89,47,8
 END
 
-IDD_SSHSETUP DIALOGEX 0, 0, 619, 271
+IDD_SSHSETUP DIALOGEX 0, 0, 619, 287
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: Setup"
 FONT 8, "Tahoma", 0, 0, 0x0
@@ -166,22 +162,22 @@
     LISTBOX         IDC_SSHCIPHERPREFS,31,19,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     PUSHBUTTON      "Move Up(&1)",IDC_SSHMOVECIPHERUP,43,84,58,13,WS_GROUP
     PUSHBUTTON      "Move Down(&2)",IDC_SSHMOVECIPHERDOWN,117,84,58,13
-    GROUPBOX        "SSH Known Hosts",IDC_KNOWNHOSTS,17,108,187,52
+    GROUPBOX        "SSH Known Hosts",IDC_KNOWNHOSTS,17,108,187,62
     PUSHBUTTON      "Read/&write file:",IDC_CHOOSEREADWRITEFILE,25,119,63,14
     EDITTEXT        IDC_READWRITEFILENAME,95,120,100,13,ES_AUTOHSCROLL | WS_GROUP
     PUSHBUTTON      "&Read-only files:",IDC_CHOOSEREADONLYFILE,25,137,63,14
     EDITTEXT        IDC_READONLYFILENAME,95,138,100,13,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "HeartBeat(&keep-alive)",IDC_HEARTBEATLABEL,17,167,83,8
-    EDITTEXT        IDC_HEARTBEAT_EDIT,102,165,26,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
-    LTEXT           "sec.(0 to turn off)",IDC_HEARTBEATLABEL2,134,167,77,8
+    LTEXT           "HeartBeat(&keep-alive)",IDC_HEARTBEATLABEL,17,180,83,8
+    EDITTEXT        IDC_HEARTBEAT_EDIT,102,178,26,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
+    LTEXT           "sec.(0 to turn off)",IDC_HEARTBEATLABEL2,134,180,77,8
     CONTROL         "Remember password in &memory",IDC_REMEMBERPASSWORD,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,181,187,10
-    CONTROL         "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,195,187,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,194,187,10
+    CONTROL         "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,208,187,10
     CONTROL         "C&onfirm agent forwarding",IDC_FORWARDAGENTCONFIRM,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,209,187,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,222,187,10
     CONTROL         "&Verify hostkey fingerprint by DNS",IDC_VERIFYHOSTKEYDNS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,223,187,10
-    LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,237,187,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,236,187,10
+    LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,250,187,12
     GROUPBOX        "K&EX order (SSH2 only)",IDC_KEX_ORDER,216,8,187,98
     LISTBOX         IDC_SSHKEX_LIST,230,20,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
     PUSHBUTTON      "Move Up(&3)",IDC_SSHKEX_MOVEUP,242,85,58,13,WS_GROUP
@@ -202,9 +198,11 @@
     LTEXT           "Highest",IDC_COMPRESSHIGH,576,210,25,8
     RTEXT           "&Compression level:",IDC_COMPRESSLABEL,422,218,62,13
     CONTROL         "Slider1",IDC_SSHCOMPRESSIONLEVEL,"msctls_trackbar32",TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,489,218,104,20
-    LTEXT           "SSH1: 'Compression level' determines compression on/off.\nSSH2: 'Compression order' and 'Compression level' determines compression on/off.",IDC_COMPRESSNOTE,423,241,188,25
-    DEFPUSHBUTTON   "OK",IDOK,48,252,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,118,252,50,14
+    LTEXT           "SSH1: 'Compression level' determines compression on/off.\nSSH2: 'Compression order' and 'Compression level' determines compression on/off.",IDC_COMPRESSNOTE,423,245,188,25
+    DEFPUSHBUTTON   "OK",IDOK,48,266,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,118,266,50,14
+    LTEXT           "Hostkey rotation",IDC_HOSTKEY_ROTATION_STATIC,27,157,102,8,0,WS_EX_RIGHT
+    COMBOBOX        IDC_HOSTKEY_ROTATION_COMBO,135,155,58,45,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 266
@@ -443,7 +441,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ABOUTDIALOG, DIALOG
     BEGIN
@@ -473,7 +471,7 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 612
         TOPMARGIN, 4
-        BOTTOMMARGIN, 266
+        BOTTOMMARGIN, 282
     END
 
     IDD_SSHUNKNOWNHOST, DIALOG


Ttssh2-commit メーリングリストの案内
Back to archive index