svnno****@sourc*****
svnno****@sourc*****
2012年 4月 3日 (火) 02:00:40 JST
Tera TermRevision: 4871
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4871
Author: doda
Date: 2012-04-03 02:00:40 +0900 (Tue, 03 Apr 2012)
Log Message:
-----------
SSH鍵生成ダイアログで、公開鍵のコメントを指定出来るようにした。
https://twitter.com/#!/akabekobeko/status/186806136379424768
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/installer/release/TERATERM.INI
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/ttssh2/ttxssh/resource.h
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/doc/en/html/about/history.html 2012-04-02 17:00:40 UTC (rev 4871)
@@ -1859,6 +1859,7 @@
<ul class="history">
<!--li>Changes
<ul>
+ <li>SSH Key Generator\x83_\x83C\x83A\x83\x8D\x83O\x82ŁA\x8C\xF6\x8AJ\x8C\xAE\x82̃R\x83\x81\x83\x93\x83g\x82\xF0\x8Ew\x92\xE8\x8Fo\x97\x88\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
</ul>
</li-->
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/doc/ja/html/about/history.html 2012-04-02 17:00:40 UTC (rev 4871)
@@ -1861,10 +1861,11 @@
<h3><a name="ttssh_2.61">2012.xx.xx (Ver 2.61)</a></h3>
<ul class="history">
- <!--li>\x95ύX
+ <li>\x95ύX
<ul>
+ <li>SSH Key Generator\x83_\x83C\x83A\x83\x8D\x83O\x82ŁA\x8C\xF6\x8AJ\x8C\xAE\x82̃R\x83\x81\x83\x93\x83g\x82\xF0\x8Ew\x92\xE8\x8Fo\x97\x88\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
</ul>
- </li-->
+ </li>
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/installer/release/TERATERM.INI 2012-04-02 17:00:40 UTC (rev 4871)
@@ -657,6 +657,7 @@
; G...Camellia192-CBC, H...Camellia256-CBC, I...Camellia128-CTR,
; J...Camellia192-CTR, K...Camellia256-CTR
; 0...Ciphers below this line are disabled.
+;CipherOrder=KHJGIF>:=9<8C7D;A@?EB3062
CipherOrder=K>H:J=G9I<F8C7D;A@?EB3062
; KEX algorithm order(SSH2)
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/installer/release/lang/English.lng 2012-04-02 17:00:40 UTC (rev 4871)
@@ -595,6 +595,7 @@
DLG_KEYGEN_KEYTYPE=Key type
DLG_KEYGEN_PASSPHRASE=Key passphrase:
DLG_KEYGEN_PASSPHRASE2=Confirm passphrase:
+DLG_KEYGEN_COMMENT=C&omment:
DLG_KEYGEN_SAVEPUBLIC=Save publi&c key
DLG_KEYGEN_SAVEPRIVATE=Save &private key
DLG_KEYGEN_GENERATE=&Generate
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/installer/release/lang/French.lng 2012-04-02 17:00:40 UTC (rev 4871)
@@ -594,6 +594,7 @@
DLG_KEYGEN_KEYTYPE=Type de Cl\xE9
DLG_KEYGEN_PASSPHRASE=Phrase secr\xE8te:
DLG_KEYGEN_PASSPHRASE2=Confirmer phrase:
+DLG_KEYGEN_COMMENT=C&omment:
DLG_KEYGEN_SAVEPUBLIC=Sauv. cl\xE9 publique
DLG_KEYGEN_SAVEPRIVATE=Sauv. cl\xE9 priv\xE9e
DLG_KEYGEN_GENERATE=&G\xE9n\xE9rer
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/installer/release/lang/German.lng 2012-04-02 17:00:40 UTC (rev 4871)
@@ -593,6 +593,7 @@
DLG_KEYGEN_KEYTYPE=Schl\xFCssel-Typ
DLG_KEYGEN_PASSPHRASE=Passphrase:
DLG_KEYGEN_PASSPHRASE2=Passphrase best\xE4tigen:
+DLG_KEYGEN_COMMENT=C&omment:
DLG_KEYGEN_SAVEPUBLIC=Public Key
DLG_KEYGEN_SAVEPRIVATE=Private Key
DLG_KEYGEN_GENERATE=Generieren
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/installer/release/lang/Japanese.lng 2012-04-02 17:00:40 UTC (rev 4871)
@@ -595,6 +595,7 @@
DLG_KEYGEN_KEYTYPE=\x8C\xAE\x82̎\xED\x97\xDE
DLG_KEYGEN_PASSPHRASE=\x8C\xAE\x82̃p\x83X\x83t\x83\x8C\x81[\x83Y:
DLG_KEYGEN_PASSPHRASE2=\x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82̊m\x94F:
+DLG_KEYGEN_COMMENT=\x83R\x83\x81\x83\x93\x83g(&O):
DLG_KEYGEN_SAVEPUBLIC=\x8C\xF6\x8AJ\x8C\xAE\x82̕ۑ\xB6(&C)
DLG_KEYGEN_SAVEPRIVATE=\x94閧\x8C\xAE\x82̕ۑ\xB6(&P)
DLG_KEYGEN_GENERATE=\x90\xB6\x90\xAC(&G)
Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/ttssh2/ttxssh/resource.h 2012-04-02 17:00:40 UTC (rev 4871)
@@ -181,6 +181,8 @@
#define IDC_HOSTSSHFPCHECK 1110
#define IDC_HOSTSSHFPDNSSEC 1111
#define IDC_VERIFYHOSTKEYDNS 1112
+#define IDC_COMMENT_LABEL 1113
+#define IDC_COMMENT_EDIT 1114
#define IDC_SSHUSEPASSWORD 1201
#define IDC_SSHUSERSA 1202
#define IDC_SSHFWDREMOTETOLOCAL 1202
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2012-04-02 17:00:40 UTC (rev 4871)
@@ -4021,6 +4021,9 @@
GetDlgItemText(dlg, IDC_CONFIRM_LABEL, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_KEYGEN_PASSPHRASE2", pvar, uimsg);
SetDlgItemText(dlg, IDC_CONFIRM_LABEL, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_COMMENT_LABEL, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_KEYGEN_COMMENT", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_COMMENT_LABEL, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_SAVE_PUBLIC_KEY, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_KEYGEN_SAVEPUBLIC", pvar, uimsg);
SetDlgItemText(dlg, IDC_SAVE_PUBLIC_KEY, pvar->ts->UIMsg);
@@ -4048,8 +4051,10 @@
SendDlgItemMessage(dlg, IDC_KEYBITS, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_KEY_LABEL, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_CONFIRM_LABEL, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(dlg, IDC_COMMENT_LABEL, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_KEY_EDIT, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_CONFIRM_EDIT, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(dlg, IDC_COMMENT_EDIT, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_KEYGEN_PROGRESS_LABEL, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_SAVE_PUBLIC_KEY, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_SAVE_PRIVATE_KEY, WM_SETFONT, (WPARAM)DlgKeygenFont, MAKELPARAM(TRUE,0));
@@ -4076,6 +4081,9 @@
EnableWindow(GetDlgItem(dlg, IDC_KEY_EDIT), FALSE);
EnableWindow(GetDlgItem(dlg, IDC_CONFIRM_EDIT), FALSE);
+ // comment edit box disabled (default)
+ EnableWindow(GetDlgItem(dlg, IDC_COMMENT_EDIT), FALSE);
+
// file saving dialog disabled(default)
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PUBLIC_KEY), FALSE);
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PRIBATE_KEY), FALSE);
@@ -4089,6 +4097,7 @@
{
int bits;
cbarg_t cbarg;
+ char comment[1024]; // comment string in private key
cbarg.cnt = 0;
cbarg.type = key_type;
@@ -4123,6 +4132,9 @@
EnableWindow(GetDlgItem(dlg, IDC_KEY_EDIT), FALSE);
EnableWindow(GetDlgItem(dlg, IDC_CONFIRM_EDIT), FALSE);
+ // comment edit box disabled (default)
+ EnableWindow(GetDlgItem(dlg, IDC_COMMENT_EDIT), FALSE);
+
// file saving dialog disabled(default)
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PUBLIC_KEY), FALSE);
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PRIBATE_KEY), FALSE);
@@ -4153,6 +4165,11 @@
EnableWindow(GetDlgItem(dlg, IDC_KEY_EDIT), TRUE);
EnableWindow(GetDlgItem(dlg, IDC_CONFIRM_EDIT), TRUE);
+ // enable comment edit box
+ EnableWindow(GetDlgItem(dlg, IDC_COMMENT_EDIT), TRUE);
+ ssh_make_comment(comment, sizeof(comment));
+ SetDlgItemText(dlg, IDC_COMMENT_EDIT, comment);
+
// file saving dialog disabled(default)
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PUBLIC_KEY), TRUE);
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PRIBATE_KEY), TRUE);
@@ -4293,7 +4310,7 @@
break;
}
- ssh_make_comment(comment, sizeof(comment));
+ GetDlgItemText(dlg, IDC_COMMENT_EDIT, comment, sizeof(comment));
// saving public key file
fp = fopen(filename, "wb");
@@ -4382,7 +4399,9 @@
}
// writing a comment(+LF)
- fprintf(fp, " %s", comment);
+ if (comment[0] != 0) {
+ fprintf(fp, " %s", comment);
+ }
fputc(0x0a, fp);
public_error:
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2012-04-01 13:06:50 UTC (rev 4870)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2012-04-02 17:00:40 UTC (rev 4871)
@@ -312,7 +312,7 @@
LTEXT "",IDC_SSHAUTHBANNER2,6,16,203,48
END
-IDD_SSHKEYGEN DIALOGEX 0, 0, 256, 124
+IDD_SSHKEYGEN DIALOGEX 0, 0, 256, 139
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "TTSSH: Key Generator"
FONT 8, "Tahoma", 0, 0, 0x0
@@ -333,8 +333,10 @@
RTEXT "Confirm passphrase:",IDC_CONFIRM_LABEL,14,86,80,8
EDITTEXT IDC_KEY_EDIT,100,69,108,12,ES_PASSWORD | ES_AUTOHSCROLL
EDITTEXT IDC_CONFIRM_EDIT,100,85,108,12,ES_PASSWORD | ES_AUTOHSCROLL
- PUSHBUTTON "Save publi&c key",IDC_SAVE_PUBLIC_KEY,49,103,68,14
- PUSHBUTTON "Save &private key",IDC_SAVE_PRIVATE_KEY,133,103,68,14
+ RTEXT "C&omment:",IDC_COMMENT_LABEL,14,101,80,8
+ EDITTEXT IDC_COMMENT_EDIT,100,100,108,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Save publi&c key",IDC_SAVE_PUBLIC_KEY,49,118,68,14
+ PUSHBUTTON "Save &private key",IDC_SAVE_PRIVATE_KEY,133,118,68,14
END
IDD_SSHSCP DIALOGEX 0, 0, 279, 125