From svnnotify ＠ sourceforge.jp Mon Aug 1 00:15:56 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 00:15:56 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NTddICBTVk4jNDU0NSDjgafjgIHjgrM=?= =?utf-8?b?44O844OJ44Gu5oi744GX44Gr5aSx5pWX44GX44Gm44GE44KL44Gf44KB44CB?= =?utf-8?b?44Gd44Gu5L+u5q2j44KS6KGM44GG44CC?= Message-ID: <1312125356.861068.24910.nullmailer@users.sourceforge.jp> Revision: 4557 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4557 Author: yutakapon Date: 2011-08-01 00:15:56 +0900 (Mon, 01 Aug 2011) Log Message: ----------- SVN#4545 で、コードの戻しに失敗しているため、その修正を行う。 Ticket Links: :----------- http://sourceforge.jp/projects/ttssh2/tracker/detail/4545 Modified Paths: -------------- trunk/teraterm/ttpmacro/ttl.c -------------- next part -------------- Modified: trunk/teraterm/ttpmacro/ttl.c =================================================================== --- trunk/teraterm/ttpmacro/ttl.c 2011-07-31 11:19:38 UTC (rev 4556) +++ trunk/teraterm/ttpmacro/ttl.c 2011-07-31 15:15:56 UTC (rev 4557) @@ -1989,7 +1989,6 @@ char Temp[512]; WORD VarId, Err; int result = 0; /* failure */ - char filepath[1024]; Err = 0; GetStrVal(Str,&Err); @@ -2005,13 +2004,13 @@ GetAbsPath(Str,sizeof(Str)); GetPrivateProfileString("Password",Str2,"", - Temp,sizeof(Temp), filepath); + Temp,sizeof(Temp), Str); if (Temp[0]==0) // password not exist { OpenInpDlg(Temp2, Str2, "Enter password", "", TRUE); if (Temp2[0]!=0) { Encrypt(Temp2,Temp); - if (WritePrivateProfileString("Password",Str2,Temp, filepath) != 0) { + if (WritePrivateProfileString("Password",Str2,Temp, Str) != 0) { result = 1; /* success */ } } From svnnotify ＠ sourceforge.jp Mon Aug 1 00:20:40 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 00:20:40 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4558=5D__getpassword_=E3=81=AE_expan?= =?utf-8?b?ZGV2IOWvvuW/nOOBq+OBqOOCguOBquOBhuOAgeaWh+iogOS/ruato+OAgg==?= Message-ID: <1312125640.358351.30966.nullmailer@users.sourceforge.jp> Revision: 4558 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4558 Author: yutakapon Date: 2011-08-01 00:20:40 +0900 (Mon, 01 Aug 2011) Log Message: ----------- getpassword ??expandev 絲上?????????????篆???? Modified Paths: -------------- trunk/doc/en/html/macro/command/expandenv.html trunk/doc/en/html/macro/command/getpassword.html trunk/doc/ja/html/macro/command/expandenv.html trunk/doc/ja/html/macro/command/getpassword.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/expandenv.html =================================================================== --- trunk/doc/en/html/macro/command/expandenv.html 2011-07-31 15:15:56 UTC (rev 4557) +++ trunk/doc/en/html/macro/command/expandenv.html 2011-07-31 15:20:40 UTC (rev 4558) @@ -67,5 +67,11 @@ messagebox str "env" ; %test%\notepad.exe +

See also

+ + + Modified: trunk/doc/en/html/macro/command/getpassword.html =================================================================== --- trunk/doc/en/html/macro/command/getpassword.html 2011-07-31 15:15:56 UTC (rev 4557) +++ trunk/doc/en/html/macro/command/getpassword.html 2011-07-31 15:20:40 UTC (rev 4558) @@ -43,7 +43,6 @@

(version 4.71 or later)
-The environmental variables can be included in the password file <filename>.
When the password file can not be written, the system variable "result" is set to 0. Otherwise, "result" is set to 1.

@@ -59,11 +58,18 @@ 
-getpassword "%USERPROFILE%\myfile.dat" 'mypassword' password
+expandenv str "%USERPROFILE%\myfile.dat"
+getpassword str 'mypassword' password
 if !result then
 	messagebox 'Password was not saved' 'ERROR'
 endif
+

See also

+ + + Modified: trunk/doc/ja/html/macro/command/expandenv.html =================================================================== --- trunk/doc/ja/html/macro/command/expandenv.html 2011-07-31 15:15:56 UTC (rev 4557) +++ trunk/doc/ja/html/macro/command/expandenv.html 2011-07-31 15:20:40 UTC (rev 4558) @@ -67,5 +67,11 @@ messagebox str "env" ; %test%\notepad.exe +

??/h2> + + + Modified: trunk/doc/ja/html/macro/command/getpassword.html =================================================================== --- trunk/doc/ja/html/macro/command/getpassword.html 2011-07-31 15:15:56 UTC (rev 4557) +++ trunk/doc/ja/html/macro/command/getpassword.html 2011-07-31 15:20:40 UTC (rev 4558) @@ -43,7 +43,6 @@

(????? 4.71 ??)
-????????? <filename> ???OS????????(%variableName%)???????????
?????????????????s????A?????? result ? 0 ??????????????Aresult ? 1 ???????

@@ -60,11 +59,18 @@ 
-getpassword "%USERPROFILE%\myfile.dat" 'mypassword' password
+expandenv str "%USERPROFILE%\myfile.dat"
+getpassword str 'mypassword' password
 if !result then
 	messagebox 'Password was not saved' 'ERROR'
 endif
+

??/h2> + + + From svnnotify ＠ sourceforge.jp Mon Aug 1 16:21:58 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 16:21:58 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NTldICBTU0hGUCDmpJzoqLzjga7ntZA=?= =?utf-8?b?5p6c44KSIFNlY3VyaXR5IFdhcm5pbmcg44OA44Kk44Ki44Ot44Kw44Gr6KGo?= =?utf-8?b?56S644GZ44KL44KI44GG44Gr44GX44Gf44CC44Oh44OD44K744O844K444Gv?= =?utf-8?b?5pqr5a6a44CC?= Message-ID: <1312183318.610194.9722.nullmailer@users.sourceforge.jp> Revision: 4559 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4559 Author: doda Date: 2011-08-01 16:21:58 +0900 (Mon, 01 Aug 2011) Log Message: ----------- SSHFP 罎?┝?????? Security Warning ????≪??違?茵?ず?????????????＜??祉??吾?????? Modified Paths: -------------- trunk/ttssh2/ttxssh/hosts.c trunk/ttssh2/ttxssh/resource.h trunk/ttssh2/ttxssh/ttxssh.h trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/hosts.c =================================================================== --- trunk/ttssh2/ttxssh/hosts.c 2011-07-31 15:20:40 UTC (rev 4558) +++ trunk/ttssh2/ttxssh/hosts.c 2011-08-01 07:21:58 UTC (rev 4559) @@ -53,6 +53,23 @@ #include +#define DNS_TYPE_SSHFP 44 +typedef struct { + BYTE Algorithm; + BYTE DigestType; + BYTE Digest[1]; +} DNS_SSHFP_DATA, *PDNS_SSHFP_DATA; +enum verifydns_result { + DNS_VERIFY_NONE, + DNS_VERIFY_NOTFOUND, + DNS_VERIFY_MATCH, + DNS_VERIFY_MISMATCH, + DNS_VERIFY_DIFFERENTTYPE, + DNS_VERIFY_AUTH_MATCH, + DNS_VERIFY_AUTH_MISMATCH, + DNS_VERIFY_AUTH_DIFFERENTTYPE +}; + static HFONT DlgHostsAddFont; static HFONT DlgHostsReplaceFont; @@ -1309,6 +1326,43 @@ UTIL_get_lang_msg("BTN_DISCONNECT", pvar, uimsg); SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg); + switch (pvar->dns_key_check) { + case DNS_VERIFY_NOTFOUND: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "SSHFP RR not found."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_MATCH: + case DNS_VERIFY_AUTH_MATCH: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "SSHFP RR found and match."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_MISMATCH: + case DNS_VERIFY_AUTH_MISMATCH: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "SSHFP RR found but not match."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_DIFFERENTTYPE: + case DNS_VERIFY_AUTH_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "SSHFP RR found but different type."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + } + + switch (pvar->dns_key_check) { + case DNS_VERIFY_MATCH: + case DNS_VERIFY_MISMATCH: + case DNS_VERIFY_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "SSHFP RR is *not* authenticated by DNSSEC."); + SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); + break; + case DNS_VERIFY_AUTH_MATCH: + case DNS_VERIFY_AUTH_MISMATCH: + case DNS_VERIFY_AUTH_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "SSHFP RR is authenticated by DNSSEC."); + SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); + break; + } + init_hosts_dlg(pvar, dlg); font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0); @@ -1416,6 +1470,43 @@ UTIL_get_lang_msg("BTN_DISCONNECT", pvar, uimsg); SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg); + switch (pvar->dns_key_check) { + case DNS_VERIFY_NOTFOUND: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "SSHFP RR not found."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_MATCH: + case DNS_VERIFY_AUTH_MATCH: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "SSHFP RR found and match."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_MISMATCH: + case DNS_VERIFY_AUTH_MISMATCH: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "SSHFP RR found but not match."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_DIFFERENTTYPE: + case DNS_VERIFY_AUTH_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "SSHFP RR found but different type."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + } + + switch (pvar->dns_key_check) { + case DNS_VERIFY_MATCH: + case DNS_VERIFY_MISMATCH: + case DNS_VERIFY_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "SSHFP RR is *not* authenticated by DNSSEC."); + SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); + break; + case DNS_VERIFY_AUTH_MATCH: + case DNS_VERIFY_AUTH_MISMATCH: + case DNS_VERIFY_AUTH_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "SSHFP RR is authenticated by DNSSEC."); + SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); + break; + } + init_hosts_dlg(pvar, dlg); font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0); @@ -1521,6 +1612,43 @@ UTIL_get_lang_msg("BTN_DISCONNECT", pvar, uimsg); SetDlgItemText(dlg, IDCANCEL, pvar->ts->UIMsg); + switch (pvar->dns_key_check) { + case DNS_VERIFY_NOTFOUND: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "SSHFP RR not found."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_MATCH: + case DNS_VERIFY_AUTH_MATCH: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "SSHFP RR found and match."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_MISMATCH: + case DNS_VERIFY_AUTH_MISMATCH: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "SSHFP RR found but not match."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + case DNS_VERIFY_DIFFERENTTYPE: + case DNS_VERIFY_AUTH_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "SSHFP RR found but different type."); + SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); + break; + } + + switch (pvar->dns_key_check) { + case DNS_VERIFY_MATCH: + case DNS_VERIFY_MISMATCH: + case DNS_VERIFY_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "SSHFP RR is *not* authenticated by DNSSEC."); + SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); + break; + case DNS_VERIFY_AUTH_MATCH: + case DNS_VERIFY_AUTH_MISMATCH: + case DNS_VERIFY_AUTH_DIFFERENTTYPE: + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "SSHFP RR is authenticated by DNSSEC."); + SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); + break; + } + init_hosts_dlg(pvar, dlg); font = (HFONT)SendMessage(dlg, WM_GETFONT, 0, 0); @@ -1641,22 +1769,6 @@ return 0; } -#define DNS_TYPE_SSHFP 44 -typedef struct { - BYTE Algorithm; - BYTE DigestType; - BYTE Digest[1]; -} DNS_SSHFP_DATA, *PDNS_SSHFP_DATA; -enum verifydns_result { - DNS_VERIFY_NONE, - DNS_VERIFY_MATCH, - DNS_VERIFY_MISMATCH, - DNS_VERIFY_DIFFERENTTYPE, - DNS_VERIFY_AUTH_MATCH, - DNS_VERIFY_AUTH_MISMATCH, - DNS_VERIFY_AUTH_DIFFERENTTYPE -}; - int verify_hostkey_dns(char FAR *hostname, Key *key) { DNS_STATUS status; @@ -1664,7 +1776,7 @@ PDNS_SSHFP_DATA t; int hostkey_alg, hostkey_dtype, hostkey_dlen; BYTE *hostkey_digest; - int found = DNS_VERIFY_NONE; + int found = DNS_VERIFY_NOTFOUND; switch (key->type) { case KEY_RSA: @@ -1728,8 +1840,10 @@ // BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport, Key *key) { - int found_different_key = 0, found_different_type_key = 0, dns_sshfp_check = 0; + int found_different_key = 0, found_different_type_key = 0; + pvar->dns_key_check = DNS_VERIFY_NONE; + // ??? known_hosts ??????????????????????????????? if (pvar->hosts_state.prefetched_hostname != NULL && _stricmp(pvar->hosts_state.prefetched_hostname, hostname) == 0 @@ -1806,7 +1920,7 @@ } if (pvar->settings.VerifyHostKeyDNS && !is_numeric_hostname(hostname)) { - dns_sshfp_check = verify_hostkey_dns(hostname, key); + pvar->dns_key_check = verify_hostkey_dns(hostname, key); } // known_hosts???????????ｦ????????????????? Modified: trunk/ttssh2/ttxssh/resource.h =================================================================== --- trunk/ttssh2/ttxssh/resource.h 2011-07-31 15:20:40 UTC (rev 4558) +++ trunk/ttssh2/ttxssh/resource.h 2011-08-01 07:21:58 UTC (rev 4559) @@ -178,6 +178,8 @@ #define IDC_KEYGEN_PROGRESS_LABEL 1107 #define IDC_PROGBAR 1108 #define IDC_PROGTIME 1109 +#define IDC_HOSTSSHFPCHECK 1110 +#define IDC_HOSTSSHFPDNSSEC 1111 #define IDC_SSHUSEPASSWORD 1201 #define IDC_SSHUSERSA 1202 #define IDC_SSHFWDREMOTETOLOCAL 1202 Modified: trunk/ttssh2/ttxssh/ttxssh.h =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.h 2011-07-31 15:20:40 UTC (rev 4558) +++ trunk/ttssh2/ttxssh/ttxssh.h 2011-08-01 07:21:58 UTC (rev 4559) @@ -273,6 +273,8 @@ BOOL nocheck_known_hosts; EC_KEY *ecdh_client_key; + + int dns_key_check; } TInstVar; #define LOG_LEVEL_FATAL 5 Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2011-07-31 15:20:40 UTC (rev 4558) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-01 07:21:58 UTC (rev 4559) @@ -184,36 +184,40 @@ PUSHBUTTON "Cancel",IDCANCEL,118,252,50,14 END -IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 242 +IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 266 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SECURITY WARNING" FONT 8, "Tahoma", 0, 0, 0x0 BEGIN LTEXT "There is no entry for the server ""#####################################"" in your list of known hosts. The machine you have contacted may be a hostile machine pretending to be the server.",IDC_HOSTWARNING,15,7,184,41 LTEXT "If you choose to add this machine to the known hosts list and continue, then you will not receive this warning again.",IDC_HOSTWARNING2,15,48,184,26 - LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,75,176,8 - EDITTEXT IDC_FINGER_PRINT,15,86,179,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_FP_RANDOMART,14,105,181,97,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + LTEXT "",IDC_HOSTSSHFPCHECK,15,72,184,16 + LTEXT "",IDC_HOSTSSHFPDNSSEC,15,88,184,8 + LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,99,176,8 + EDITTEXT IDC_FINGER_PRINT,15,110,179,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_FP_RANDOMART,14,129,181,97,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL CONTROL "&Add this machine and its key to the known hosts list",IDC_ADDTOKNOWNHOSTS, - "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,207,181,13 - DEFPUSHBUTTON "&Continue",IDC_CONTINUE,50,222,50,14,WS_GROUP - PUSHBUTTON "&Disconnect",IDCANCEL,115,222,50,14,WS_GROUP + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,231,181,13 + DEFPUSHBUTTON "&Continue",IDC_CONTINUE,50,246,50,14,WS_GROUP + PUSHBUTTON "&Disconnect",IDCANCEL,115,246,50,14,WS_GROUP END -IDD_SSHDIFFERENTKEY DIALOGEX 0, 0, 215, 242 +IDD_SSHDIFFERENTKEY DIALOGEX 0, 0, 215, 266 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SECURITY WARNING" FONT 8, "Tahoma", 0, 0, 0x0 BEGIN LTEXT "Your known hosts list has an entry for the server ""####################################"", but the machine you have contacted has presented a DIFFERENT KEY to the one in your known hosts list. A hostile machine may be pretending to be the server.",IDC_HOSTWARNING,15,7,184,43 LTEXT "If you choose to add this new key to the known hosts list and continue, then you will not receive this warning again.",IDC_HOSTWARNING2,15,48,184,24 - LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,75,176,8 - EDITTEXT IDC_FINGER_PRINT,15,86,179,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_FP_RANDOMART,14,105,181,97,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + LTEXT "",IDC_HOSTSSHFPCHECK,15,72,184,16 + LTEXT "",IDC_HOSTSSHFPDNSSEC,15,88,184,8 + LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,99,176,8 + EDITTEXT IDC_FINGER_PRINT,15,110,179,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_FP_RANDOMART,14,129,181,97,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL CONTROL "&Replace the exist key with this new key",IDC_ADDTOKNOWNHOSTS, - "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,34,207,153,13 - PUSHBUTTON "&Continue",IDC_CONTINUE,50,222,50,14,WS_GROUP - DEFPUSHBUTTON "&Disconnect",IDCANCEL,115,222,50,14,WS_GROUP + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,34,231,153,13 + PUSHBUTTON "&Continue",IDC_CONTINUE,50,246,50,14,WS_GROUP + DEFPUSHBUTTON "&Disconnect",IDCANCEL,115,246,50,14,WS_GROUP END IDD_SSHAUTHSETUP DIALOGEX 0, 0, 309, 228 @@ -383,20 +387,22 @@ EDITTEXT IDC_CONFIRM_PASSWD,67,56,99,14,ES_PASSWORD | ES_AUTOHSCROLL END -IDD_SSHDIFFERENTTYPEKEY DIALOGEX 0, 0, 215, 242 +IDD_SSHDIFFERENTTYPEKEY DIALOGEX 0, 0, 215, 266 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SECURITY WARNING" FONT 8, "Tahoma", 0, 0, 0x0 BEGIN LTEXT "Your known hosts list has an entry for the server ""####################################"", but the machine you have contacted has presented a DIFFERENT TYPE KEY to the one in your known hosts list. A hostile machine may be pretending to be the server.",IDC_HOSTWARNING,15,7,184,43 LTEXT "If you choose to add this new key to the known hosts list and continue, then you will not receive this warning again.",IDC_HOSTWARNING2,15,48,184,24 - LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,75,176,8 - EDITTEXT IDC_FINGER_PRINT,15,86,179,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_FP_RANDOMART,14,105,181,97,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL + LTEXT "",IDC_HOSTSSHFPCHECK,15,72,184,16 + LTEXT "",IDC_HOSTSSHFPDNSSEC,15,88,184,8 + LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,99,176,8 + EDITTEXT IDC_FINGER_PRINT,15,110,179,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_FP_RANDOMART,14,129,181,97,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL CONTROL "&Add this machine and its key to the known hosts list",IDC_ADDTOKNOWNHOSTS, - "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,207,181,13 - DEFPUSHBUTTON "&Continue",IDC_CONTINUE,50,222,50,14,WS_GROUP - PUSHBUTTON "&Disconnect",IDCANCEL,115,222,50,14,WS_GROUP + "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,231,181,13 + DEFPUSHBUTTON "&Continue",IDC_CONTINUE,50,246,50,14,WS_GROUP + PUSHBUTTON "&Disconnect",IDCANCEL,115,246,50,14,WS_GROUP END From svnnotify ＠ sourceforge.jp Mon Aug 1 16:28:17 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 16:28:17 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NjBdICBTU0hGUCDmpJzoqLzjga7ntZA=?= =?utf-8?b?5p6c44KSIFNlY3VyaXR5IFdhcm5pbmcg44OA44Kk44Ki44Ot44Kw44Gr6KGo?= =?utf-8?b?56S644GZ44KL44KI44GG44Gr44GX44Gf44CC44Oh44OD44K744O844K444Gv?= =?utf-8?b?5pqr5a6a44CC?= Message-ID: <1312183697.815289.17960.nullmailer@users.sourceforge.jp> Revision: 4560 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4560 Author: doda Date: 2011-08-01 16:28:17 +0900 (Mon, 01 Aug 2011) Log Message: ----------- SSHFP 罎?┝?????? Security Warning ????≪??違?茵?ず?????????????＜??祉??吾?????? Modified Paths: -------------- trunk/installer/release/lang/Japanese.lng -------------- next part -------------- Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-08-01 07:21:58 UTC (rev 4559) +++ trunk/installer/release/lang/Japanese.lng 2011-08-01 07:28:17 UTC (rev 4560) @@ -662,6 +662,13 @@ DLG_UNKNOWNHOST_FINGERPRINT=???????????: DLG_UNKNOWNHOST_ADD=??????known hosts????????(&A) +DLG_HOSTKEY_SSHFP_NOTFOUND=DNS?????????????????B +DLG_HOSTKEY_SSHFP_MATCH=DNSDNS???????????A???????????????? +DLG_HOSTKEY_SSHFP_MISMATCH=DNS???????????????A??????????????????? +DLG_HOSTKEY_SSHFP_DIFFTYPE=DNS???????????????A???????????????????? +DLG_HOSTKEY_DNSSEC_NG=DNS???????NSSEC??????????*? +DLG_HOSTKEY_DNSSEC_OK=DNS???????NSSEC?????????B + ; crypt.c MSG_ENCRYPT_ERROR1=%s??????(1): bytes %d (%d) MSG_ENCRYPT_ERROR2=%s??????(2) From svnnotify ＠ sourceforge.jp Mon Aug 1 16:30:53 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 16:30:53 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NjFdICIg6Y2144Gu572u44GN5o+b44GI?= =?utf-8?b?ICAiIOOBjOaXpeacrOiqnuOBp+ihqOekuuOBleOCjOOBquOBi+OBo+OBnw==?= =?utf-8?b?44Gu44KS5L+u5q2j44CC?= Message-ID: <1312183853.914261.21513.nullmailer@users.sourceforge.jp> Revision: 4561 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4561 Author: doda Date: 2011-08-01 16:30:53 +0900 (Mon, 01 Aug 2011) Log Message: ----------- "?泣?臀?????"???????ц；腓冴????????????信罩ｃ? Modified Paths: -------------- trunk/installer/release/lang/Japanese.lng -------------- next part -------------- Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-08-01 07:28:17 UTC (rev 4560) +++ trunk/installer/release/lang/Japanese.lng 2011-08-01 07:30:53 UTC (rev 4561) @@ -519,12 +519,12 @@ MSG_RHOSTS_NOTDEFAULT_ERROR=Rhosts ???W??F????????? ????s?????????.\nRhosts ???TSSH ???????, Rhosts ???W?????TSSH ?????, ????????????"SSH ??.." ????????. MSG_NOAUTHMETHOD_ERROR=????TTSSH ???????I???????????????.\n?????????. -; dlg diff type +; dlg diff key DLG_DIFFERENTKEY_TITLE=???????? DLG_DIFFERENTKEY_WARNING=knows hosts????????"####################################"??????, ????????? *????????* ??????????, ???????????????????????????????, ?????????? DLG_DIFFERENTKEY_WARNING2=known hosts???????????????????, ???????????????? DLG_DIFFERENTKEY_FINGERPRINT=???????????: -DLG_DIFFERENTKEY_ADD=?????, ??????????&R) +DLG_DIFFERENTKEY_REPLACE=?????, ??????????&R) ; dlg diff type key DLG_DIFFERENTTYPEKEY_TITLE=???????? From svnnotify ＠ sourceforge.jp Mon Aug 1 16:37:16 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 16:37:16 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4562=5D__VerifyHostKeyDNS_=E3=82=92?= =?utf-8?b?6L+95Yqg?= Message-ID: <1312184236.062526.29300.nullmailer@users.sourceforge.jp> Revision: 4562 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4562 Author: doda Date: 2011-08-01 16:37:16 +0900 (Mon, 01 Aug 2011) Log Message: ----------- VerifyHostKeyDNS を追加 Modified Paths: -------------- trunk/installer/release/TERATERM.INI -------------- next part -------------- Modified: trunk/installer/release/TERATERM.INI =================================================================== --- trunk/installer/release/TERATERM.INI 2011-08-01 07:30:53 UTC (rev 4561) +++ trunk/installer/release/TERATERM.INI 2011-08-01 07:37:16 UTC (rev 4562) @@ -703,6 +703,9 @@ ; Confirm SSH agent forwarding (1=enabled 0=disabled) ForwardAgentConfirm=1 +; Verify host key by DNS (1=enabled 0=disabled) +VerifyHostKeyDNS=0 + [TTProxy] ConnectionTimeout="10" SocksResolve="auto" From svnnotify ＠ sourceforge.jp Mon Aug 1 23:16:56 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 01 Aug 2011 23:16:56 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4563=5D__VerifyHostKeyDNS_=E3=82=92?= =?utf-8?b?5L+d5a2Y44GZ44KL44KI44GG44Gr44GX44Gf?= Message-ID: <1312208216.934895.32639.nullmailer@users.sourceforge.jp> Revision: 4563 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4563 Author: maya Date: 2011-08-01 23:16:56 +0900 (Mon, 01 Aug 2011) Log Message: ----------- VerifyHostKeyDNS ???絖??????????? 莎桁??????? Tera Term ????違???･膓??????????VerifyHostKeyDNS ????鴻??????????篆?? /ssh-consume ??検?????INI ??┃絎??篆??????????? Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-08-01 07:37:16 UTC (rev 4562) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-08-01 14:16:56 UTC (rev 4563) @@ -563,11 +563,9 @@ WritePrivateProfileString("TTSSH", "ForwardAgentConfirm", settings->ForwardAgentConfirm ? "1" : "0", fileName); -/* // ????? DNS ?????? (RFC 4255) WritePrivateProfileString("TTSSH", "VerifyHostKeyDNS", settings->VerifyHostKeyDNS ? "1" : "0", fileName); - */ } From svnnotify ＠ sourceforge.jp Tue Aug 2 01:08:50 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 02 Aug 2011 01:08:50 +0900 Subject: [Ttssh2-commit] [4564] typo fix. Message-ID: <1312214930.769448.17800.nullmailer@users.sourceforge.jp> Revision: 4564 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4564 Author: doda Date: 2011-08-02 01:08:50 +0900 (Tue, 02 Aug 2011) Log Message: ----------- typo fix. Modified Paths: -------------- trunk/installer/release/lang/Japanese.lng -------------- next part -------------- Modified: trunk/installer/release/lang/Japanese.lng =================================================================== --- trunk/installer/release/lang/Japanese.lng 2011-08-01 14:16:56 UTC (rev 4563) +++ trunk/installer/release/lang/Japanese.lng 2011-08-01 16:08:50 UTC (rev 4564) @@ -663,7 +663,7 @@ DLG_UNKNOWNHOST_ADD=??????known hosts????????(&A) DLG_HOSTKEY_SSHFP_NOTFOUND=DNS?????????????????B -DLG_HOSTKEY_SSHFP_MATCH=DNSDNS???????????A???????????????? +DLG_HOSTKEY_SSHFP_MATCH=DNS???????????A???????????????? DLG_HOSTKEY_SSHFP_MISMATCH=DNS???????????????A??????????????????? DLG_HOSTKEY_SSHFP_DIFFTYPE=DNS???????????????A???????????????????? DLG_HOSTKEY_DNSSEC_NG=DNS???????NSSEC??????????*? From svnnotify ＠ sourceforge.jp Tue Aug 2 20:50:36 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 02 Aug 2011 20:50:36 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NjVdICDmlrDjgZfjgYTjg6njg5njg6s=?= =?utf-8?b?44Gr44OV44Kp44Oz44OI44KS6YGp55So?= Message-ID: <1312285836.206073.11853.nullmailer@users.sourceforge.jp> Revision: 4565 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4565 Author: maya Date: 2011-08-02 20:50:35 +0900 (Tue, 02 Aug 2011) Log Message: ----------- 新しいラベルにフォントを適用 Modified Paths: -------------- trunk/ttssh2/ttxssh/hosts.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/hosts.c =================================================================== --- trunk/ttssh2/ttxssh/hosts.c 2011-08-01 16:08:50 UTC (rev 4564) +++ trunk/ttssh2/ttxssh/hosts.c 2011-08-02 11:50:35 UTC (rev 4565) @@ -1370,6 +1370,8 @@ if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) { SendDlgItemMessage(dlg, IDC_HOSTWARNING, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_HOSTWARNING2, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(dlg, IDC_HOSTSSHFPCHECK, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(dlg, IDC_HOSTSSHFPDNSSEC, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_HOSTFINGERPRINT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_FINGER_PRINT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_ADDTOKNOWNHOSTS, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); @@ -1514,6 +1516,8 @@ if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsReplaceFont, pvar)) { SendDlgItemMessage(dlg, IDC_HOSTWARNING, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_HOSTWARNING2, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(dlg, IDC_HOSTSSHFPCHECK, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(dlg, IDC_HOSTSSHFPDNSSEC, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_HOSTFINGERPRINT, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_ADDTOKNOWNHOSTS, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_CONTINUE, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0)); @@ -1656,6 +1660,8 @@ if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) { SendDlgItemMessage(dlg, IDC_HOSTWARNING, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_HOSTWARNING2, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(dlg, IDC_HOSTSSHFPCHECK, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); + SendDlgItemMessage(dlg, IDC_HOSTSSHFPDNSSEC, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_HOSTFINGERPRINT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_FINGER_PRINT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); SendDlgItemMessage(dlg, IDC_ADDTOKNOWNHOSTS, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0)); From svnnotify ＠ sourceforge.jp Tue Aug 2 23:08:29 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 02 Aug 2011 23:08:29 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NjZdICBTU0gg44K144O844OQ44Ob44K5?= =?utf-8?b?44OI6Y2144Gu5qSc6Ki844Gr44Gk44GE44Gm44OJ44Kt44Ol44Oh44Oz44OI?= =?utf-8?b?44KS6L+96KiY44GX44Gf?= Message-ID: <1312294109.195449.32562.nullmailer@users.sourceforge.jp> Revision: 4566 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4566 Author: maya Date: 2011-08-02 23:08:28 +0900 (Tue, 02 Aug 2011) Log Message: ----------- SSH ?泣?????鴻??泣?罎?┝??????????ャ??潟???申荐???? Modified Paths: -------------- trunk/doc/ja/html/usage/ssh.html -------------- next part -------------- Modified: trunk/doc/ja/html/usage/ssh.html =================================================================== --- trunk/doc/ja/html/usage/ssh.html 2011-08-02 11:50:35 UTC (rev 4565) +++ trunk/doc/ja/html/usage/ssh.html 2011-08-02 14:08:28 UTC (rev 4566) @@ -51,6 +51,25 @@ ????????p?????A???????Use RSA/DSA key to log in???????????Private key file:????????????????????????????????????????????????????????

+

????????

+ +

SSH ????? SSH ????????????????????? ssh_known_hosts ???????x???ｦ????
+ ?????????????????????

+ + + +

????ｦ???????A??????????????????ﾒ?????????????????
+ ??????????????????????????????????? SSH ????????????????????x???ｦ???????????????ｦ?????????? SSH ???????????????????????? SSH ?????????????????????????

+ +

OpenSSH ???A?????ﾒ???????????????????????????????

+ + 
ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub
+

?????

From svnnotify ＠ sourceforge.jp Wed Aug 3 19:24:44 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 03 Aug 2011 19:24:44 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NjddICDjgrXjg7Pjg5fjg6vjgrPjg7w=?= =?utf-8?b?44OJ44KS6L+95Yqg44GX44Gf44CC?= Message-ID: <1312367084.848872.5534.nullmailer@users.sourceforge.jp> Revision: 4567 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4567 Author: yutakapon Date: 2011-08-03 19:24:44 +0900 (Wed, 03 Aug 2011) Log Message: ----------- ?泣?????潟????菴遵??????cf. http://logmett.com/forum/viewtopic.php?f=3&t=1538&p=5402#p5402 Modified Paths: -------------- trunk/doc/en/html/macro/command/waitrecv.html trunk/doc/ja/html/macro/command/waitrecv.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/waitrecv.html =================================================================== --- trunk/doc/en/html/macro/command/waitrecv.html 2011-08-02 14:08:28 UTC (rev 4566) +++ trunk/doc/en/html/macro/command/waitrecv.html 2011-08-03 10:24:44 UTC (rev 4567) @@ -64,5 +64,28 @@ +

Example

+ +
+; Every byte is shown in hexadecimal
+setdebug 2
+waitrecv '43 0D'  2 1
+setdebug 0
+
+; In this mode non printable characters are shown as control keys e.g. ^A = 1, ^B = 2 etc.
+setdebug 1
+waitrecv 'C^M' 2 1
+setdebug 0
+
+; Normal mode
+setdebug 0
+waitrecv 'C'#13 2 1
+
+ +

Reference

+ +setdebug
+wait
+ Modified: trunk/doc/ja/html/macro/command/waitrecv.html =================================================================== --- trunk/doc/ja/html/macro/command/waitrecv.html 2011-08-02 14:08:28 UTC (rev 4566) +++ trunk/doc/ja/html/macro/command/waitrecv.html 2011-08-03 10:24:44 UTC (rev 4567) @@ -63,5 +63,29 @@ + +

?

+ +
+; Every byte is shown in hexadecimal
+setdebug 2
+waitrecv '43 0D'  2 1
+setdebug 0
+
+; In this mode non printable characters are shown as control keys e.g. ^A = 1, ^B = 2 etc.
+setdebug 1
+waitrecv 'C^M' 2 1
+setdebug 0
+
+; Normal mode
+setdebug 0
+waitrecv 'C'#13 2 1
+
+ +

??/h2> + +setdebug
+wait
+ From svnnotify ＠ sourceforge.jp Wed Aug 3 23:42:03 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 03 Aug 2011 23:42:03 +0900 Subject: [Ttssh2-commit] [4568] Eterm look feel: Message-ID: <1312382523.319744.20824.nullmailer@users.sourceforge.jp> Revision: 4568 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4568 Author: yutakapon Date: 2011-08-03 23:42:03 +0900 (Wed, 03 Aug 2011) Log Message: ----------- Eterm look feel: 紕????.bmp 綵√?篁ュ??????????茯??莨若???????????????? ???????≦ぇ茵?ず鐚??????????????鐚?????絲上??? Modified Paths: -------------- trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-03 10:24:44 UTC (rev 4567) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-03 14:42:03 UTC (rev 4568) @@ -15,6 +15,7 @@ #include "vtdisp.h" #include +#include #define CurWidth 2 @@ -636,6 +637,48 @@ RegCloseKey(hKey); } +// .bmp????????????? +// ??? .bmp ???????????????????B +// (2011.8.3 yutaka) +// cf. http://www.geocities.jp/ccfjd821/purogu/wpe-ji9.html +static HBITMAP GetBitmapHandle(char *File) +{ + OLE_HANDLE hOle = 0; + IStream *iStream=NULL; + IPicture *iPicture; + HGLOBAL hMem; + LPVOID pvData; + DWORD nReadByte=0,nFileSize; + HANDLE hFile; + short type; + HBITMAP hBitmap = NULL; + + hFile=CreateFile(File,GENERIC_READ,0,NULL,OPEN_EXISTING,0,NULL); + nFileSize=GetFileSize(hFile,NULL); + hMem=GlobalAlloc(GMEM_MOVEABLE,nFileSize); + pvData=GlobalLock(hMem); + + ReadFile(hFile,pvData,nFileSize,&nReadByte,NULL); + + GlobalUnlock(hMem); + CloseHandle(hFile); + + CreateStreamOnHGlobal(hMem,TRUE,&iStream); + + OleLoadPicture(iStream,nFileSize,FALSE,&IID_IPicture,(LPVOID*)&iPicture); + + iStream->lpVtbl->Release((IStream *)iPicture); + + iPicture->lpVtbl->get_Type(iPicture,&type); + if(type==PICTYPE_BITMAP){ + iPicture->lpVtbl->get_Handle(iPicture,&hOle); + } + + hBitmap=(HBITMAP)hOle; + + return (hBitmap); +} + void BGPreloadWallpaper(BGSrc *src) { HBITMAP hbm; @@ -645,10 +688,13 @@ //??????? //LR_CREATEDIBSECTION ????????? - if(wi.pattern == BG_STRETCH) + if (wi.pattern == BG_STRETCH) { hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); - else - hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); + // TODO: ?????????????????????????? + } else { + //hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); + hbm = GetBitmapHandle(wi.filename); + } //??DC??? if(hbm) @@ -661,6 +707,7 @@ src->width = bm.bmWidth; src->height = bm.bmHeight; src->pattern = wi.pattern; + }else{ src->hdc = NULL; } From svnnotify ＠ sourceforge.jp Thu Aug 4 15:00:18 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 04 Aug 2011 15:00:18 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NjldIEROUyhTU0hGUCkgIOmWoumAow==?= =?utf-8?b?44KS5Yil44OV44Kh44Kk44Or44Gr5YiG6Zui44CC?= Message-ID: <1312437618.004793.16991.nullmailer@users.sourceforge.jp> Revision: 4569 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4569 Author: doda Date: 2011-08-04 15:00:17 +0900 (Thu, 04 Aug 2011) Log Message: ----------- DNS(SSHFP) ?∫????????ゃ?????≪? # BIND ??libresolv 膈?? OS 罔??篁ュ?????障????絲上?????????冴??????# libresolv 絲上??????賢?? Modified Paths: -------------- trunk/ttssh2/ttxssh/hosts.c trunk/ttssh2/ttxssh/ssh.h trunk/ttssh2/ttxssh/ttxssh.vcproj Added Paths: ----------- trunk/ttssh2/ttxssh/dns.c trunk/ttssh2/ttxssh/dns.h -------------- next part -------------- Added: trunk/ttssh2/ttxssh/dns.c =================================================================== --- trunk/ttssh2/ttxssh/dns.c (rev 0) +++ trunk/ttssh2/ttxssh/dns.c 2011-08-04 06:00:17 UTC (rev 4569) @@ -0,0 +1,116 @@ +/* +Copyright (c) TeraTerm Project. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +#include + +#include "ttxssh.h" +#include "ssh.h" +#include "key.h" +#include "dns.h" + +int is_numeric_hostname(const char *hostname) +{ + struct addrinfo hints, *res; + + if (!hostname) { + return -1; + } + + memset(&hints, 0, sizeof(hints)); + hints.ai_family = PF_UNSPEC; + hints.ai_flags = AI_NUMERICHOST; + + if (getaddrinfo(hostname, NULL, &hints, &res) == 0) { + freeaddrinfo(res); + return 1; + } + + return 0; +} + +int verify_hostkey_dns(char FAR *hostname, Key *key) +{ + DNS_STATUS status; + PDNS_RECORD rec, p; + PDNS_SSHFP_DATA t; + int hostkey_alg, hostkey_dtype, hostkey_dlen; + BYTE *hostkey_digest; + int found = DNS_VERIFY_NOTFOUND; + + switch (key->type) { + case KEY_RSA: + hostkey_alg = SSHFP_KEY_RSA; + hostkey_dtype = SSHFP_HASH_SHA1; + break; + case KEY_DSA: + hostkey_alg = SSHFP_KEY_DSA; + hostkey_dtype = SSHFP_HASH_SHA1; + break; + case KEY_ECDSA256: + case KEY_ECDSA384: + case KEY_ECDSA521: + hostkey_alg = SSHFP_KEY_ECDSA; + hostkey_dtype = SSHFP_HASH_SHA256; + break; + default: // Un-supported algorithm + hostkey_alg = SSHFP_KEY_RESERVED; + hostkey_dtype = SSHFP_HASH_RESERVED; + } + + if (hostkey_alg) { + hostkey_digest = key_fingerprint_raw(key, hostkey_dtype, &hostkey_dlen); + } + else { + hostkey_digest = NULL; + } + + status = DnsQuery(hostname, DNS_TYPE_SSHFP, DNS_QUERY_STANDARD, NULL, &rec, NULL); + + if (status == 0) { + for (p=rec; p!=NULL; p=p->pNext) { + if (p->wType == DNS_TYPE_SSHFP) { + t = (PDNS_SSHFP_DATA)&(p->Data.Null); + if (t->Algorithm == hostkey_alg && t->DigestType == hostkey_dtype) { + if (hostkey_dlen == p->wDataLength-2 && memcmp(hostkey_digest, t->Digest, hostkey_dlen) == 0) { + found = DNS_VERIFY_MATCH; + break; + } + else { + found = DNS_VERIFY_MISMATCH; + break; + } + } + else { + found = DNS_VERIFY_DIFFERENTTYPE; + } + } + } + } + + free(hostkey_digest); + DnsRecordListFree(rec, DnsFreeRecordList); + return found; +} Added: trunk/ttssh2/ttxssh/dns.h =================================================================== --- trunk/ttssh2/ttxssh/dns.h (rev 0) +++ trunk/ttssh2/ttxssh/dns.h 2011-08-04 06:00:17 UTC (rev 4569) @@ -0,0 +1,67 @@ +/* +Copyright (c) TeraTerm Project. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + 3. The name of the author may not be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. +*/ + +#ifndef __TTSSH_DNS_H +#define __TTSSH_DNS_H + +#include + +#define DNS_TYPE_SSHFP 44 + +enum sshfp_types { + SSHFP_KEY_RESERVED, + SSHFP_KEY_RSA, + SSHFP_KEY_DSA, + SSHFP_KEY_ECDSA +}; + +enum sshfp_hashes { + SSHFP_HASH_RESERVED, + SSHFP_HASH_SHA1, + SSHFP_HASH_SHA256 +}; + +enum verifydns_result { + DNS_VERIFY_NONE, + DNS_VERIFY_NOTFOUND, + DNS_VERIFY_MATCH, + DNS_VERIFY_MISMATCH, + DNS_VERIFY_DIFFERENTTYPE, + DNS_VERIFY_AUTH_MATCH, + DNS_VERIFY_AUTH_MISMATCH, + DNS_VERIFY_AUTH_DIFFERENTTYPE +}; + +typedef struct { + BYTE Algorithm; + BYTE DigestType; + BYTE Digest[1]; +} DNS_SSHFP_DATA, *PDNS_SSHFP_DATA; + +int is_numeric_hostname(const char *hostname); +int verify_hostkey_dns(char FAR *hostname, Key *key); + +#endif // __TTSSH_DNS_H Modified: trunk/ttssh2/ttxssh/hosts.c =================================================================== --- trunk/ttssh2/ttxssh/hosts.c 2011-08-03 14:42:03 UTC (rev 4568) +++ trunk/ttssh2/ttxssh/hosts.c 2011-08-04 06:00:17 UTC (rev 4569) @@ -38,6 +38,7 @@ #include "ssh.h" #include "key.h" #include "hosts.h" +#include "dns.h" #include #include @@ -51,25 +52,7 @@ #include #include -#include -#define DNS_TYPE_SSHFP 44 -typedef struct { - BYTE Algorithm; - BYTE DigestType; - BYTE Digest[1]; -} DNS_SSHFP_DATA, *PDNS_SSHFP_DATA; -enum verifydns_result { - DNS_VERIFY_NONE, - DNS_VERIFY_NOTFOUND, - DNS_VERIFY_MATCH, - DNS_VERIFY_MISMATCH, - DNS_VERIFY_DIFFERENTTYPE, - DNS_VERIFY_AUTH_MATCH, - DNS_VERIFY_AUTH_MISMATCH, - DNS_VERIFY_AUTH_DIFFERENTTYPE -}; - static HFONT DlgHostsAddFont; static HFONT DlgHostsReplaceFont; @@ -1755,90 +1738,6 @@ } } -int is_numeric_hostname(const char *hostname) -{ - struct addrinfo hints, *ai; - - if (hostname == NULL) { - return -1; - } - - memset(&hints, 0, sizeof(hints)); - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = AI_NUMERICHOST; - - if (getaddrinfo(hostname, NULL, &hints, &ai) == 0) { - freeaddrinfo(ai); - return 1; - } - - return 0; -} - -int verify_hostkey_dns(char FAR *hostname, Key *key) -{ - DNS_STATUS status; - PDNS_RECORD rec, p; - PDNS_SSHFP_DATA t; - int hostkey_alg, hostkey_dtype, hostkey_dlen; - BYTE *hostkey_digest; - int found = DNS_VERIFY_NOTFOUND; - - switch (key->type) { - case KEY_RSA: - hostkey_alg = SSHFP_KEY_RSA; - hostkey_dtype = SSHFP_HASH_SHA1; - break; - case KEY_DSA: - hostkey_alg = SSHFP_KEY_DSA; - hostkey_dtype = SSHFP_HASH_SHA1; - break; - case KEY_ECDSA256: - case KEY_ECDSA384: - case KEY_ECDSA521: - hostkey_alg = SSHFP_KEY_ECDSA; - hostkey_dtype = SSHFP_HASH_SHA256; - break; - default: // Un-supported algorithm - hostkey_alg = SSHFP_KEY_RESERVED; - hostkey_dtype = SSHFP_HASH_RESERVED; - } - - if (hostkey_alg) { - hostkey_digest = key_fingerprint_raw(key, hostkey_dtype, &hostkey_dlen); - } - else { - hostkey_digest = NULL; - } - - status = DnsQuery(hostname, DNS_TYPE_SSHFP, DNS_QUERY_STANDARD, NULL, &rec, NULL); - - if (status == 0) { - for (p=rec; p!=NULL; p=p->pNext) { - if (p->wType == DNS_TYPE_SSHFP) { - t = (PDNS_SSHFP_DATA)&(p->Data.Null); - if (t->Algorithm == hostkey_alg && t->DigestType == hostkey_dtype) { - if (hostkey_dlen == p->wDataLength-2 && memcmp(hostkey_digest, t->Digest, hostkey_dlen) == 0) { - found = DNS_VERIFY_MATCH; - break; - } - else { - found = DNS_VERIFY_MISMATCH; - break; - } - } - else { - found = DNS_VERIFY_DIFFERENTTYPE; - } - } - } - } - - free(hostkey_digest); - DnsRecordListFree(rec, DnsFreeRecordList); - return found; -} - // // ???????????????????????????? // Modified: trunk/ttssh2/ttxssh/ssh.h =================================================================== --- trunk/ttssh2/ttxssh/ssh.h 2011-08-03 14:42:03 UTC (rev 4568) +++ trunk/ttssh2/ttxssh/ssh.h 2011-08-04 06:00:17 UTC (rev 4569) @@ -479,19 +479,6 @@ SSH_FP_SHA256 }; -enum sshfp_types { - SSHFP_KEY_RESERVED, - SSHFP_KEY_RSA, - SSHFP_KEY_DSA, - SSHFP_KEY_ECDSA -}; - -enum sshfp_hashes { - SSHFP_HASH_RESERVED, - SSHFP_HASH_SHA1, - SSHFP_HASH_SHA256 -}; - enum scp_dir { TOREMOTE, FROMREMOTE, }; Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.vcproj 2011-08-03 14:42:03 UTC (rev 4568) +++ trunk/ttssh2/ttxssh/ttxssh.vcproj 2011-08-04 06:00:17 UTC (rev 4569) @@ -245,6 +245,14 @@ > + + + + From svnnotify ＠ sourceforge.jp Thu Aug 4 15:40:46 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 04 Aug 2011 15:40:46 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzBdICBXaWRub3dzIDIwMDAg5pyq5rqA?= =?utf-8?b?44Gu5aC05ZCI44Gr44GvIFNTSEZQIOOCkuimi+OBq+ihjOOBi+OBquOBhA==?= =?utf-8?b?44KI44GG44Gr44GX44Gf?= Message-ID: <1312440046.974946.5818.nullmailer@users.sourceforge.jp> Revision: 4570 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4570 Author: maya Date: 2011-08-04 15:40:46 +0900 (Thu, 04 Aug 2011) Log Message: ----------- Widnows 2000 ???????????SSHFP ?????????????????? Modified Paths: -------------- trunk/ttssh2/ttxssh/dns.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/dns.c =================================================================== --- trunk/ttssh2/ttxssh/dns.c 2011-08-04 06:00:17 UTC (rev 4569) +++ trunk/ttssh2/ttxssh/dns.c 2011-08-04 06:40:46 UTC (rev 4570) @@ -59,7 +59,15 @@ int hostkey_alg, hostkey_dtype, hostkey_dlen; BYTE *hostkey_digest; int found = DNS_VERIFY_NOTFOUND; + OSVERSIONINFO osvi; + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + if (osvi.dwMajorVersion < 5) { + // DnsQuery ? Windows 2000 ????????????+ return DNS_VERIFY_NONE; + } + switch (key->type) { case KEY_RSA: hostkey_alg = SSHFP_KEY_RSA; From svnnotify ＠ sourceforge.jp Thu Aug 4 15:43:47 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 04 Aug 2011 15:43:47 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzFdICBWaXN0YSDmnKrmuoDjga7loLQ=?= =?utf-8?b?5ZCI44Gr44Gv44CB5LuK44G+44Gn6YCa44KK44Gu6Kqt44G/6L6844G/44KS?= =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf?= Message-ID: <1312440227.038391.8648.nullmailer@users.sourceforge.jp> Revision: 4571 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4571 Author: maya Date: 2011-08-04 15:43:46 +0900 (Thu, 04 Aug 2011) Log Message: ----------- Vista ????????????篁???ч????茯??莨若????????????? Modified Paths: -------------- trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-04 06:40:46 UTC (rev 4570) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-04 06:43:46 UTC (rev 4571) @@ -15,7 +15,7 @@ #include "vtdisp.h" #include -#include +#include #define CurWidth 2 @@ -641,8 +641,9 @@ // ??? .bmp ???????????????????B // (2011.8.3 yutaka) // cf. http://www.geocities.jp/ccfjd821/purogu/wpe-ji9.html +// ????? Windows 2000 ??????????????? static HBITMAP GetBitmapHandle(char *File) -{ +{ OLE_HANDLE hOle = 0; IStream *iStream=NULL; IPicture *iPicture; @@ -683,18 +684,32 @@ { HBITMAP hbm; WallpaperInfo wi; + OSVERSIONINFO osvi; BGGetWallpaperInfo(&wi); //??????? //LR_CREATEDIBSECTION ????????? - if (wi.pattern == BG_STRETCH) { - hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); - // TODO: ?????????????????????????? - } else { - //hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); - hbm = GetBitmapHandle(wi.filename); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); + if (osvi.dwMajorVersion < 6) { + if (wi.pattern == BG_STRETCH) { + hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); + } + else { + hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); + } } + else { + if (wi.pattern == BG_STRETCH) { + hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); + // TODO: ?????????????????????????? + } + else { + //hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); + hbm = GetBitmapHandle(wi.filename); + } + } //??DC??? if(hbm) From svnnotify ＠ sourceforge.jp Thu Aug 4 19:59:58 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 04 Aug 2011 19:59:58 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4572=5D_RSA/_DSA_=E3=81=A7_SHA-256_?= =?utf-8?b?44GqIFNTSEZQIFJSIOOBq+WvvuW/nA==?= Message-ID: <1312455598.654326.26750.nullmailer@users.sourceforge.jp> Revision: 4572 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4572 Author: doda Date: 2011-08-04 19:59:57 +0900 (Thu, 04 Aug 2011) Log Message: ----------- RSA/DSA で SHA-256 な SSHFP RR に対応 Modified Paths: -------------- trunk/ttssh2/ttxssh/dns.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/dns.c =================================================================== --- trunk/ttssh2/ttxssh/dns.c 2011-08-04 06:43:46 UTC (rev 4571) +++ trunk/ttssh2/ttxssh/dns.c 2011-08-04 10:59:57 UTC (rev 4572) @@ -56,8 +56,8 @@ DNS_STATUS status; PDNS_RECORD rec, p; PDNS_SSHFP_DATA t; - int hostkey_alg, hostkey_dtype, hostkey_dlen; - BYTE *hostkey_digest; + int hostkey_alg, hostkey_dtype, hostkey_dlen, fp_type; + BYTE *hostkey_digest = NULL; int found = DNS_VERIFY_NOTFOUND; OSVERSIONINFO osvi; @@ -71,37 +71,52 @@ switch (key->type) { case KEY_RSA: hostkey_alg = SSHFP_KEY_RSA; - hostkey_dtype = SSHFP_HASH_SHA1; break; case KEY_DSA: hostkey_alg = SSHFP_KEY_DSA; - hostkey_dtype = SSHFP_HASH_SHA1; break; case KEY_ECDSA256: case KEY_ECDSA384: case KEY_ECDSA521: hostkey_alg = SSHFP_KEY_ECDSA; - hostkey_dtype = SSHFP_HASH_SHA256; break; default: // Un-supported algorithm hostkey_alg = SSHFP_KEY_RESERVED; - hostkey_dtype = SSHFP_HASH_RESERVED; } - if (hostkey_alg) { - hostkey_digest = key_fingerprint_raw(key, hostkey_dtype, &hostkey_dlen); - } - else { - hostkey_digest = NULL; - } - status = DnsQuery(hostname, DNS_TYPE_SSHFP, DNS_QUERY_STANDARD, NULL, &rec, NULL); if (status == 0) { for (p=rec; p!=NULL; p=p->pNext) { if (p->wType == DNS_TYPE_SSHFP) { t = (PDNS_SSHFP_DATA)&(p->Data.Null); - if (t->Algorithm == hostkey_alg && t->DigestType == hostkey_dtype) { + if (t->Algorithm == SSHFP_KEY_RESERVED) + continue; // skip invalid record + if (t->Algorithm == hostkey_alg) { + if (hostkey_digest == NULL || t->DigestType != hostkey_dtype) { + switch (t->DigestType) { + case SSHFP_HASH_SHA1: + if (hostkey_alg != SSHFP_KEY_RSA && hostkey_alg != SSHFP_KEY_DSA) + fp_type = -1; // SHA1 does not allowed to use with ECDSA key + else + fp_type = SSH_FP_SHA1; + break; + case SSHFP_HASH_SHA256: + fp_type = SSH_FP_SHA256; + break; + default: + fp_type = -1; + } + + if (fp_type == -1) + continue; // skip invalid/un-supported hash type. + + hostkey_dtype = t->DigestType; + free(hostkey_digest); + hostkey_digest = key_fingerprint_raw(key, fp_type, &hostkey_dlen); + if (!hostkey_digest) + continue; + } if (hostkey_dlen == p->wDataLength-2 && memcmp(hostkey_digest, t->Digest, hostkey_dlen) == 0) { found = DNS_VERIFY_MATCH; break; From svnnotify ＠ sourceforge.jp Thu Aug 4 20:27:56 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Thu, 04 Aug 2011 20:27:56 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzNdIFJTQS8gRFNBIOmNteOBpyBTSEEt?= =?utf-8?b?MSDjgaggU0hBLTI1NiDjga7kuKHmlrnjga4gU1NIRlAgUlIg44GM44GC44Gj?= =?utf-8?b?44Gf5aC05ZCI44CB5Lih5pa544Go5q+U6LyD44GZ44KL44KI44GG44Gr44GX?= =?utf-8?b?44Gf44CC?= Message-ID: <1312457276.826771.923.nullmailer@users.sourceforge.jp> Revision: 4573 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4573 Author: doda Date: 2011-08-04 20:27:56 +0900 (Thu, 04 Aug 2011) Log Message: ----------- RSA/DSA 鍵で SHA-1 と SHA-256 の両方の SSHFP RR があった場合、両方と比較するようにした。 片方でも一致しなかった場合は、不一致とする。 # ECDSA 鍵では SJA-1 の SSHFP RR は無視する Modified Paths: -------------- trunk/ttssh2/ttxssh/dns.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/dns.c =================================================================== --- trunk/ttssh2/ttxssh/dns.c 2011-08-04 10:59:57 UTC (rev 4572) +++ trunk/ttssh2/ttxssh/dns.c 2011-08-04 11:27:56 UTC (rev 4573) @@ -119,7 +119,6 @@ } if (hostkey_dlen == p->wDataLength-2 && memcmp(hostkey_digest, t->Digest, hostkey_dlen) == 0) { found = DNS_VERIFY_MATCH; - break; } else { found = DNS_VERIFY_MISMATCH; @@ -127,7 +126,8 @@ } } else { - found = DNS_VERIFY_DIFFERENTTYPE; + if (found == DNS_VERIFY_NOTFOUND) + found = DNS_VERIFY_DIFFERENTTYPE; } } } From svnnotify ＠ sourceforge.jp Fri Aug 5 08:14:34 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 05 Aug 2011 08:14:34 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzRdICDjg4fjg5Xjgqnjg6vjg4jjgac=?= =?utf-8?b?44OV44Kp44O844Kr44K544GV44KM44KL44Gu44GMIElEQ19BQk9VVFRFWFQg?= =?utf-8?b?44Gn44Gv44Gq44GPIElET0sg44Gr44Gq44KL44KI44GG44Gr5L+u5q2j?= Message-ID: <1312499674.386790.10839.nullmailer@users.sourceforge.jp> Revision: 4574 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4574 Author: maya Date: 2011-08-05 08:14:33 +0900 (Fri, 05 Aug 2011) Log Message: ----------- デフォルトでフォーカスされるのが IDC_ABOUTTEXT ではなく IDOK になるように修正 Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-04 11:27:56 UTC (rev 4573) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-04 23:14:33 UTC (rev 4574) @@ -57,6 +57,7 @@ CAPTION "About TTSSH" FONT 8, "Tahoma", 0, 0, 0x0 BEGIN + DEFPUSHBUTTON "OK",IDOK,106,263,50,14 LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15 ICON "",IDC_TTSSH_ICON,234,7,21,20 LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11 @@ -68,7 +69,6 @@ LTEXT "THIS EXTENSION INCORPORATES STRONG CRYPTOGRAPHY. POSESSION, USE, AND/OR EXPORT OF THIS EXTENSION MAY BE ILLEGAL IN YOUR COUNTRY.",IDC_CRYPTOGRAPHY,6,116,248,26 LTEXT "This extension uses OpenSSH code by OpenBSD Project. Thanks also to Ian Goldberg for his Pilot SSH code, which was a very handy reference. Special thanks to Takashi Teranishi for his cooperation.",IDC_CREDIT,6,140,248,27 EDITTEXT IDC_ABOUTTEXT,6,171,248,87,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY - DEFPUSHBUTTON "OK",IDOK,106,263,50,14 END IDD_SSHAUTH DIALOGEX 0, 0, 309, 262 From svnnotify ＠ sourceforge.jp Fri Aug 5 08:16:01 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 05 Aug 2011 08:16:01 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzVdICBwb3J0Zm9yd2FyZCDjga7nt6g=?= =?utf-8?b?6ZuG5YaF5a6544Gr5ZWP6aGM44GM44GC44Gj44Gm44OA44Kk44Ki44Ot44Kw?= =?utf-8?b?44KS5oqc44GR44Gq44GE44Go44GN44Gr44KC44OV44Kp44Oz44OI44KS56C0?= =?utf-8?b?5qOE44GX44Gm44GE44Gf44Gu44KS5L+u5q2j?= Message-ID: <1312499761.773071.13470.nullmailer@users.sourceforge.jp> Revision: 4575 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4575 Author: maya Date: 2011-08-05 08:16:01 +0900 (Fri, 05 Aug 2011) Log Message: ----------- portforward の編集内容に問題があってダイアログを抜けないときにもフォントを破棄していたのを修正 Modified Paths: -------------- trunk/ttssh2/ttxssh/fwdui.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/fwdui.c =================================================================== --- trunk/ttssh2/ttxssh/fwdui.c 2011-08-04 23:14:33 UTC (rev 4574) +++ trunk/ttssh2/ttxssh/fwdui.c 2011-08-04 23:16:01 UTC (rev 4575) @@ -1184,6 +1184,7 @@ PTInstVar pvar; LOGFONT logfont; HFONT font; + BOOL result; switch (msg) { case WM_INITDIALOG: @@ -1225,11 +1226,15 @@ switch (LOWORD(wParam)) { case IDOK: - if (DlgFwdEditFont != NULL) { - DeleteObject(DlgFwdEditFont); + result = end_fwd_edit_dlg(closure->pvar, closure->spec, dlg); + + if (result) { + if (DlgFwdEditFont != NULL) { + DeleteObject(DlgFwdEditFont); + } } - return end_fwd_edit_dlg(closure->pvar, closure->spec, dlg); + return result; case IDCANCEL: EndDialog(dlg, 0); From svnnotify ＠ sourceforge.jp Fri Aug 5 08:34:21 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 05 Aug 2011 08:34:21 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzZdICByNDU3NCDjga7jg5Xjgqnjg7w=?= =?utf-8?b?44Kr44K544Gu5aSJ5pu044KS44Kz44O844OJ44Gn6KGM44GG44KI44GG44Gr?= =?utf-8?b?44GX44Gf?= Message-ID: <1312500861.065068.4233.nullmailer@users.sourceforge.jp> Revision: 4576 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4576 Author: maya Date: 2011-08-05 08:34:21 +0900 (Fri, 05 Aug 2011) Log Message: ----------- r4574 のフォーカスの変更をコードで行うようにした Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh.c trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-08-04 23:16:01 UTC (rev 4575) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-08-04 23:34:21 UTC (rev 4576) @@ -2495,7 +2495,8 @@ } init_about_dlg((PTInstVar) lParam, dlg); - return TRUE; + SetFocus(GetDlgItem(dlg, IDOK)); + return FALSE; case WM_COMMAND: switch (LOWORD(wParam)) { case IDOK: Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-04 23:16:01 UTC (rev 4575) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-04 23:34:21 UTC (rev 4576) @@ -57,7 +57,6 @@ CAPTION "About TTSSH" FONT 8, "Tahoma", 0, 0, 0x0 BEGIN - DEFPUSHBUTTON "OK",IDOK,106,263,50,14 LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15 ICON "",IDC_TTSSH_ICON,234,7,21,20 LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11 @@ -69,6 +68,7 @@ LTEXT "THIS EXTENSION INCORPORATES STRONG CRYPTOGRAPHY. POSESSION, USE, AND/OR EXPORT OF THIS EXTENSION MAY BE ILLEGAL IN YOUR COUNTRY.",IDC_CRYPTOGRAPHY,6,116,248,26 LTEXT "This extension uses OpenSSH code by OpenBSD Project. Thanks also to Ian Goldberg for his Pilot SSH code, which was a very handy reference. Special thanks to Takashi Teranishi for his cooperation.",IDC_CREDIT,6,140,248,27 EDITTEXT IDC_ABOUTTEXT,6,171,248,87,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK",IDOK,106,263,50,14 END IDD_SSHAUTH DIALOGEX 0, 0, 309, 262 From svnnotify ＠ sourceforge.jp Fri Aug 5 10:10:12 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 05 Aug 2011 10:10:12 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzddICBtbHRlcm0g44Go6Kit5a6a44KS?= =?utf-8?b?5YWx5pyJ44GZ44KL54K644Gr44CBdGltZW91dGxlbiDjgpLkvb/jgaPjgZ8=?= =?utf-8?b?5pa55rOV44KS6KiY6L+w44CC?= Message-ID: <1312506612.160275.5540.nullmailer@users.sourceforge.jp> Revision: 4577 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4577 Author: doda Date: 2011-08-05 10:10:12 +0900 (Fri, 05 Aug 2011) Log Message: ----------- mlterm ??┃絎???掩?????冴???imeoutlen ??戎?ｃ??号????菴違? Modified Paths: -------------- trunk/doc/en/html/usage/tips/vim.html trunk/doc/ja/html/usage/tips/vim.html -------------- next part -------------- Modified: trunk/doc/en/html/usage/tips/vim.html =================================================================== --- trunk/doc/en/html/usage/tips/vim.html 2011-08-04 23:34:21 UTC (rev 4576) +++ trunk/doc/en/html/usage/tips/vim.html 2011-08-05 01:10:12 UTC (rev 4577) @@ -115,9 +115,16 @@ let &t_SI .= "\e[<r" let &t_EI .= "\e[<s\e[<0t" let &t_te .= "\e[<0t\e[<s" + +set timeoutlen=100

+ NOTICE: You are recommended to configure the Delete wait time after ESC key is pushed in insert mode.

Modified: trunk/doc/ja/html/usage/tips/vim.html =================================================================== --- trunk/doc/ja/html/usage/tips/vim.html 2011-08-04 23:34:21 UTC (rev 4576) +++ trunk/doc/ja/html/usage/tips/vim.html 2011-08-05 01:10:12 UTC (rev 4577) @@ -111,10 +111,14 @@ let &t_SI .= "\e[<r" let &t_EI .= "\e[<s\e[<0t" let &t_te .= "\e[<0t\e[<s" + +set timeoutlen=100

-?: ?????????A"??????? ESC ??????????????"????????????????? +timeoutlen ??????????? ESC ????????ﾀ???????????(IME ??????)?????????????? +????????? ESC ???????? IME ???????????????????? ????????????????????????????????????????????????????????
+?? ESC ????????????????"??????? ESC ??????????????"????????????????

From svnnotify ＠ sourceforge.jp Sat Aug 13 17:26:34 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 13 Aug 2011 17:26:34 +0900 Subject: [Ttssh2-commit] =?utf-8?q?=5B4578=5D_OleLoadPicture=28=29__?= =?utf-8?b?44Gn6Kqt44G/6L6844KT44GgQklUTUFQ44KS44K544OI44Os44OD44OB77yI?= =?utf-8?b?5ouh5aSn44O757iu5bCP77yJ44Gn44GN44KL44KI44GG44Gr44GX44Gf44CC?= Message-ID: <1313223994.802045.3688.nullmailer@users.sourceforge.jp> Revision: 4578 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4578 Author: yutakapon Date: 2011-08-13 17:26:34 +0900 (Sat, 13 Aug 2011) Log Message: ----------- OleLoadPicture() ?ц??粋昭???BITMAP?????????鐚??紊с?膰??鐚?????????????? Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-05 01:10:12 UTC (rev 4577) +++ trunk/doc/en/html/about/history.html 2011-08-13 08:26:34 UTC (rev 4578) @@ -45,6 +45,7 @@
  • added the second argument as the converted string on the strspecial command.
  • added the "expandenv" macro command.
    • +
  • Eterm look-feel: The wallpaper file format can support any format other than BMP on Windows Vista or later.
    • Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-05 01:10:12 UTC (rev 4577) +++ trunk/doc/ja/html/about/history.html 2011-08-13 08:26:34 UTC (rev 4578) @@ -45,6 +45,7 @@
  • ???????? strspecial ???????2????????????????
  • ??????? "expandenv" ??????
    • +
  • Eterm look-feel: Windows Vista??????????BMP?ｮ?????????
    • Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-05 01:10:12 UTC (rev 4577) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-13 08:26:34 UTC (rev 4578) @@ -680,54 +680,171 @@ return (hBitmap); } -void BGPreloadWallpaper(BGSrc *src) +// ????????????????????????????B +// Windows 9x/NT?? +// cf.http://katahiromz.web.fc2.com/win32/bilinear.html +static HBITMAP CreateStretched32BppBitmapBilinear(HBITMAP hbm, INT cxNew, INT cyNew) { - HBITMAP hbm; - WallpaperInfo wi; - OSVERSIONINFO osvi; + INT ix, iy, x0, y0, x1, y1; + DWORD x, y; + BITMAP bm; + HBITMAP hbmNew; + HDC hdc; + BITMAPINFO bi; + BYTE *pbNewBits, *pbBits, *pbNewLine, *pbLine0, *pbLine1; + DWORD wfactor, hfactor; + DWORD ex0, ey0, ex1, ey1; + DWORD r0, g0, b0, a0, r1, g1, b1, a1; + DWORD c00, c01, c10, c11; + LONG nWidthBytes, nWidthBytesNew; + BOOL fAlpha; - BGGetWallpaperInfo(&wi); + if (GetObject(hbm, sizeof(BITMAP), &bm) == 0) + return NULL; - //??????? - //LR_CREATEDIBSECTION ????????? - osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx(&osvi); - if (osvi.dwMajorVersion < 6) { - if (wi.pattern == BG_STRETCH) { - hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); + hbmNew = NULL; + hdc = CreateCompatibleDC(NULL); + if (hdc != NULL) + { + nWidthBytes = bm.bmWidth * 4; + ZeroMemory(&bi, sizeof(BITMAPINFOHEADER)); + bi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bi.bmiHeader.biWidth = bm.bmWidth; + bi.bmiHeader.biHeight = bm.bmHeight; + bi.bmiHeader.biPlanes = 1; + bi.bmiHeader.biBitCount = 32; + fAlpha = (bm.bmBitsPixel == 32); + pbBits = (BYTE *)HeapAlloc(GetProcessHeap(), 0, + nWidthBytes * bm.bmHeight); + if (pbBits == NULL) + return NULL; + GetDIBits(hdc, hbm, 0, bm.bmHeight, pbBits, &bi, DIB_RGB_COLORS); + bi.bmiHeader.biWidth = cxNew; + bi.bmiHeader.biHeight = cyNew; + hbmNew = CreateDIBSection(hdc, &bi, DIB_RGB_COLORS, + (VOID **)&pbNewBits, NULL, 0); + if (hbmNew != NULL) + { + nWidthBytesNew = cxNew * 4; + wfactor = (bm.bmWidth << 8) / cxNew; + hfactor = (bm.bmHeight << 8) / cyNew; + if (!fAlpha) + a0 = 255; + for(iy = 0; iy < cyNew; iy++) + { + y = hfactor * iy; + y0 = y >> 8; + y1 = min(y0 + 1, (INT)bm.bmHeight - 1); + ey1 = y & 0xFF; + ey0 = 0x100 - ey1; + pbNewLine = pbNewBits + iy * nWidthBytesNew; + pbLine0 = pbBits + y0 * nWidthBytes; + pbLine1 = pbBits + y1 * nWidthBytes; + for(ix = 0; ix < cxNew; ix++) + { + x = wfactor * ix; + x0 = x >> 8; + x1 = min(x0 + 1, (INT)bm.bmWidth - 1); + ex1 = x & 0xFF; + ex0 = 0x100 - ex1; + c00 = ((LPDWORD)pbLine0)[x0]; + c01 = ((LPDWORD)pbLine1)[x0]; + c10 = ((LPDWORD)pbLine0)[x1]; + c11 = ((LPDWORD)pbLine1)[x1]; + + b0 = ((ex0 * (c00 & 0xFF)) + + (ex1 * (c10 & 0xFF))) >> 8; + b1 = ((ex0 * (c01 & 0xFF)) + + (ex1 * (c11 & 0xFF))) >> 8; + g0 = ((ex0 * ((c00 >> 8) & 0xFF)) + + (ex1 * ((c10 >> 8) & 0xFF))) >> 8; + g1 = ((ex0 * ((c01 >> 8) & 0xFF)) + + (ex1 * ((c11 >> 8) & 0xFF))) >> 8; + r0 = ((ex0 * ((c00 >> 16) & 0xFF)) + + (ex1 * ((c10 >> 16) & 0xFF))) >> 8; + r1 = ((ex0 * ((c01 >> 16) & 0xFF)) + + (ex1 * ((c11 >> 16) & 0xFF))) >> 8; + b0 = (ey0 * b0 + ey1 * b1) >> 8; + g0 = (ey0 * g0 + ey1 * g1) >> 8; + r0 = (ey0 * r0 + ey1 * r1) >> 8; + + if (fAlpha) + { + a0 = ((ex0 * ((c00 >> 24) & 0xFF)) + + (ex1 * ((c10 >> 24) & 0xFF))) >> 8; + a1 = ((ex0 * ((c01 >> 24) & 0xFF)) + + (ex1 * ((c11 >> 24) & 0xFF))) >> 8; + a0 = (ey0 * a0 + ey1 * a1) >> 8; + } + ((LPDWORD)pbNewLine)[ix] = + MAKELONG(MAKEWORD(b0, g0), MAKEWORD(r0, a0)); + } + } + } + HeapFree(GetProcessHeap(), 0, pbBits); + DeleteDC(hdc); } - else { - hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); - } - } - else { - if (wi.pattern == BG_STRETCH) { - hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); - // TODO: ?????????????????????????? - } - else { - //hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); - hbm = GetBitmapHandle(wi.filename); - } - } + return hbmNew; +} - //??DC??? - if(hbm) - { - BITMAP bm; +void BGPreloadWallpaper(BGSrc *src) +{ +//#define DEBUG_XP + HBITMAP hbm; + WallpaperInfo wi; + OSVERSIONINFO osvi; - GetObject(hbm,sizeof(bm),&bm); + BGGetWallpaperInfo(&wi); - src->hdc = CreateBitmapDC(hbm); - src->width = bm.bmWidth; - src->height = bm.bmHeight; - src->pattern = wi.pattern; +#ifdef DEBUG_XP + strcpy(wi.filename, "c:\\usr\\ttssh2\\1011_01.jpg"); +#endif - }else{ - src->hdc = NULL; - } + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&osvi); +#ifdef DEBUG_XP + osvi.dwMajorVersion = 7; +#endif + if (osvi.dwMajorVersion < 6) { + //??????? + //LR_CREATEDIBSECTION ????????? + if (wi.pattern == BG_STRETCH) { + hbm = LoadImage(0,wi.filename,IMAGE_BITMAP,CRTWidth,CRTHeight,LR_LOADFROMFILE | LR_CREATEDIBSECTION); + } + else { + hbm = LoadImage(0,wi.filename,IMAGE_BITMAP, 0, 0,LR_LOADFROMFILE); + } + } + else { + hbm = GetBitmapHandle(wi.filename); - src->color = GetSysColor(COLOR_DESKTOP); +#ifdef DEBUG_XP + wi.pattern = BG_STRETCH; +#endif + if (wi.pattern == BG_STRETCH) { + HBITMAP newhbm = CreateStretched32BppBitmapBilinear(hbm, CRTWidth, CRTHeight); + DeleteObject(hbm); + hbm = newhbm; + } + } + + //??DC??? + if(hbm) + { + BITMAP bm; + + GetObject(hbm,sizeof(bm),&bm); + + src->hdc = CreateBitmapDC(hbm); + src->width = bm.bmWidth; + src->height = bm.bmHeight; + src->pattern = wi.pattern; + + }else{ + src->hdc = NULL; + } + + src->color = GetSysColor(COLOR_DESKTOP); } void BGPreloadSrc(BGSrc *src) From svnnotify ＠ sourceforge.jp Sat Aug 13 18:11:06 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 13 Aug 2011 18:11:06 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1NzldICBXaW5kb3dzNyDjga7mlrDjgZc=?= =?utf-8?b?44GE5aOB57SZ6Kit5a6a44Gr5a++5b+c44GX44Gf44CC?= Message-ID: <1313226666.434775.26014.nullmailer@users.sourceforge.jp> Revision: 4579 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4579 Author: yutakapon Date: 2011-08-13 18:11:06 +0900 (Sat, 13 Aug 2011) Log Message: ----------- Windows7 ??????紕??荐?????綽????? WallpaperStyle ??? Fill 10 蕭?????????宴??????綏?劻?????水??? Fit 6 綛??????ｃ???????(筝??????水??? Modified Paths: -------------- trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-13 08:26:34 UTC (rev 4578) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-13 09:11:06 UTC (rev 4579) @@ -632,6 +632,12 @@ else if(wi->pattern == 2) wi->pattern = BG_STRETCH; + else + if(wi->pattern == 10) + wi->pattern = BG_FIT_HEIGHT; + else + if(wi->pattern == 6) + wi->pattern = BG_FIT_WIDTH; //???????????? RegCloseKey(hKey); @@ -793,6 +799,7 @@ HBITMAP hbm; WallpaperInfo wi; OSVERSIONINFO osvi; + int s_width, s_height; BGGetWallpaperInfo(&wi); @@ -816,15 +823,41 @@ } } else { + BITMAP bm; + float ratio; + hbm = GetBitmapHandle(wi.filename); #ifdef DEBUG_XP - wi.pattern = BG_STRETCH; + //wi.pattern = BG_STRETCH; + //wi.pattern = BG_FIT_WIDTH; + //wi.pattern = BG_FIT_HEIGHT; #endif + + GetObject(hbm,sizeof(bm),&bm); + // ??????????????????????????? if (wi.pattern == BG_STRETCH) { - HBITMAP newhbm = CreateStretched32BppBitmapBilinear(hbm, CRTWidth, CRTHeight); + s_width = CRTWidth; + s_height = CRTHeight; + } else if (wi.pattern == BG_FIT_WIDTH) { + ratio = (float)CRTWidth / bm.bmWidth; + s_width = CRTWidth; + s_height = (int)(CRTHeight * ratio); + } else if (wi.pattern == BG_FIT_HEIGHT) { + ratio = (float)CRTHeight / bm.bmHeight; + s_width = (int)(CRTWidth * ratio); + s_height = CRTHeight; + } else { + s_width = 0; + s_height = 0; + } + + if (s_width && s_height) { + HBITMAP newhbm = CreateStretched32BppBitmapBilinear(hbm, s_width, s_height); DeleteObject(hbm); hbm = newhbm; + + wi.pattern = BG_STRETCH; } } From svnnotify ＠ sourceforge.jp Sat Aug 13 21:46:53 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 13 Aug 2011 21:46:53 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODBdICDlgI3njofjga7oqIjnrpfjgpI=?= =?utf-8?b?5L+u5q2j?= Message-ID: <1313239613.501354.4498.nullmailer@users.sourceforge.jp> Revision: 4580 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4580 Author: maya Date: 2011-08-13 21:46:53 +0900 (Sat, 13 Aug 2011) Log Message: ----------- 倍率の計算を修正 Modified Paths: -------------- trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-13 09:11:06 UTC (rev 4579) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-13 12:46:53 UTC (rev 4580) @@ -842,10 +842,10 @@ } else if (wi.pattern == BG_FIT_WIDTH) { ratio = (float)CRTWidth / bm.bmWidth; s_width = CRTWidth; - s_height = (int)(CRTHeight * ratio); + s_height = (int)(bm.bmHeight * ratio); } else if (wi.pattern == BG_FIT_HEIGHT) { ratio = (float)CRTHeight / bm.bmHeight; - s_width = (int)(CRTWidth * ratio); + s_width = (int)(bm.bmWidth * ratio); s_height = CRTHeight; } else { s_width = 0; From svnnotify ＠ sourceforge.jp Sat Aug 13 22:15:24 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 13 Aug 2011 22:15:24 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODFdICDoqK3lrprlgKTjga7oqo3orZg=?= =?utf-8?b?44GM6ZaT6YGV44Gj44Gm44GE44Gf44Gu44Gn5L+u5q2j?= Message-ID: <1313241324.314751.7319.nullmailer@users.sourceforge.jp> Revision: 4581 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4581 Author: maya Date: 2011-08-13 22:15:23 +0900 (Sat, 13 Aug 2011) Log Message: ----------- 荐???ゃ?茯???????????????т信罩? Modified Paths: -------------- trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-13 12:46:53 UTC (rev 4580) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-13 13:15:23 UTC (rev 4581) @@ -80,7 +80,7 @@ #define BG_SECTION "BG" typedef enum _BG_TYPE {BG_COLOR = 0,BG_PICTURE,BG_WALLPAPER} BG_TYPE; -typedef enum _BG_PATTERN {BG_STRETCH = 0,BG_TILE,BG_CENTER,BG_FIT_WIDTH,BG_FIT_HEIGHT,BG_AUTOFIT} BG_PATTERN; +typedef enum _BG_PATTERN {BG_STRETCH = 0,BG_TILE,BG_CENTER,BG_FIT_WIDTH,BG_FIT_HEIGHT,BG_AUTOFIT,BG_AUTOFILL} BG_PATTERN; typedef struct _BGSrc { @@ -627,17 +627,19 @@ if(tile) wi->pattern = BG_TILE; else - if(wi->pattern == 0) + if(wi->pattern == 0) // Center(????ｦ) wi->pattern = BG_CENTER; else - if(wi->pattern == 2) + if(wi->pattern == 2) // Stretch(????????? ???????????? wi->pattern = BG_STRETCH; else - if(wi->pattern == 10) - wi->pattern = BG_FIT_HEIGHT; + if(wi->pattern == 10) // Fill(??????????) ???????????? + // ?????????????????????\ｦ?? + wi->pattern = BG_AUTOFILL; else - if(wi->pattern == 6) - wi->pattern = BG_FIT_WIDTH; + if(wi->pattern == 6) // Fit(?????????? ???????????? + // ???????????????????????\ｦ?? + wi->pattern = BG_AUTOFIT; //???????????? RegCloseKey(hKey); @@ -839,14 +841,34 @@ if (wi.pattern == BG_STRETCH) { s_width = CRTWidth; s_height = CRTHeight; - } else if (wi.pattern == BG_FIT_WIDTH) { - ratio = (float)CRTWidth / bm.bmWidth; - s_width = CRTWidth; - s_height = (int)(bm.bmHeight * ratio); - } else if (wi.pattern == BG_FIT_HEIGHT) { - ratio = (float)CRTHeight / bm.bmHeight; - s_width = (int)(bm.bmWidth * ratio); - s_height = CRTHeight; + } else if (wi.pattern == BG_AUTOFILL || wi.pattern == BG_AUTOFIT) { + if (wi.pattern == BG_AUTOFILL) { + if ((bm.bmHeight * CRTWidth) < (bm.bmWidth * CRTHeight)) { + wi.pattern = BG_FIT_HEIGHT; + } + else { + wi.pattern = BG_FIT_WIDTH; + } + } + if (wi.pattern == BG_AUTOFIT) { + if ((bm.bmHeight * CRTWidth) < (bm.bmWidth * CRTHeight)) { + wi.pattern = BG_FIT_WIDTH; + } + else { + wi.pattern = BG_FIT_HEIGHT; + } + } + if (wi.pattern == BG_FIT_WIDTH) { + ratio = (float)CRTWidth / bm.bmWidth; + s_width = CRTWidth; + s_height = (int)(bm.bmHeight * ratio); + } + else { + ratio = (float)CRTHeight / bm.bmHeight; + s_width = (int)(bm.bmWidth * ratio); + s_height = CRTHeight; + } + } else { s_width = 0; s_height = 0; From svnnotify ＠ sourceforge.jp Sat Aug 13 22:23:30 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 13 Aug 2011 22:23:30 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODJdICDlo4HntJnjg5XjgqHjgqTjg6s=?= =?utf-8?b?44KS6ZaL44GR44Gq44GE44Go44GN44Gr6JC944Gh44KL5ZWP6aGM44KS5L+u?= =?utf-8?b?5q2j?= Message-ID: <1313241810.370249.18054.nullmailer@users.sourceforge.jp> Revision: 4582 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4582 Author: maya Date: 2011-08-13 22:23:30 +0900 (Sat, 13 Aug 2011) Log Message: ----------- 紕??????ゃ??????????????純????蕁??篆?? Modified Paths: -------------- trunk/teraterm/teraterm/vtdisp.c -------------- next part -------------- Modified: trunk/teraterm/teraterm/vtdisp.c =================================================================== --- trunk/teraterm/teraterm/vtdisp.c 2011-08-13 13:15:23 UTC (rev 4581) +++ trunk/teraterm/teraterm/vtdisp.c 2011-08-13 13:23:30 UTC (rev 4582) @@ -663,6 +663,9 @@ HBITMAP hBitmap = NULL; hFile=CreateFile(File,GENERIC_READ,0,NULL,OPEN_EXISTING,0,NULL); + if (hFile == INVALID_HANDLE_VALUE) { + return (hBitmap); + } nFileSize=GetFileSize(hFile,NULL); hMem=GlobalAlloc(GMEM_MOVEABLE,nFileSize); pvData=GlobalLock(hMem); @@ -829,6 +832,9 @@ float ratio; hbm = GetBitmapHandle(wi.filename); + if (hbm == NULL) { + goto createdc; + } #ifdef DEBUG_XP //wi.pattern = BG_STRETCH; @@ -884,6 +890,7 @@ } //??DC??? +createdc: if(hbm) { BITMAP bm; From svnnotify ＠ sourceforge.jp Tue Aug 16 21:47:01 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 16 Aug 2011 21:47:01 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODNdICDmm7TmlrDlsaXmrbTjgpLov70=?= =?utf-8?b?5Yqg?= Message-ID: <1313498821.304249.32239.nullmailer@users.sourceforge.jp> Revision: 4583 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4583 Author: maya Date: 2011-08-16 21:47:00 +0900 (Tue, 16 Aug 2011) Log Message: ----------- ?贋?絮ユ???申?? r4550,r4551 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-13 13:23:30 UTC (rev 4582) +++ trunk/doc/en/html/about/history.html 2011-08-16 12:47:00 UTC (rev 4583) @@ -36,6 +36,7 @@
  • Changes
      +
    • Eterm look-feel: The wallpaper file format can support any format other than BMP on Windows Vista or later.
    • "getpassword" macro command is updated.
      • The result of the command execution is stored in the system variable "result".
        • @@ -45,7 +46,6 @@
      • added the second argument as the converted string on the strspecial command.
    • added the "expandenv" macro command.
      • -
    • Eterm look-feel: The wallpaper file format can support any format other than BMP on Windows Vista or later.
    • @@ -1720,6 +1720,8 @@
  • Changes
    • added the PuTTY version on the version dialog.
      • + +
    • Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-13 13:23:30 UTC (rev 4582) +++ trunk/doc/ja/html/about/history.html 2011-08-16 12:47:00 UTC (rev 4583) @@ -36,6 +36,7 @@
  • ??
    • OSC ????????????????????????????????ﾟ??????????
      • +
    • Eterm look-feel: Windows Vista??????????BMP?ｮ?????????
    • ??????? "getpassword"????????????
      • ?????ﾀ????"result"?????????????????
        • @@ -45,7 +46,6 @@
      • ???????? strspecial ???????2????????????????
    • ??????? "expandenv" ??????
      • -
    • Eterm look-feel: Windows Vista??????????BMP?ｮ?????????
    • @@ -1721,6 +1721,8 @@
  • ??
    • ????????????PuTTY?????????????????
      • +
    • ?????????????????????????????B
      • +
    • ??????????????????????????????
    • From svnnotify ＠ sourceforge.jp Sat Aug 20 11:08:56 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 11:08:56 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODRdICBJUHY0IOODleOCqeODvOODqw==?= =?utf-8?b?44OQ44OD44Kv5pmC44Gr44CBVGVyYSBUZXJtIOOBi+OCiea4oeOBleOCjA==?= =?utf-8?b?44Gm44GE44GfIFNPQ0tFVCDjgYzmm7TmlrDjgZXjgozjgZrjgasgU1NIIA==?= =?utf-8?b?5o6l57aa44GM54Sh5Yq544Gr44Gq44KL44GT44Go44GM44GC44KL5ZWP6aGM?= =?utf-8?b?44KS5L+u5q2j?= Message-ID: <1313806136.691001.22291.nullmailer@users.sourceforge.jp> Revision: 4584 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4584 Author: maya Date: 2011-08-20 11:08:56 +0900 (Sat, 20 Aug 2011) Log Message: ----------- IPv4 フォールバック時に、Tera Term から渡されていた SOCKET が更新されずに SSH 接続が無効になることがある問題を修正 Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-08-16 12:47:00 UTC (rev 4583) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-08-20 02:08:56 UTC (rev 4584) @@ -669,7 +669,7 @@ int namelen) { #ifndef NO_INET6 - if (pvar->socket == INVALID_SOCKET) { + if (pvar->socket == INVALID_SOCKET || pvar->socket != s) { struct sockaddr_storage ss; int len; From svnnotify ＠ sourceforge.jp Sat Aug 20 11:10:36 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 11:10:36 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODVdICDmm7TmlrDlsaXmrbTjgpLov70=?= =?utf-8?b?5Yqg?= Message-ID: <1313806236.663835.24918.nullmailer@users.sourceforge.jp> Revision: 4585 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4585 Author: maya Date: 2011-08-20 11:10:36 +0900 (Sat, 20 Aug 2011) Log Message: ----------- ?贋?絮ユ???申?? r4584 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-20 02:08:56 UTC (rev 4584) +++ trunk/doc/en/html/about/history.html 2011-08-20 02:10:36 UTC (rev 4585) @@ -1727,6 +1727,7 @@ Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-20 02:08:56 UTC (rev 4584) +++ trunk/doc/ja/html/about/history.html 2011-08-20 02:10:36 UTC (rev 4585) @@ -1728,6 +1728,7 @@
  • ????
      +
    • IPv4 ???????????? SSH ????????????????????B
    • ?????????????????????????(?????)????????????B
    • From svnnotify ＠ sourceforge.jp Sat Aug 20 11:11:22 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 11:11:22 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODZdICDjgrPjg6Hjg7Pjg4jjgpLkv64=?= =?utf-8?b?5q2j?= Message-ID: <1313806282.686278.25111.nullmailer@users.sourceforge.jp> Revision: 4586 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4586 Author: maya Date: 2011-08-20 11:11:22 +0900 (Sat, 20 Aug 2011) Log Message: ----------- コメントを修正 Modified Paths: -------------- trunk/ttssh2/ttxssh/ttxssh.c -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-08-20 02:10:36 UTC (rev 4585) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-08-20 02:11:22 UTC (rev 4586) @@ -698,7 +698,7 @@ htons(find_local_port(pvar)); break; default: - /* NOT REACHED */ + /* UNSPEC */ break; } From svnnotify ＠ sourceforge.jp Sat Aug 20 13:17:03 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 13:17:03 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODddICDjgajjgorjgYLjgYjjgZrnj74=?= =?utf-8?b?54q244GuIFNTSEZQIOiLseiqnuODoeODg+OCu+ODvOOCuOOCkuOCs+ODnw==?= =?utf-8?b?44OD44OI?= Message-ID: <1313813823.638547.28934.nullmailer@users.sourceforge.jp> Revision: 4587 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4587 Author: maya Date: 2011-08-20 13:17:03 +0900 (Sat, 20 Aug 2011) Log Message: ----------- とりあえず現状の SSHFP 英語メッセージをコミット Modified Paths: -------------- trunk/installer/release/lang/English.lng -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2011-08-20 02:11:22 UTC (rev 4586) +++ trunk/installer/release/lang/English.lng 2011-08-20 04:17:03 UTC (rev 4587) @@ -662,6 +662,13 @@ DLG_UNKNOWNHOST_FINGERPRINT=The server's host key fingerprint is: DLG_UNKNOWNHOST_ADD=&Add this machine and its key to the known hosts list +DLG_HOSTKEY_SSHFP_NOTFOUND=SSHFP RR not found. +DLG_HOSTKEY_SSHFP_MATCH=SSHFP RR found and match. +DLG_HOSTKEY_SSHFP_MISMATCH=SSHFP RR found but not match. +DLG_HOSTKEY_SSHFP_DIFFTYPE=SSHFP RR found but different type. +DLG_HOSTKEY_DNSSEC_NG=SSHFP RR is *not* authenticated by DNSSEC. +DLG_HOSTKEY_DNSSEC_OK=SSHFP RR is authenticated by DNSSEC. + ; crypt.c MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d) MSG_ENCRYPT_ERROR2=%s encrypt error(2) From svnnotify ＠ sourceforge.jp Sat Aug 20 16:01:14 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 16:01:14 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODhdICBTU0hGUCBSUiDjgavjgaTjgYQ=?= =?utf-8?b?44Gm44Gu6Kqs5piO44KS6L+95Yqg?= Message-ID: <1313823674.635523.22476.nullmailer@users.sourceforge.jp> Revision: 4588 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4588 Author: maya Date: 2011-08-20 16:01:14 +0900 (Sat, 20 Aug 2011) Log Message: ----------- SSHFP RR ????????????菴遵? Modified Paths: -------------- trunk/doc/ja/html/usage/ssh.html -------------- next part -------------- Modified: trunk/doc/ja/html/usage/ssh.html =================================================================== --- trunk/doc/ja/html/usage/ssh.html 2011-08-20 04:17:03 UTC (rev 4587) +++ trunk/doc/ja/html/usage/ssh.html 2011-08-20 07:01:14 UTC (rev 4588) @@ -53,6 +53,8 @@

    ????????

    +

    known_hosts ????

    +

    SSH ????? SSH ????????????????????? ssh_known_hosts ???????x???ｦ????
    ?????????????????????

    @@ -70,6 +72,16 @@ 
    ssh-keygen -l -f /etc/ssh/ssh_host_rsa_key.pub
    +

    SSHFP RR

    + +

    SSH ?????RFC 4255 ???????? SSHFP RR ???????\????DNSSEC ?????????Q??????????????

    + +

    ??????Lﾒ???? DNS ? SSHFP ????? SSH ???????????o?????????????????? SSHFP ????????????????????????????????\???
    + ????? Windows ?????????? Windows 2000 ??????????

    + +

    SSHFP ?????????? RFC 4255 ???DNSSEC ????????SSHFP RR ?????????????????
    + Windows ????? DNSSEC ?????????????A??DNSSEC ????s????

    +

    ?????

    From svnnotify ＠ sourceforge.jp Sat Aug 20 16:12:09 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 16:12:09 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1ODldICDjgrPjg6Hjg7Pjg4jov73liqA=?= Message-ID: <1313824329.199625.5741.nullmailer@users.sourceforge.jp> Revision: 4589 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4589 Author: maya Date: 2011-08-20 16:12:09 +0900 (Sat, 20 Aug 2011) Log Message: ----------- コメント追加 Modified Paths: -------------- trunk/ttssh2/ttxssh/config.h -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/config.h =================================================================== --- trunk/ttssh2/ttxssh/config.h 2011-08-20 07:01:14 UTC (rev 4588) +++ trunk/ttssh2/ttxssh/config.h 2011-08-20 07:12:09 UTC (rev 4589) @@ -8,6 +8,7 @@ // Camellia support draft // http://tools.ietf.org/html/draft-kanno-secsh-camellia-02 +// https://bugzilla.mindrot.org/show_bug.cgi?id=1340 #undef WITH_CAMELLIA_DRAFT #undef WITH_CAMELLIA_PRIVATE From svnnotify ＠ sourceforge.jp Sat Aug 20 21:56:19 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 21:56:19 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTBdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1313844979.787751.12154.nullmailer@users.sourceforge.jp> Revision: 4590 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4590 Author: yutakapon Date: 2011-08-20 21:56:19 +0900 (Sat, 20 Aug 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/about/history.html -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-20 07:12:09 UTC (rev 4589) +++ trunk/doc/en/html/about/history.html 2011-08-20 12:56:19 UTC (rev 4590) @@ -35,7 +35,7 @@

    • Changes
        - +
      • When the OSC string includes a control sequence, the control sequence can be procedured.
      • Eterm look-feel: The wallpaper file format can support any format other than BMP on Windows Vista or later.
      • "getpassword" macro command is updated.
          @@ -52,7 +52,7 @@
        • Bug fixes
          • The log file which name length is 80 bytes over can not be opened.
            • - +
          • When the meta key is enabled, the Control and Meta key is redundantly inputed.
          • @@ -1720,17 +1720,17 @@
        • Changes
          • added the PuTTY version on the version dialog.
            • - - +
          • removed the random initialization because it takes a long time to connect.
            • +
          • The timestamp of the log file is recorded on the millisecond time scale.
          • - +
        • Misc
            From svnnotify ＠ sourceforge.jp Sat Aug 20 22:43:18 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sat, 20 Aug 2011 22:43:18 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTFdICBpbmNsdWRl44Gr6Zai44GX44Gm?= =?utf-8?b?6L+96KiY44GX44Gf44CC?= Message-ID: <1313847798.406726.9492.nullmailer@users.sourceforge.jp> Revision: 4591 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4591 Author: yutakapon Date: 2011-08-20 22:43:18 +0900 (Sat, 20 Aug 2011) Log Message: ----------- include??????菴処?????? Modified Paths: -------------- trunk/doc/en/html/macro/command/include.html trunk/doc/en/html/macro/howtorun.html trunk/doc/ja/html/macro/command/include.html trunk/doc/ja/html/macro/howtorun.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/include.html =================================================================== --- trunk/doc/en/html/macro/command/include.html 2011-08-20 12:56:19 UTC (rev 4590) +++ trunk/doc/en/html/macro/command/include.html 2011-08-20 13:43:18 UTC (rev 4591) @@ -18,9 +18,17 @@ 

            -include <include file name>
+include '<include file name>'
            +

            Remarks

            + +

            +Loads the specified macro file and interprets the macro. When the macro execution ends, the next line of the include command is restarted.
            +Also, the include nest leve is 9. +

            + +

            Example

            @@ -44,5 +52,10 @@
 ----- End of "sub.ttl" ----------
            +

            Reference

            + +Note: Loading a macro file
            + + Modified: trunk/doc/en/html/macro/howtorun.html =================================================================== --- trunk/doc/en/html/macro/howtorun.html 2011-08-20 12:56:19 UTC (rev 4590) +++ trunk/doc/en/html/macro/howtorun.html 2011-08-20 13:43:18 UTC (rev 4591) @@ -54,5 +54,11 @@

            +

            Note: Loading a macro file

            + +

            +A macro file is loaded into memory all at once, and the macro is interpreted. However, the macro command include always reads a specified macro file. When a macro file on the network file server is executed, the macro command include may fail if the network is down. +

            + Modified: trunk/doc/ja/html/macro/command/include.html =================================================================== --- trunk/doc/ja/html/macro/command/include.html 2011-08-20 12:56:19 UTC (rev 4590) +++ trunk/doc/ja/html/macro/command/include.html 2011-08-20 13:43:18 UTC (rev 4591) @@ -18,9 +18,16 @@ 

            -include <include file name>
+include '<include file name>'
            +

            ??

            + +

            +???????????????????????ﾀ?????ﾀ????Ainclude??????????????J????
            +???include????? 9 ?????? +

            +

            ?

            @@ -44,5 +51,10 @@
 -----?????????????------
            + +

            ??/h2> + +?: ????????????
            + Modified: trunk/doc/ja/html/macro/howtorun.html =================================================================== --- trunk/doc/ja/html/macro/howtorun.html 2011-08-20 12:56:19 UTC (rev 4590) +++ trunk/doc/ja/html/macro/howtorun.html 2011-08-20 13:43:18 UTC (rev 4591) @@ -54,5 +54,12 @@

            +

            ?: ????????????

            + +

            +??????????????????????????A??ﾀ?????????????????include ?????????ﾀ?????????????????????????????????????}?????????ﾀ??????????????????????????include?????????? +

            + + From svnnotify ＠ sourceforge.jp Sun Aug 21 22:44:24 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 21 Aug 2011 22:44:24 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTJdICDjgrPjg6Hjg7Pjg4jov73liqA=?= Message-ID: <1313934264.097492.7599.nullmailer@users.sourceforge.jp> Revision: 4592 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4592 Author: maya Date: 2011-08-21 22:44:23 +0900 (Sun, 21 Aug 2011) Log Message: ----------- コメント追加 Modified Paths: -------------- trunk/ttssh2/ttxssh/ssh.h -------------- next part -------------- Modified: trunk/ttssh2/ttxssh/ssh.h =================================================================== --- trunk/ttssh2/ttxssh/ssh.h 2011-08-20 13:43:18 UTC (rev 4591) +++ trunk/ttssh2/ttxssh/ssh.h 2011-08-21 13:44:23 UTC (rev 4592) @@ -257,12 +257,12 @@ } ssh2_host_key_t; static ssh2_host_key_t ssh2_host_key[] = { - {KEY_RSA1, "ssh-rsa1"}, // for SSH1 only - {KEY_RSA, "ssh-rsa"}, - {KEY_DSA, "ssh-dss"}, - {KEY_ECDSA256, "ecdsa-sha2-nistp256"}, - {KEY_ECDSA384, "ecdsa-sha2-nistp384"}, - {KEY_ECDSA521, "ecdsa-sha2-nistp521"}, + {KEY_RSA1, "ssh-rsa1"}, // for SSH1 only + {KEY_RSA, "ssh-rsa"}, // RFC4253 + {KEY_DSA, "ssh-dss"}, // RFC4253 + {KEY_ECDSA256, "ecdsa-sha2-nistp256"}, // RFC5656 + {KEY_ECDSA384, "ecdsa-sha2-nistp384"}, // RFC5656 + {KEY_ECDSA521, "ecdsa-sha2-nistp521"}, // RFC5656 {KEY_UNSPEC, "ssh-unknown"}, {KEY_NONE, NULL}, }; @@ -285,28 +285,28 @@ } ssh2_cipher_t; static ssh2_cipher_t ssh2_ciphers[] = { - {SSH2_CIPHER_3DES_CBC, "3des-cbc", 8, 24, 0, EVP_des_ede3_cbc}, - {SSH2_CIPHER_AES128_CBC, "aes128-cbc", 16, 16, 0, EVP_aes_128_cbc}, - {SSH2_CIPHER_AES192_CBC, "aes192-cbc", 16, 24, 0, EVP_aes_192_cbc}, - {SSH2_CIPHER_AES256_CBC, "aes256-cbc", 16, 32, 0, EVP_aes_256_cbc}, - {SSH2_CIPHER_BLOWFISH_CBC, "blowfish-cbc", 8, 16, 0, EVP_bf_cbc}, - {SSH2_CIPHER_AES128_CTR, "aes128-ctr", 16, 16, 0, evp_aes_128_ctr}, - {SSH2_CIPHER_AES192_CTR, "aes192-ctr", 16, 24, 0, evp_aes_128_ctr}, - {SSH2_CIPHER_AES256_CTR, "aes256-ctr", 16, 32, 0, evp_aes_128_ctr}, - {SSH2_CIPHER_ARCFOUR, "arcfour", 8, 16, 0, EVP_rc4}, - {SSH2_CIPHER_ARCFOUR128, "arcfour128", 8, 16, 1536, EVP_rc4}, - {SSH2_CIPHER_ARCFOUR256, "arcfour256", 8, 32, 1536, EVP_rc4}, - {SSH2_CIPHER_CAST128_CBC, "cast128-cbc", 8, 16, 0, EVP_cast5_cbc}, - {SSH2_CIPHER_3DES_CTR, "3des-ctr", 8, 24, 0, evp_des3_ctr}, - {SSH2_CIPHER_BLOWFISH_CTR, "blowfish-ctr", 8, 16, 0, evp_bf_ctr}, - {SSH2_CIPHER_CAST128_CTR, "cast128-ctr", 8, 16, 0, evp_cast5_ctr}, + {SSH2_CIPHER_3DES_CBC, "3des-cbc", 8, 24, 0, EVP_des_ede3_cbc}, // RFC4253 + {SSH2_CIPHER_AES128_CBC, "aes128-cbc", 16, 16, 0, EVP_aes_128_cbc}, // RFC4253 + {SSH2_CIPHER_AES192_CBC, "aes192-cbc", 16, 24, 0, EVP_aes_192_cbc}, // RFC4253 + {SSH2_CIPHER_AES256_CBC, "aes256-cbc", 16, 32, 0, EVP_aes_256_cbc}, // RFC4253 + {SSH2_CIPHER_BLOWFISH_CBC, "blowfish-cbc", 8, 16, 0, EVP_bf_cbc}, // RFC4253 + {SSH2_CIPHER_AES128_CTR, "aes128-ctr", 16, 16, 0, evp_aes_128_ctr}, // RFC4344 + {SSH2_CIPHER_AES192_CTR, "aes192-ctr", 16, 24, 0, evp_aes_128_ctr}, // RFC4344 + {SSH2_CIPHER_AES256_CTR, "aes256-ctr", 16, 32, 0, evp_aes_128_ctr}, // RFC4344 + {SSH2_CIPHER_ARCFOUR, "arcfour", 8, 16, 0, EVP_rc4}, // RFC4253 + {SSH2_CIPHER_ARCFOUR128, "arcfour128", 8, 16, 1536, EVP_rc4}, // RFC4345 + {SSH2_CIPHER_ARCFOUR256, "arcfour256", 8, 32, 1536, EVP_rc4}, // RFC4345 + {SSH2_CIPHER_CAST128_CBC, "cast128-cbc", 8, 16, 0, EVP_cast5_cbc}, // RFC4253 + {SSH2_CIPHER_3DES_CTR, "3des-ctr", 8, 24, 0, evp_des3_ctr}, // RFC4344 + {SSH2_CIPHER_BLOWFISH_CTR, "blowfish-ctr", 8, 16, 0, evp_bf_ctr}, // RFC4344 + {SSH2_CIPHER_CAST128_CTR, "cast128-ctr", 8, 16, 0, evp_cast5_ctr}, // RFC4344 #ifdef WITH_CAMELLIA_DRAFT - {SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc", 16, 16, 0, EVP_camellia_128_cbc}, - {SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc", 16, 24, 0, EVP_camellia_192_cbc}, - {SSH2_CIPHER_CAMELLIA256_CBC, "camellia256-cbc", 16, 32, 0, EVP_camellia_256_cbc}, - {SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16, 0, evp_camellia_128_ctr}, - {SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24, 0, evp_camellia_128_ctr}, - {SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32, 0, evp_camellia_128_ctr}, + {SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc", 16, 16, 0, EVP_camellia_128_cbc}, // draft-kanno-secsh-camellia-02 + {SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc", 16, 24, 0, EVP_camellia_192_cbc}, // draft-kanno-secsh-camellia-02 + {SSH2_CIPHER_CAMELLIA256_CBC, "camellia256-cbc", 16, 32, 0, EVP_camellia_256_cbc}, // draft-kanno-secsh-camellia-02 + {SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02 + {SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02 + {SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02 #ifdef WITH_CAMELLIA_PRIVATE {SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc ＠ openssh.org", 16, 16, 0, EVP_camellia_128_cbc}, {SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc ＠ openssh.org", 16, 24, 0, EVP_camellia_192_cbc}, @@ -340,13 +340,13 @@ } ssh2_kex_algorithm_t; static ssh2_kex_algorithm_t ssh2_kex_algorithms[] = { - {KEX_DH_GRP1_SHA1, "diffie-hellman-group1-sha1", EVP_sha1}, - {KEX_DH_GRP14_SHA1, "diffie-hellman-group14-sha1", EVP_sha1}, - {KEX_DH_GEX_SHA1, "diffie-hellman-group-exchange-sha1", EVP_sha1}, - {KEX_DH_GEX_SHA256, "diffie-hellman-group-exchange-sha256", EVP_sha256}, - {KEX_ECDH_SHA2_256, "ecdh-sha2-nistp256", EVP_sha256}, - {KEX_ECDH_SHA2_384, "ecdh-sha2-nistp384", EVP_sha384}, - {KEX_ECDH_SHA2_521, "ecdh-sha2-nistp521", EVP_sha512}, + {KEX_DH_GRP1_SHA1, "diffie-hellman-group1-sha1", EVP_sha1}, // RFC4253 + {KEX_DH_GRP14_SHA1, "diffie-hellman-group14-sha1", EVP_sha1}, // RFC4253 + {KEX_DH_GEX_SHA1, "diffie-hellman-group-exchange-sha1", EVP_sha1}, // RFC4419 + {KEX_DH_GEX_SHA256, "diffie-hellman-group-exchange-sha256", EVP_sha256}, // RFC4419 + {KEX_ECDH_SHA2_256, "ecdh-sha2-nistp256", EVP_sha256}, // RFC5656 + {KEX_ECDH_SHA2_384, "ecdh-sha2-nistp384", EVP_sha384}, // RFC5656 + {KEX_ECDH_SHA2_521, "ecdh-sha2-nistp521", EVP_sha512}, // RFC5656 {KEX_DH_NONE , NULL, NULL}, }; @@ -376,16 +376,16 @@ } ssh2_mac_t; static ssh2_mac_t ssh2_macs[] = { - {HMAC_SHA1, "hmac-sha1", EVP_sha1, 0}, - {HMAC_MD5, "hmac-md5", EVP_md5, 0}, - {HMAC_SHA1_96, "hmac-sha1-96", EVP_sha1, 96}, - {HMAC_MD5_96, "hmac-md5-96", EVP_md5, 96}, + {HMAC_SHA1, "hmac-sha1", EVP_sha1, 0}, // RFC4253 + {HMAC_MD5, "hmac-md5", EVP_md5, 0}, // RFC4253 + {HMAC_SHA1_96, "hmac-sha1-96", EVP_sha1, 96}, // RFC4253 + {HMAC_MD5_96, "hmac-md5-96", EVP_md5, 96}, // RFC4253 {HMAC_RIPEMD160, "hmac-ripemd160 ＠ openssh.com", EVP_ripemd160, 0}, #ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support - {HMAC_SHA2_256, "hmac-sha2-256", EVP_sha256, 0}, - {HMAC_SHA2_256_96, "hmac-sha2-256-96", EVP_sha256, 96}, - {HMAC_SHA2_512, "hmac-sha2-512", EVP_sha512, 0}, - {HMAC_SHA2_512_96, "hmac-sha2-512-96", EVP_sha512, 96}, + {HMAC_SHA2_256, "hmac-sha2-256", EVP_sha256, 0}, // draft-dbider-sha2-mac-for-ssh-02 + {HMAC_SHA2_256_96, "hmac-sha2-256-96", EVP_sha256, 96}, // draft-dbider-sha2-mac-for-ssh-02 + {HMAC_SHA2_512, "hmac-sha2-512", EVP_sha512, 0}, // draft-dbider-sha2-mac-for-ssh-02 + {HMAC_SHA2_512_96, "hmac-sha2-512-96", EVP_sha512, 96}, // draft-dbider-sha2-mac-for-ssh-02 #endif // HMAC-SHA2 support {HMAC_NONE, NULL, NULL, 0}, }; @@ -406,8 +406,8 @@ } ssh2_comp_t; static ssh2_comp_t ssh2_comps[] = { - {COMP_NOCOMP, "none"}, - {COMP_ZLIB, "zlib"}, + {COMP_NOCOMP, "none"}, // RFC4253 + {COMP_ZLIB, "zlib"}, // RFC4253 {COMP_DELAYED, "zlib ＠ openssh.com"}, {COMP_NONE, NULL}, }; From svnnotify ＠ sourceforge.jp Mon Aug 22 18:12:48 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 22 Aug 2011 18:12:48 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTNdICDjgrXjg7Pjg5fjg6vjgrPjg7w=?= =?utf-8?b?44OJ6L+95Yqg44CC?= Message-ID: <1314004368.849818.4101.nullmailer@users.sourceforge.jp> Revision: 4593 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4593 Author: yutakapon Date: 2011-08-22 18:12:48 +0900 (Mon, 22 Aug 2011) Log Message: ----------- ?泣?????潟???申??? cf. http://logmett.com/forum/viewtopic.php?f=3&t=1771 Modified Paths: -------------- trunk/doc/en/html/macro/command/fileopen.html trunk/doc/en/html/macro/command/fileread.html trunk/doc/ja/html/macro/command/fileopen.html trunk/doc/ja/html/macro/command/fileread.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/fileopen.html =================================================================== --- trunk/doc/en/html/macro/command/fileopen.html 2011-08-21 13:44:23 UTC (rev 4592) +++ trunk/doc/en/html/macro/command/fileopen.html 2011-08-22 09:12:48 UTC (rev 4593) @@ -26,7 +26,8 @@

            Opens a file specified by <file name>.
            If the file does not exist, it is created and then opened. If the file is successfully opened, the file handle is returned in the integer variable <file handle>. Otherwise, <file handle> is set to -1.
            -If <append flag> is zero, the file pointer is set to the beginning of the file. If <append flag> is non-zero, the file pointer is set to the end of the file. +If <append flag> is zero, the file pointer is set to the beginning of the file. If <append flag> is non-zero, the file pointer is set to the end of the file.
            +Also, the file is opened in the binary mode.

            Example

            @@ -46,5 +47,10 @@ end +

            Reference

            + +filewrite
            +fileclose
            + Modified: trunk/doc/en/html/macro/command/fileread.html =================================================================== --- trunk/doc/en/html/macro/command/fileread.html 2011-08-21 13:44:23 UTC (rev 4592) +++ trunk/doc/en/html/macro/command/fileread.html 2011-08-22 09:12:48 UTC (rev 4593) @@ -27,7 +27,8 @@ Reads specified byte data from the file specified by <file handle>.
            The data are written into the string variable <strvar>. The file pointer is moved to reading bytes.
            If the file pointer reaches the end of the file while reading the data, the system variable "result" is set to 1. Otherwise, "result" is set to zero.
            -The range of <read byte> argument must be from 1 to 255. +The range of <read byte> argument must be from 1 to 255.
            +Also, a null character('\0) is added at the end of the string variable <strvar>.

            Example

            @@ -47,5 +48,39 @@ fileclose fp +
            +; Send 32 bytes from a binary file.
+filename = 'sample.bin'
+
+fileopen fhandle filename 0
+if fhandle == -1 goto the_end
+
+call send_16_bytes      ; send first 16 bytes
+fileseek fhandle 16 1   ; seek past next 16 without sending
+call send_16_bytes      ; send next (last) 16 bytes
+fileclose fhandle
+goto the_end
+ 
+;#########################################
+:send_16_bytes
+    for i 1 16
+        fileread fhandle 1 str      ; read one byte at a time so we can detect zero.
+        if result == 1 break
+        str2code integer str        ; if zero then str will be empty and integer will be set to zero
+        ;sprintf 'integer = 0x%02X' integer
+        ;messagebox inputstr 'test'
+        send integer
+    next
+return
+;#########################################
+:the_end
+
            + + +

            Reference

            + +fileopen
            +fileclose
            + Modified: trunk/doc/ja/html/macro/command/fileopen.html =================================================================== --- trunk/doc/ja/html/macro/command/fileopen.html 2011-08-21 13:44:23 UTC (rev 4592) +++ trunk/doc/ja/html/macro/command/fileopen.html 2011-08-22 09:12:48 UTC (rev 4593) @@ -26,7 +26,8 @@

            ???? <filename> ????
            ?????????????A?????????????????????????????????????A????????????? <file handle> ??????????????A<file handle> ?-1???????
            -<append flag> ?0???A???????????????????????????<append flag> ?0?????A???????????????????????? +<append flag> ?0???A???????????????????????????<append flag> ?0?????A????????????????????????
            +????????????????????????

            ?

            @@ -46,5 +47,10 @@ end +

            ??/h2> + +filewrite
            +fileclose
            + Modified: trunk/doc/ja/html/macro/command/fileread.html =================================================================== --- trunk/doc/ja/html/macro/command/fileread.html 2011-08-21 13:44:23 UTC (rev 4592) +++ trunk/doc/ja/html/macro/command/fileread.html 2011-08-22 09:12:48 UTC (rev 4593) @@ -27,7 +27,8 @@ <file handle> ???????????????????????????????B
            ????????? <strvar> ???????????????????????????????
            ???????????O????????????????????s?????A?????? "result" ? 1 ??????? ??????"result" ? 0 ???????
            -?? <read byte> ???????? 1 ?? 255 ?????????? +?? <read byte> ???????? 1 ?? 255 ??????????
            +???????? <strvar> ???? '\0' ???????

            ?

            @@ -47,5 +48,38 @@ fileclose fp +
            +; ?????????????32??????????????????
+filename = 'sample.bin'
+
+fileopen fhandle filename 0
+if fhandle == -1 goto the_end
+
+call send_16_bytes      ; send first 16 bytes
+fileseek fhandle 16 1   ; seek past next 16 without sending
+call send_16_bytes      ; send next (last) 16 bytes
+fileclose fhandle
+goto the_end
+ 
+;#########################################
+:send_16_bytes
+    for i 1 16
+        fileread fhandle 1 str      ; read one byte at a time so we can detect zero.
+        if result == 1 break
+        str2code integer str        ; if zero then str will be empty and integer will be set to zero
+        ;sprintf 'integer = 0x%02X' integer
+        ;messagebox inputstr 'test'
+        send integer
+    next
+return
+;#########################################
+:the_end
+
            + +

            ??/h2> + +fileopen
            +fileclose
            + From svnnotify ＠ sourceforge.jp Mon Aug 22 20:45:52 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 22 Aug 2011 20:45:52 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTRdICDjg57jgq/jg63jga7jgrXjg50=?= =?utf-8?b?44O844OI44OQ44O844K444On44Oz6Kqk44KK44KS5L+u5q2j44GX44Gf44CC?= Message-ID: <1314013552.458010.15890.nullmailer@users.sourceforge.jp> Revision: 4594 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4594 Author: yutakapon Date: 2011-08-22 20:45:52 +0900 (Mon, 22 Aug 2011) Log Message: ----------- ???????泣??若?????吾??活????篆??????? Modified Paths: -------------- trunk/doc/en/html/macro/command/index.html trunk/doc/ja/html/macro/command/index.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/index.html =================================================================== --- trunk/doc/en/html/macro/command/index.html 2011-08-22 09:12:48 UTC (rev 4593) +++ trunk/doc/en/html/macro/command/index.html 2011-08-22 11:45:52 UTC (rev 4594) @@ -142,8 +142,8 @@
          • filedelete
          • filemarkptr
          • fileopen -
          • filereadln (version 4.48 or later) -
          • fileread +
          • filereadln +
          • fileread (version 4.48 or later)
          • filerename
          • filesearch
          • fileseek @@ -186,7 +186,7 @@
          • getdate
          • getenv
          • gettime -
          • getttdir (version 4.46 or later) +
          • getttdir (version 4.60 or later)
          • getver (version 4.58 or later)
          • ifdefined (version 4.46 or later)
          • inputbox Modified: trunk/doc/ja/html/macro/command/index.html =================================================================== --- trunk/doc/ja/html/macro/command/index.html 2011-08-22 09:12:48 UTC (rev 4593) +++ trunk/doc/ja/html/macro/command/index.html 2011-08-22 11:45:52 UTC (rev 4594) @@ -96,7 +96,7 @@
          • goto
          • if, then, elseif, else, endif
          • include -
          • mpause +
          • mpause (?????4.27??)
          • pause
          • return
          • until, enduntil (?????4.56??) From svnnotify ＠ sourceforge.jp Mon Aug 22 23:47:59 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Mon, 22 Aug 2011 23:47:59 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTVdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1314024479.521977.5162.nullmailer@users.sourceforge.jp> Revision: 4595 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4595 Author: yutakapon Date: 2011-08-22 23:47:59 +0900 (Mon, 22 Aug 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/usage/tips/vim.html -------------- next part -------------- Modified: trunk/doc/en/html/usage/tips/vim.html =================================================================== --- trunk/doc/en/html/usage/tips/vim.html 2011-08-22 11:45:52 UTC (rev 4594) +++ trunk/doc/en/html/usage/tips/vim.html 2011-08-22 14:47:59 UTC (rev 4595) @@ -120,12 +120,9 @@

            - -NOTICE: You are recommended to configure the Delete wait time after ESC key is pushed in insert mode. +When the timeoutlen of the vim is enabled, the vim will wait until either the complete mapping or key sequence has been received. In other words, the timeoutlen is used to describe the time from IME on to off after the ESC key is pressed in the insert mode.
            +If the timeoutlen is the small value, a trouble may occur that the cursor and function key do not work well.
            +As an alternative, please use the Delete wait time after ESC key is pushed in insert mode.

            From svnnotify ＠ sourceforge.jp Tue Aug 23 12:29:46 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 23 Aug 2011 12:29:46 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTZdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1314070186.020262.6905.nullmailer@users.sourceforge.jp> Revision: 4596 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4596 Author: yutakapon Date: 2011-08-23 12:29:45 +0900 (Tue, 23 Aug 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/usage/ssh.html trunk/doc/ja/html/usage/ssh.html -------------- next part -------------- Modified: trunk/doc/en/html/usage/ssh.html =================================================================== --- trunk/doc/en/html/usage/ssh.html 2011-08-22 14:47:59 UTC (rev 4595) +++ trunk/doc/en/html/usage/ssh.html 2011-08-23 03:29:45 UTC (rev 4596) @@ -49,6 +49,41 @@ When using Key-pair authentication, check [RSA/DSA key to log in] (second from the top line) and click [Private key file:] to specify Private key file. Then type in username and Private key pass phrase.

            +

            Security Warning

            + +

            ssh_known_hosts file

            + +

            On SSH connection, Tera Term searches the server host key into the ssh_known_hosts file. If the host key can not be found, the security warning is shown.
            + The result is described below.

            + +
              +
            • No host key in ssh_known_hosts.
              • +
            • Mismatching the host key type found in ssh_known_hosts.
              • +
            • Mismatching the host key found in ssh_known_hosts.
              • +
            • Matching the host key found in ssh_known_hosts(not warning).
              • +
            + + + +

            SSHFP RR

            + + +

            Generating Key

            Modified: trunk/doc/ja/html/usage/ssh.html =================================================================== --- trunk/doc/ja/html/usage/ssh.html 2011-08-22 14:47:59 UTC (rev 4595) +++ trunk/doc/ja/html/usage/ssh.html 2011-08-23 03:29:45 UTC (rev 4596) @@ -53,7 +53,7 @@

            ????????

            -

            known_hosts ????

            +

            ssh_known_hosts ????

            SSH ????? SSH ????????????????????? ssh_known_hosts ???????x???ｦ????
            ?????????????????????

            @@ -74,13 +74,13 @@

            SSHFP RR

            -

            SSH ?????RFC 4255 ???????? SSHFP RR ???????\????DNSSEC ?????????Q??????????????

            +

            SSH ?????RFC 4255 ???????? SSHFP RR (Secure SHell FingerPrint Resource Record) ???????\???????Tera Term?? DNSSEC ?????????Q??????????????

            -

            ??????Lﾒ???? DNS ? SSHFP ????? SSH ???????????o?????????????????? SSHFP ????????????????????????????????\???
            +

            ??????Lﾒ???? DNS ? SSHFP ????? SSH ???????????o?????????????????(Tera Term)? SSHFP ????????????????????????????????\???
            ????? Windows ?????????? Windows 2000 ??????????

            -

            SSHFP ?????????? RFC 4255 ???DNSSEC ????????SSHFP RR ?????????????????
            - Windows ????? DNSSEC ?????????????A??DNSSEC ????s????

            +

            SSHFP ?????????? RFC 4255 ???DNSSEC ????????SSHFP RR ?????????????????
            + Tera Term???????Windows ????? DNSSEC ?????????????A??DNSSEC ????s????

            ?????

            From svnnotify ＠ sourceforge.jp Wed Aug 24 19:43:12 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 24 Aug 2011 19:43:12 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OTddICDjgIzlvI/jgajmvJTnrpflrZA=?= =?utf-8?b?44CN44G444Gu44Oq44Oz44Kv44KS6L+95Yqg44GX44Gf44CC?= Message-ID: <1314182592.597630.12900.nullmailer@users.sourceforge.jp> Revision: 4597 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4597 Author: yutakapon Date: 2011-08-24 19:43:12 +0900 (Wed, 24 Aug 2011) Log Message: ----------- ??????膊?????????潟???申?????? ??? ?吾?紊???? Modified Paths: -------------- trunk/doc/en/html/macro/command/doloop.html trunk/doc/en/html/macro/command/ifthenelseif.html trunk/doc/en/html/macro/command/until.html trunk/doc/en/html/macro/command/while.html trunk/doc/ja/html/macro/command/doloop.html trunk/doc/ja/html/macro/command/ifthenelseif.html trunk/doc/ja/html/macro/command/until.html trunk/doc/ja/html/macro/command/while.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/doloop.html =================================================================== --- trunk/doc/en/html/macro/command/doloop.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/en/html/macro/command/doloop.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -18,18 +18,18 @@ 

            -do [ { while | until } <int> (option)]
            
+do [ { while | until } <expression> (option)]
            
   ...
            
   ...
            
-loop [ { while | until } <int> (option)]
+loop [ { while | until } <expression> (option)]

            Remarks

            Repeats the statements between 'do' and 'loop' according to condition as follows. -If 'while' specified, repeats while <int> is non-zero. -If 'until' specified, repeats while <int> is zero. +If 'while' specified, repeats while <expression> is non-zero. +If 'until' specified, repeats while <expression> is zero.

            Example

            @@ -52,5 +52,9 @@ loop while result = 2 +

            Reference

            + +Expressions and operators
            + Modified: trunk/doc/en/html/macro/command/ifthenelseif.html =================================================================== --- trunk/doc/en/html/macro/command/ifthenelseif.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/en/html/macro/command/ifthenelseif.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -20,13 +20,13 @@

            1) Format 1

            -if <int> <statement>
+if <expression> <statement>

            Remarks

            -Executes a <statement>, if <int> is non-zero. +Executes a <statement>, if <expression> is true(non-zero).

            Example

            @@ -43,17 +43,17 @@

            2) Format 2

            -if <int 1> then
+if <expression 1> then
   ...
-  (Statements for the case:  <int 1> is true (non-zero).)
+  (Statements for the case:  <expression 1> is true (non-zero).)
   ...
-[elseif <int 2> then]
+[elseif <expression 2> then]
   ...
-  (Statements for the case:  <int 1> is false (zero) and <int 2> is true.)
+  (Statements for the case:  <expression 1> is false (zero) and <expression 2> is true.)
   ...
-[elseif <int N> then]
+[elseif <expression N> then]
   ...
-  (Statements for the case:  <int 1>, <int 2>,... and <int N-1> are all false, and <int N> is true.)
+  (Statements for the case:  <expression 1>, <expression 2>,... and <expression N-1> are all false, and <expression N> is true.)
   ...
 [else]
   ...
@@ -96,5 +96,9 @@
 endif
            +

            Reference

            + +Expressions and operators
            + Modified: trunk/doc/en/html/macro/command/until.html =================================================================== --- trunk/doc/en/html/macro/command/until.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/en/html/macro/command/until.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -18,7 +18,7 @@ 

            -until <int>
            
+until <expression>
            
   ...
            
   ...
            
 enduntil
@@ -27,7 +27,7 @@
 
            Remarks
            
 
 
            
-Repeats the statements between 'until' and 'enduntil' while <int> is zero.
+Repeats the statements between 'until' and 'enduntil' while <expression> is zero.
 
            
 
 
            Example
            
@@ -40,5 +40,9 @@
 enduntil
            +

            Reference

            + +Expressions and operators
            + Modified: trunk/doc/en/html/macro/command/while.html =================================================================== --- trunk/doc/en/html/macro/command/while.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/en/html/macro/command/while.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -18,7 +18,7 @@ 

            -while <int>
            
+while <expression>
            
   ...
            
   ...
            
 endwhile
@@ -27,7 +27,7 @@
 
            Remarks
            
 
 
            
-Repeats the statements between 'while' and 'endwhile' while <int> is non-zero.
+Repeats the statements between 'while' and 'endwhile' while <expression> is non-zero.
 
            
 
 
            Example
            
@@ -40,5 +40,9 @@
 endwhile
            +

            Reference

            + +Expressions and operators
            + Modified: trunk/doc/ja/html/macro/command/doloop.html =================================================================== --- trunk/doc/ja/html/macro/command/doloop.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/ja/html/macro/command/doloop.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -18,17 +18,17 @@ 

            -do [ { while | until } <int> (option)]
            
+do [ { while | until } <expression> (option)]
            
   ...
            
   ...
            
-loop [ { while | until } <int> (option)]
+loop [ { while | until } <expression> (option)]

            ??

            'do' ? 'loop' ???????????????J????
            -????while ????lt;int> ?0????????until ????lt;int>?0??????????
            +????while ????lt;expression> ?0????????until ????lt;expression>?0??????????
            'do' ???????????A?????????????ﾀ??????????B'loop' ???????????A??1??????ﾀ??????????????????????A?????????

            @@ -52,5 +52,9 @@ loop while result = 2 +

            ??/h2> + +ｮ????
            + Modified: trunk/doc/ja/html/macro/command/ifthenelseif.html =================================================================== --- trunk/doc/ja/html/macro/command/ifthenelseif.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/ja/html/macro/command/ifthenelseif.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -20,13 +20,13 @@

            1) ??

            -if <int> <statement>
+if <expression> <statement>

            ??

            -?? <int> ?0?????????? <statement> ?ﾀ???? +?? <expression> ??(0??)???????? <statement> ?ﾀ????

            ?

            @@ -43,17 +43,17 @@

            2) ??

            -if <int 1> then
+if <expression 1> then
   ...
-  (<int 1> ??(0??)?????s???????)
+  (<expression 1> ??(0??)?????s???????)
   ...
-[elseif <int 2> then]
+[elseif <expression 2> then]
   ...
-  (<int 1> ??(0)??<int 2>???????s???????)
+  (<expression 1> ??(0)??<expression 2>???????s???????)
   ...
-[elseif <int N> then]
+[elseif <expression N> then]
   ...
-  (<int 1>, <int 2>,.., <int N-1> ???????<int N> ???????s???????)
+  (<expression 1>, <expression 2>,.., <expression N-1> ???????<expression N> ???????s???????)
   ...
 [else]
   ...
@@ -96,5 +96,10 @@
 endif
            + +

            ??/h2> + +ｮ????
            + Modified: trunk/doc/ja/html/macro/command/until.html =================================================================== --- trunk/doc/ja/html/macro/command/until.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/ja/html/macro/command/until.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -18,7 +18,7 @@ 

            -until <int>
            
+until <expression>
            
   ...
            
   ...
            
 enduntil
@@ -27,7 +27,7 @@
 
            ??
            
 
 
            
-'until' ? 'enduntil' ????????? <int> ?0???????????
+'until' ? 'enduntil' ????????? <expression> ?0???????????
 
            
 
 
            ?
            
@@ -40,5 +40,9 @@
 enduntil
            +

            ??/h2> + +ｮ????
            + Modified: trunk/doc/ja/html/macro/command/while.html =================================================================== --- trunk/doc/ja/html/macro/command/while.html 2011-08-23 03:29:45 UTC (rev 4596) +++ trunk/doc/ja/html/macro/command/while.html 2011-08-24 10:43:12 UTC (rev 4597) @@ -18,7 +18,7 @@ 

            -while <int>
            
+while <expression>
            
   ...
            
   ...
            
 endwhile
@@ -27,7 +27,7 @@
 
            ??
            
 
 
            
-'while' ? 'endwhile' ????????? <int> ?0?????????????
+'while' ? 'endwhile' ????????? <expression> ?0?????????????
 
            
 
 
            ?
            
@@ -40,5 +40,9 @@
 endwhile
            +

            ??/h2> + +ｮ????
            + From svnnotify ＠ sourceforge.jp Wed Aug 24 20:44:42 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 24 Aug 2011 20:44:42 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ1OThdICDoi7HoqLPjgpLov73liqDjgII=?= Message-ID: <1314186282.581918.26431.nullmailer@users.sourceforge.jp> Revision: 4598 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4598 Author: yutakapon Date: 2011-08-24 20:44:42 +0900 (Wed, 24 Aug 2011) Log Message: ----------- ?沿┳??申??? Modified Paths: -------------- trunk/doc/en/html/usage/ssh.html -------------- next part -------------- Modified: trunk/doc/en/html/usage/ssh.html =================================================================== --- trunk/doc/en/html/usage/ssh.html 2011-08-24 10:43:12 UTC (rev 4597) +++ trunk/doc/en/html/usage/ssh.html 2011-08-24 11:44:42 UTC (rev 4598) @@ -63,26 +63,23 @@
          • Matching the host key found in ssh_known_hosts(not warning).

          -

          SSHFP RR

          - +

          Please refer to below one sentence in RFC 4255.
          + A public key verified using this method MUST NOT be trusted if the SSHFP resource record (RR) used for verification was not authenticated by a trusted SIG RR.
          + The DNSSEC authentication always fails because the Windows resolver used by Tera Term can not verify the DNSSEC signature.

          Generating Key

          From svnnotify ＠ sourceforge.jp Fri Aug 26 12:27:34 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Fri, 26 Aug 2011 12:27:34 +0900 Subject: [Ttssh2-commit] [4599] 4.71-RC1 Message-ID: <1314329254.643124.7544.nullmailer@users.sourceforge.jp> Revision: 4599 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4599 Author: maya Date: 2011-08-26 12:27:34 +0900 (Fri, 26 Aug 2011) Log Message: ----------- 4.71-RC1 Modified Paths: -------------- trunk/installer/teraterm.iss -------------- next part -------------- Modified: trunk/installer/teraterm.iss =================================================================== --- trunk/installer/teraterm.iss 2011-08-24 11:44:42 UTC (rev 4598) +++ trunk/installer/teraterm.iss 2011-08-26 03:27:34 UTC (rev 4599) @@ -1,6 +1,6 @@ #define AppName "Tera Term" -#define AppVer "4.70" -#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); +#define AppVer "4.71-RC1" +;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); [Setup] AppCopyright=TeraTerm Project @@ -795,5 +795,5 @@ [InnoIDE_PreCompile] Name: makechm.bat -;Name: build.bat; Parameters: rebuild -Name: build.bat +Name: build.bat; Parameters: rebuild +;Name: build.bat From svnnotify ＠ sourceforge.jp Sun Aug 28 23:02:55 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 28 Aug 2011 23:02:55 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MDBdICBITUFDLVNIQTIg44KS5q2j5byP?= =?utf-8?b?44K144Od44O844OI?= Message-ID: <1314540175.380517.1122.nullmailer@users.sourceforge.jp> Revision: 4600 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4600 Author: maya Date: 2011-08-28 23:02:55 +0900 (Sun, 28 Aug 2011) Log Message: ----------- HMAC-SHA2 ???綣?泣??若? Modified Paths: -------------- trunk/doc/en/html/about/copyright.html trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/copyright.html trunk/doc/ja/html/about/history.html trunk/ttssh2/ttxssh/config.h trunk/ttssh2/ttxssh/ssh.h trunk/ttssh2/ttxssh/ttxssh.c -------------- next part -------------- Modified: trunk/doc/en/html/about/copyright.html =================================================================== --- trunk/doc/en/html/about/copyright.html 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/doc/en/html/about/copyright.html 2011-08-28 14:02:55 UTC (rev 4600) @@ -186,7 +186,7 @@ Key exchange method: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521 Public key algorithm of server host key: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 Encryption algorithm: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit) -MAC algorithm: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-ripemd160 ＠ openssh.com +MAC algorithm: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-ripemd160 ＠ openssh.com, hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 Public key algorithm of public key authentication: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/doc/en/html/about/history.html 2011-08-28 14:02:55 UTC (rev 4600) @@ -1719,6 +1719,7 @@
          • Changes
              +
            • added support for SSH2 MAC algorithms: hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96
            • added the PuTTY version on the version dialog.
            • removed the random initialization because it takes a long time to connect.
            • The timestamp of the log file is recorded on the millisecond time scale.
              • Modified: trunk/doc/ja/html/about/copyright.html =================================================================== --- trunk/doc/ja/html/about/copyright.html 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/doc/ja/html/about/copyright.html 2011-08-28 14:02:55 UTC (rev 4600) @@ -173,7 +173,7 @@ ????ｮ: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521 ?????????????????: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 ?????????: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit) -MAC??????: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-ripemd160 ＠ openssh.com +MAC??????: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-ripemd160 ＠ openssh.com, hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 ???????J???????: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/doc/ja/html/about/history.html 2011-08-28 14:02:55 UTC (rev 4600) @@ -1720,6 +1720,7 @@
              • ??
                  +
                • SSH2 ? MAC ????????? hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 ????????
                • ????????????PuTTY?????????????????
                • ?????????????????????????????B
                • ??????????????????????????????
                  • Modified: trunk/ttssh2/ttxssh/config.h =================================================================== --- trunk/ttssh2/ttxssh/config.h 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/ttssh2/ttxssh/config.h 2011-08-28 14:02:55 UTC (rev 4600) @@ -2,10 +2,6 @@ // ????????? on/off ???????????TERATERM.INI? // ??????????????????????????? -// HMAC-SHA2 draft -// http://tools.ietf.org/html/draft-dbider-sha2-mac-for-ssh-02 -#undef WITH_HMAC_SHA2_DRAFT - // Camellia support draft // http://tools.ietf.org/html/draft-kanno-secsh-camellia-02 // https://bugzilla.mindrot.org/show_bug.cgi?id=1340 Modified: trunk/ttssh2/ttxssh/ssh.h =================================================================== --- trunk/ttssh2/ttxssh/ssh.h 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/ttssh2/ttxssh/ssh.h 2011-08-28 14:02:55 UTC (rev 4600) @@ -358,12 +358,10 @@ HMAC_SHA1_96, HMAC_MD5_96, HMAC_RIPEMD160, -#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support HMAC_SHA2_256, HMAC_SHA2_256_96, HMAC_SHA2_512, HMAC_SHA2_512_96, -#endif // HMAC-SHA2 support HMAC_UNKNOWN, HMAC_MAX = HMAC_UNKNOWN, } hmac_type; @@ -381,12 +379,10 @@ {HMAC_SHA1_96, "hmac-sha1-96", EVP_sha1, 96}, // RFC4253 {HMAC_MD5_96, "hmac-md5-96", EVP_md5, 96}, // RFC4253 {HMAC_RIPEMD160, "hmac-ripemd160 ＠ openssh.com", EVP_ripemd160, 0}, -#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support {HMAC_SHA2_256, "hmac-sha2-256", EVP_sha256, 0}, // draft-dbider-sha2-mac-for-ssh-02 {HMAC_SHA2_256_96, "hmac-sha2-256-96", EVP_sha256, 96}, // draft-dbider-sha2-mac-for-ssh-02 {HMAC_SHA2_512, "hmac-sha2-512", EVP_sha512, 0}, // draft-dbider-sha2-mac-for-ssh-02 {HMAC_SHA2_512_96, "hmac-sha2-512-96", EVP_sha512, 96}, // draft-dbider-sha2-mac-for-ssh-02 -#endif // HMAC-SHA2 support {HMAC_NONE, NULL, NULL, 0}, }; Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-08-26 03:27:34 UTC (rev 4599) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-08-28 14:02:55 UTC (rev 4600) @@ -308,18 +308,14 @@ static void normalize_mac_order(char FAR * buf) { static char default_strings[] = { -#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support HMAC_SHA2_512, HMAC_SHA2_256, -#endif // HMAC-SHA2 support HMAC_SHA1, HMAC_RIPEMD160, HMAC_MD5, HMAC_NONE, -#ifdef WITH_HMAC_SHA2_DRAFT // HMAC-SHA2 support HMAC_SHA2_512_96, HMAC_SHA2_256_96, -#endif // HMAC-SHA2 support HMAC_SHA1_96, HMAC_MD5_96, }; @@ -2343,19 +2339,10 @@ get_file_version("ttxssh.dll", &a, &b, &c, &d); _snprintf_s(buf, sizeof(buf), _TRUNCATE, #ifdef WITH_CAMELLIA_DRAFT -#ifdef WITH_HMAC_SHA2_DRAFT -// "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia/HMAC-SHA2", a, b); - "TTSSH\r\nTera Term Secure Shell extension, %d.%d (Camellia/HMAC-SHA2)", a, b); -#else "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia support", a, b); -#endif #else -#ifdef WITH_HMAC_SHA2_DRAFT - "TTSSH\r\nTera Term Secure Shell extension, %d.%d with HMAC-SHA2 support", a, b); -#else "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b); #endif -#endif SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf); // OpenSSL??????????? (2005.1.24 yutaka) From svnnotify ＠ sourceforge.jp Sun Aug 28 23:23:33 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Sun, 28 Aug 2011 23:23:33 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MDFdICBDYW1lbGxpYSDjgpLmraPlvI8=?= =?utf-8?b?44K144Od44O844OI?= Message-ID: <1314541413.006400.21044.nullmailer@users.sourceforge.jp> Revision: 4601 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4601 Author: maya Date: 2011-08-28 23:23:32 +0900 (Sun, 28 Aug 2011) Log Message: ----------- Camellia ???綣?泣??若? "@openssh.org" 篁?????????潟??潟??≪????????? Modified Paths: -------------- trunk/doc/en/html/about/copyright.html trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/copyright.html trunk/doc/ja/html/about/history.html trunk/ttssh2/ttxssh/cipher-ctr.c trunk/ttssh2/ttxssh/config.h trunk/ttssh2/ttxssh/crypt.c trunk/ttssh2/ttxssh/ssh.c trunk/ttssh2/ttxssh/ssh.h trunk/ttssh2/ttxssh/ttxssh.c -------------- next part -------------- Modified: trunk/doc/en/html/about/copyright.html =================================================================== --- trunk/doc/en/html/about/copyright.html 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/doc/en/html/about/copyright.html 2011-08-28 14:23:32 UTC (rev 4601) @@ -185,7 +185,7 @@ TTSSH uses following technologies: Key exchange method: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521 Public key algorithm of server host key: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 -Encryption algorithm: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit) +Encryption algorithm: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit). Camellia(128bit,192bit,256bit) MAC algorithm: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-ripemd160 ＠ openssh.com, hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 Public key algorithm of public key authentication: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/doc/en/html/about/history.html 2011-08-28 14:23:32 UTC (rev 4601) @@ -1719,6 +1719,7 @@
                  • Changes
                      +
                    • added Camellia128-CBC, Camellia128-CTR, Camellia192-CBC, Camellia192-CTR, Camellia256-CBC, Camellia256-CTR symmetric key cipher algorithm for SSH2 protocol.
                    • added support for SSH2 MAC algorithms: hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96
                    • added the PuTTY version on the version dialog.
                    • removed the random initialization because it takes a long time to connect.
                      • Modified: trunk/doc/ja/html/about/copyright.html =================================================================== --- trunk/doc/ja/html/about/copyright.html 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/doc/ja/html/about/copyright.html 2011-08-28 14:23:32 UTC (rev 4601) @@ -172,7 +172,7 @@ TTSSH????????p?????: ????ｮ: diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, diffie-hellman-group-exchange-sha1, diffie-hellman-group-exchange-sha256, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521 ?????????????????: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 -?????????: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit) +?????????: DES, 3DES, AES(128bit,192bit,256bit), Blowfish(128bit), ARCFOUR(128bit,256bit), CAST-128(128bit), Camellia(128bit,192bit,256bit) MAC??????: hmac-sha1, hmac-md5, hmac-sha1-96, hmac-md5-96, hmac-ripemd160 ＠ openssh.com, hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 ???????J???????: ssh-dss, ssh-rsa, ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, ecdsa-sha2-nistp521 Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/doc/ja/html/about/history.html 2011-08-28 14:23:32 UTC (rev 4601) @@ -1720,6 +1720,7 @@
                      • ??
                          +
                        • SSH2 ???????ｮ? Camellia128-CBC, Camellia128-CTR, Camellia192-CBC, Camellia192-CTR, Camellia256-CBC, Camellia256-CTR ??????
                        • SSH2 ? MAC ????????? hmac-sha2-256, hmac-sha2-256-96, hmac-sha2-512, hmac-sha2-512-96 ????????
                        • ????????????PuTTY?????????????????
                        • ?????????????????????????????B
                          • Modified: trunk/ttssh2/ttxssh/cipher-ctr.c =================================================================== --- trunk/ttssh2/ttxssh/cipher-ctr.c 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/ttssh2/ttxssh/cipher-ctr.c 2011-08-28 14:23:32 UTC (rev 4601) @@ -28,14 +28,10 @@ #include #include #include -#ifdef WITH_CAMELLIA_DRAFT #include -#endif // WITH_CAMELLIA_DRAFT extern const EVP_CIPHER *evp_aes_128_ctr(void); -#ifdef WITH_CAMELLIA_DRAFT extern const EVP_CIPHER *evp_camellia_128_ctr(void); -#endif // WITH_CAMELLIA_DRAFT struct ssh_aes_ctr_ctx { @@ -62,13 +58,11 @@ unsigned char cast5_counter[CAST_BLOCK]; }; -#ifdef WITH_CAMELLIA_DRAFT struct ssh_camellia_ctr_ctx { CAMELLIA_KEY camellia_ctx; unsigned char camellia_counter[CAMELLIA_BLOCK_SIZE]; }; -#endif // WITH_CAMELLIA_DRAFT static void ssh_ctr_inc(unsigned char *ctr, unsigned int len) @@ -421,7 +415,6 @@ return (&cast5_ctr); } -#ifdef WITH_CAMELLIA_DRAFT //============================================================================ // Camellia //============================================================================ @@ -507,4 +500,3 @@ #endif return (&camellia_ctr); } -#endif // WITH_CAMELLIA_DRAFT Modified: trunk/ttssh2/ttxssh/config.h =================================================================== --- trunk/ttssh2/ttxssh/config.h 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/ttssh2/ttxssh/config.h 2011-08-28 14:23:32 UTC (rev 4601) @@ -5,9 +5,4 @@ // Camellia support draft // http://tools.ietf.org/html/draft-kanno-secsh-camellia-02 // https://bugzilla.mindrot.org/show_bug.cgi?id=1340 -#undef WITH_CAMELLIA_DRAFT #undef WITH_CAMELLIA_PRIVATE - -#if defined(WITH_CAMELLIA_PRIVATE) && !defined(WITH_CAMELLIA_DRAFT) -#define WITH_CAMELLIA_DRAFT -#endif Modified: trunk/ttssh2/ttxssh/crypt.c =================================================================== --- trunk/ttssh2/ttxssh/crypt.c 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/ttssh2/ttxssh/crypt.c 2011-08-28 14:23:32 UTC (rev 4601) @@ -647,7 +647,6 @@ free(newbuf); } -#ifdef WITH_CAMELLIA_DRAFT static void cCamellia_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes) { @@ -725,7 +724,6 @@ error: free(newbuf); } -#endif // WITH_CAMELLIA_DRAFT static void c3DES_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes) @@ -964,14 +962,12 @@ | (1 << SSH2_CIPHER_3DES_CTR) | (1 << SSH2_CIPHER_BLOWFISH_CTR) | (1 << SSH2_CIPHER_CAST128_CTR) -#ifdef WITH_CAMELLIA_DRAFT | (1 << SSH2_CIPHER_CAMELLIA128_CBC) | (1 << SSH2_CIPHER_CAMELLIA192_CBC) | (1 << SSH2_CIPHER_CAMELLIA256_CBC) | (1 << SSH2_CIPHER_CAMELLIA128_CTR) | (1 << SSH2_CIPHER_CAMELLIA192_CTR) | (1 << SSH2_CIPHER_CAMELLIA256_CTR) -#endif // WITH_CAMELLIA_DRAFT ); } @@ -1545,7 +1541,6 @@ break; } -#ifdef WITH_CAMELLIA_DRAFT case SSH2_CIPHER_CAMELLIA128_CBC: case SSH2_CIPHER_CAMELLIA192_CBC: case SSH2_CIPHER_CAMELLIA256_CBC: @@ -1570,7 +1565,6 @@ pvar->crypt_state.encrypt = cCamellia_encrypt; break; } -#endif // WITH_CAMELLIA_DRAFT case SSH_CIPHER_3DES:{ c3DES_init(encryption_key, &pvar->crypt_state.enc.c3DES); @@ -1719,7 +1713,6 @@ break; } -#ifdef WITH_CAMELLIA_DRAFT case SSH2_CIPHER_CAMELLIA128_CBC: case SSH2_CIPHER_CAMELLIA192_CBC: case SSH2_CIPHER_CAMELLIA256_CBC: @@ -1744,7 +1737,6 @@ pvar->crypt_state.decrypt = cCamellia_decrypt; break; } -#endif // WITH_CAMELLIA_DRAFT case SSH_CIPHER_3DES:{ c3DES_init(decryption_key, &pvar->crypt_state.dec.c3DES); @@ -1851,7 +1843,6 @@ return "Blowfish-CTR"; case SSH2_CIPHER_CAST128_CTR: return "CAST-128-CTR"; -#ifdef WITH_CAMELLIA_DRAFT case SSH2_CIPHER_CAMELLIA128_CBC: return "Camellia128-CBC"; case SSH2_CIPHER_CAMELLIA192_CBC: @@ -1864,7 +1855,6 @@ return "Camellia192-CTR"; case SSH2_CIPHER_CAMELLIA256_CTR: return "Camellia256-CTR"; -#endif // WITH_CAMELLIA_DRAFT default: return "Unknown"; Modified: trunk/ttssh2/ttxssh/ssh.c =================================================================== --- trunk/ttssh2/ttxssh/ssh.c 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/ttssh2/ttxssh/ssh.c 2011-08-28 14:23:32 UTC (rev 4601) @@ -4264,7 +4264,6 @@ case SSH2_CIPHER_CAST128_CTR: c_str = "cast128-ctr,"; break; -#ifdef WITH_CAMELLIA_DRAFT #ifdef WITH_CAMELLIA_PRIVATE case SSH2_CIPHER_CAMELLIA128_CBC: c_str = "camellia128-cbc,camellia128-cbc ＠ openssh.org,"; @@ -4284,7 +4283,7 @@ case SSH2_CIPHER_CAMELLIA256_CTR: c_str = "camellia256-ctr,camellia256-ctr ＠ openssh.org,"; break; -#else // WITH_CAMELLIA_PRIVATE +#endif // WITH_CAMELLIA_PRIVATE case SSH2_CIPHER_CAMELLIA128_CBC: c_str = "camellia128-cbc,"; break; @@ -4303,8 +4302,6 @@ case SSH2_CIPHER_CAMELLIA256_CTR: c_str = "camellia256-ctr,"; break; -#endif // WITH_CAMELLIA_PRIVATE -#endif // WITH_CAMELLIA_DRAFT default: continue; } @@ -6065,14 +6062,12 @@ | 1 << SSH2_CIPHER_3DES_CTR | 1 << SSH2_CIPHER_BLOWFISH_CTR | 1 << SSH2_CIPHER_CAST128_CTR -#ifdef WITH_CAMELLIA_DRAFT | 1 << SSH2_CIPHER_CAMELLIA128_CBC | 1 << SSH2_CIPHER_CAMELLIA192_CBC | 1 << SSH2_CIPHER_CAMELLIA256_CBC | 1 << SSH2_CIPHER_CAMELLIA128_CTR | 1 << SSH2_CIPHER_CAMELLIA192_CTR | 1 << SSH2_CIPHER_CAMELLIA256_CTR -#endif // WITH_CAMELLIA_DRAFT ); int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) | (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT); Modified: trunk/ttssh2/ttxssh/ssh.h =================================================================== --- trunk/ttssh2/ttxssh/ssh.h 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/ttssh2/ttxssh/ssh.h 2011-08-28 14:23:32 UTC (rev 4601) @@ -51,9 +51,7 @@ extern const EVP_CIPHER *evp_des3_ctr(void); extern const EVP_CIPHER *evp_bf_ctr(void); extern const EVP_CIPHER *evp_cast5_ctr(void); -#ifdef WITH_CAMELLIA_DRAFT extern const EVP_CIPHER *evp_camellia_128_ctr(void); -#endif // WITH_CAMELLIA_DRAFT /* Some of this code has been adapted from Ian Goldberg's Pilot SSH */ @@ -91,13 +89,9 @@ SSH2_CIPHER_ARCFOUR, SSH2_CIPHER_ARCFOUR128, SSH2_CIPHER_ARCFOUR256, SSH2_CIPHER_CAST128_CBC, SSH2_CIPHER_3DES_CTR, SSH2_CIPHER_BLOWFISH_CTR, SSH2_CIPHER_CAST128_CTR, -#ifdef WITH_CAMELLIA_DRAFT SSH2_CIPHER_CAMELLIA128_CBC, SSH2_CIPHER_CAMELLIA192_CBC, SSH2_CIPHER_CAMELLIA256_CBC, SSH2_CIPHER_CAMELLIA128_CTR, SSH2_CIPHER_CAMELLIA192_CTR, SSH2_CIPHER_CAMELLIA256_CTR, SSH_CIPHER_MAX = SSH2_CIPHER_CAMELLIA256_CTR, -#else // WITH_CAMELLIA_DRAFT - SSH_CIPHER_MAX = SSH2_CIPHER_CAST128_CTR, -#endif // WITH_CAMELLIA_DRAFT } SSHCipher; typedef enum { @@ -300,7 +294,6 @@ {SSH2_CIPHER_3DES_CTR, "3des-ctr", 8, 24, 0, evp_des3_ctr}, // RFC4344 {SSH2_CIPHER_BLOWFISH_CTR, "blowfish-ctr", 8, 16, 0, evp_bf_ctr}, // RFC4344 {SSH2_CIPHER_CAST128_CTR, "cast128-ctr", 8, 16, 0, evp_cast5_ctr}, // RFC4344 -#ifdef WITH_CAMELLIA_DRAFT {SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc", 16, 16, 0, EVP_camellia_128_cbc}, // draft-kanno-secsh-camellia-02 {SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc", 16, 24, 0, EVP_camellia_192_cbc}, // draft-kanno-secsh-camellia-02 {SSH2_CIPHER_CAMELLIA256_CBC, "camellia256-cbc", 16, 32, 0, EVP_camellia_256_cbc}, // draft-kanno-secsh-camellia-02 @@ -315,7 +308,6 @@ {SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr ＠ openssh.org", 16, 24, 0, evp_camellia_128_ctr}, {SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr ＠ openssh.org", 16, 32, 0, evp_camellia_128_ctr}, #endif // WITH_CAMELLIA_PRIVATE -#endif // WITH_CAMELLIA_DRAFT {SSH_CIPHER_NONE, NULL, 0, 0, 0, NULL}, }; Modified: trunk/ttssh2/ttxssh/ttxssh.c =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.c 2011-08-28 14:02:55 UTC (rev 4600) +++ trunk/ttssh2/ttxssh/ttxssh.c 2011-08-28 14:23:32 UTC (rev 4601) @@ -234,7 +234,6 @@ #else // for SSH2(yutaka) static char default_strings[] = { -#ifdef WITH_CAMELLIA_DRAFT SSH2_CIPHER_CAMELLIA256_CTR, SSH2_CIPHER_AES256_CTR, SSH2_CIPHER_CAMELLIA256_CBC, @@ -247,14 +246,6 @@ SSH2_CIPHER_AES128_CTR, SSH2_CIPHER_CAMELLIA128_CBC, SSH2_CIPHER_AES128_CBC, -#else // WITH_CAMELLIA_DRAFT - SSH2_CIPHER_AES256_CTR, - SSH2_CIPHER_AES256_CBC, - SSH2_CIPHER_AES192_CTR, - SSH2_CIPHER_AES192_CBC, - SSH2_CIPHER_AES128_CTR, - SSH2_CIPHER_AES128_CBC, -#endif // WITH_CAMELLIA_DRAFT SSH2_CIPHER_3DES_CTR, SSH2_CIPHER_3DES_CBC, SSH2_CIPHER_BLOWFISH_CTR, @@ -2338,11 +2329,7 @@ // TTSSH??????????? (2005.2.28 yutaka) get_file_version("ttxssh.dll", &a, &b, &c, &d); _snprintf_s(buf, sizeof(buf), _TRUNCATE, -#ifdef WITH_CAMELLIA_DRAFT - "TTSSH\r\nTera Term Secure Shell extension, %d.%d with Camellia support", a, b); -#else - "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b); -#endif + "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b); SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf); // OpenSSL??????????? (2005.1.24 yutaka) @@ -2557,7 +2544,6 @@ return "Blowfish-CTR(SSH2)"; case SSH2_CIPHER_CAST128_CTR: return "CAST128-CTR(SSH2)"; -#ifdef WITH_CAMELLIA_DRAFT case SSH2_CIPHER_CAMELLIA128_CBC: return "Camellia128-CBC(SSH2)"; case SSH2_CIPHER_CAMELLIA192_CBC: @@ -2570,7 +2556,6 @@ return "Camellia192-CTR(SSH2)"; case SSH2_CIPHER_CAMELLIA256_CTR: return "Camellia256-CTR(SSH2)"; -#endif // WITH_CAMELLIA_DRAFT default: return NULL; From svnnotify ＠ sourceforge.jp Tue Aug 30 23:09:13 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Tue, 30 Aug 2011 23:09:13 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MDJdICDjg6Hjg4Pjgrvjg7zjgrjjga4=?= =?utf-8?b?5L+u5q2j44KS5Y+N5pig?= Message-ID: <1314713353.902588.8818.nullmailer@users.sourceforge.jp> Revision: 4602 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4602 Author: maya Date: 2011-08-30 23:09:13 +0900 (Tue, 30 Aug 2011) Log Message: ----------- メッセージの修正を反映 Modified Paths: -------------- trunk/installer/release/lang/English.lng trunk/ttssh2/ttxssh/hosts.c -------------- next part -------------- Modified: trunk/installer/release/lang/English.lng =================================================================== --- trunk/installer/release/lang/English.lng 2011-08-28 14:23:32 UTC (rev 4601) +++ trunk/installer/release/lang/English.lng 2011-08-30 14:09:13 UTC (rev 4602) @@ -662,12 +662,12 @@ DLG_UNKNOWNHOST_FINGERPRINT=The server's host key fingerprint is: DLG_UNKNOWNHOST_ADD=&Add this machine and its key to the known hosts list -DLG_HOSTKEY_SSHFP_NOTFOUND=SSHFP RR not found. -DLG_HOSTKEY_SSHFP_MATCH=SSHFP RR found and match. -DLG_HOSTKEY_SSHFP_MISMATCH=SSHFP RR found but not match. -DLG_HOSTKEY_SSHFP_DIFFTYPE=SSHFP RR found but different type. -DLG_HOSTKEY_DNSSEC_NG=SSHFP RR is *not* authenticated by DNSSEC. -DLG_HOSTKEY_DNSSEC_OK=SSHFP RR is authenticated by DNSSEC. +DLG_HOSTKEY_SSHFP_NOTFOUND=No host key fingerprint found in DNS. +DLG_HOSTKEY_SSHFP_MATCH=Matching host key fingerprint found in DNS. +DLG_HOSTKEY_SSHFP_MISMATCH=Mismatching host key fingerprint found in DNS. +DLG_HOSTKEY_SSHFP_DIFFTYPE=Mismatching host key type found in DNS. +DLG_HOSTKEY_DNSSEC_NG=Found insecure fingerprint in DNS. +DLG_HOSTKEY_DNSSEC_OK=Found secure fingerprint in DNS. ; crypt.c MSG_ENCRYPT_ERROR1=%s encrypt error(1): bytes %d (%d) Modified: trunk/ttssh2/ttxssh/hosts.c =================================================================== --- trunk/ttssh2/ttxssh/hosts.c 2011-08-28 14:23:32 UTC (rev 4601) +++ trunk/ttssh2/ttxssh/hosts.c 2011-08-30 14:09:13 UTC (rev 4602) @@ -1311,22 +1311,22 @@ switch (pvar->dns_key_check) { case DNS_VERIFY_NOTFOUND: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "SSHFP RR not found."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "No host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_MATCH: case DNS_VERIFY_AUTH_MATCH: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "SSHFP RR found and match."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "Matching host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_MISMATCH: case DNS_VERIFY_AUTH_MISMATCH: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "SSHFP RR found but not match."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "Mismatching host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_DIFFERENTTYPE: case DNS_VERIFY_AUTH_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "SSHFP RR found but different type."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "Mismatching host key type found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; } @@ -1335,13 +1335,13 @@ case DNS_VERIFY_MATCH: case DNS_VERIFY_MISMATCH: case DNS_VERIFY_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "SSHFP RR is *not* authenticated by DNSSEC."); + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "Found insecure fingerprint in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); break; case DNS_VERIFY_AUTH_MATCH: case DNS_VERIFY_AUTH_MISMATCH: case DNS_VERIFY_AUTH_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "SSHFP RR is authenticated by DNSSEC."); + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "Found secure fingerprint in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); break; } @@ -1457,22 +1457,22 @@ switch (pvar->dns_key_check) { case DNS_VERIFY_NOTFOUND: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "SSHFP RR not found."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "No host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_MATCH: case DNS_VERIFY_AUTH_MATCH: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "SSHFP RR found and match."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "Matching host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_MISMATCH: case DNS_VERIFY_AUTH_MISMATCH: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "SSHFP RR found but not match."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "Mismatching host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_DIFFERENTTYPE: case DNS_VERIFY_AUTH_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "SSHFP RR found but different type."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "Mismatching host key type found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; } @@ -1481,13 +1481,13 @@ case DNS_VERIFY_MATCH: case DNS_VERIFY_MISMATCH: case DNS_VERIFY_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "SSHFP RR is *not* authenticated by DNSSEC."); + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "Found insecure fingerprint in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); break; case DNS_VERIFY_AUTH_MATCH: case DNS_VERIFY_AUTH_MISMATCH: case DNS_VERIFY_AUTH_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "SSHFP RR is authenticated by DNSSEC."); + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "Found secure fingerprint in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); break; } @@ -1601,22 +1601,22 @@ switch (pvar->dns_key_check) { case DNS_VERIFY_NOTFOUND: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "SSHFP RR not found."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_NOTFOUND", pvar, "No host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_MATCH: case DNS_VERIFY_AUTH_MATCH: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "SSHFP RR found and match."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MATCH", pvar, "Matching host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_MISMATCH: case DNS_VERIFY_AUTH_MISMATCH: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "SSHFP RR found but not match."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_MISMATCH", pvar, "Mismatching host key fingerprint found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; case DNS_VERIFY_DIFFERENTTYPE: case DNS_VERIFY_AUTH_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "SSHFP RR found but different type."); + UTIL_get_lang_msg("DLG_HOSTKEY_SSHFP_DIFFTYPE", pvar, "Mismatching host key type found in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPCHECK, pvar->ts->UIMsg); break; } @@ -1625,13 +1625,13 @@ case DNS_VERIFY_MATCH: case DNS_VERIFY_MISMATCH: case DNS_VERIFY_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "SSHFP RR is *not* authenticated by DNSSEC."); + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_NG", pvar, "Found insecure fingerprint in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); break; case DNS_VERIFY_AUTH_MATCH: case DNS_VERIFY_AUTH_MISMATCH: case DNS_VERIFY_AUTH_DIFFERENTTYPE: - UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "SSHFP RR is authenticated by DNSSEC."); + UTIL_get_lang_msg("DLG_HOSTKEY_DNSSEC_OK", pvar, "Found secure fingerprint in DNS."); SetDlgItemText(dlg, IDC_HOSTSSHFPDNSSEC, pvar->ts->UIMsg); break; } From svnnotify ＠ sourceforge.jp Wed Aug 31 21:23:14 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 21:23:14 +0900 Subject: [Ttssh2-commit] [4603] bump Message-ID: <1314793394.499585.8123.nullmailer@users.sourceforge.jp> Revision: 4603 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4603 Author: maya Date: 2011-08-31 21:23:14 +0900 (Wed, 31 Aug 2011) Log Message: ----------- bump Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/installer/teraterm.iss trunk/teraterm/teraterm/ttermpro.rc trunk/teraterm/ttpmacro/ttpmacro.rc trunk/ttssh2/ttxssh/ttxssh.rc -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-30 14:09:13 UTC (rev 4602) +++ trunk/doc/en/html/about/history.html 2011-08-31 12:23:14 UTC (rev 4603) @@ -31,7 +31,7 @@

                          Tera Term

                          -

                          2011.x.x (Ver 4.71)

                          +

                          2011.8.31 (Ver 4.71)

                          • Changes
                              @@ -1715,7 +1715,7 @@

                              TTSSH

                              -

                              2011.x.x (Ver 2.58)

                              +

                              2011.8.31 (Ver 2.58)

                              • Changes
                                  Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-30 14:09:13 UTC (rev 4602) +++ trunk/doc/ja/html/about/history.html 2011-08-31 12:23:14 UTC (rev 4603) @@ -31,7 +31,7 @@

                                  Tera Term

                                  -

                                  2011.x.x (Ver 4.71)

                                  +

                                  2011.8.31 (Ver 4.71)

                                  • ??
                                      @@ -1716,7 +1716,7 @@

                                      TTSSH

                                      -

                                      2011.x.x (Ver 2.58)

                                      +

                                      2011.8.31 (Ver 2.58)

                                      • ??
                                          Modified: trunk/installer/teraterm.iss =================================================================== --- trunk/installer/teraterm.iss 2011-08-30 14:09:13 UTC (rev 4602) +++ trunk/installer/teraterm.iss 2011-08-31 12:23:14 UTC (rev 4603) @@ -1,5 +1,5 @@ #define AppName "Tera Term" -#define AppVer "4.71-RC1" +#define AppVer "4.71" ;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); [Setup] Modified: trunk/teraterm/teraterm/ttermpro.rc =================================================================== --- trunk/teraterm/teraterm/ttermpro.rc 2011-08-30 14:09:13 UTC (rev 4602) +++ trunk/teraterm/teraterm/ttermpro.rc 2011-08-31 12:23:14 UTC (rev 4603) @@ -374,8 +374,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,70,0,0 - PRODUCTVERSION 4,70,0,0 + FILEVERSION 4,71,0,0 + PRODUCTVERSION 4,71,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -392,12 +392,12 @@ BEGIN VALUE "CompanyName", "TeraTerm Project T. Teranishi" VALUE "FileDescription", "Tera Term" - VALUE "FileVersion", "4, 70, 0, 0" + VALUE "FileVersion", "4, 71, 0, 0" VALUE "InternalName", "TTERMPRO" VALUE "LegalCopyright", "(C)TeraTerm Project 2004-2011, (C)T. Teranishi 1994-1998" VALUE "OriginalFilename", "TTERMPRO.EXE" VALUE "ProductName", "Tera Term" - VALUE "ProductVersion", "4, 70, 0, 0" + VALUE "ProductVersion", "4, 71, 0, 0" END END BLOCK "VarFileInfo" Modified: trunk/teraterm/ttpmacro/ttpmacro.rc =================================================================== --- trunk/teraterm/ttpmacro/ttpmacro.rc 2011-08-30 14:09:13 UTC (rev 4602) +++ trunk/teraterm/ttpmacro/ttpmacro.rc 2011-08-31 12:23:14 UTC (rev 4603) @@ -104,8 +104,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,70,0,0 - PRODUCTVERSION 4,70,0,0 + FILEVERSION 4,71,0,0 + PRODUCTVERSION 4,71,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -122,12 +122,12 @@ BEGIN VALUE "CompanyName", "TeraTerm Project T. Teranishi" VALUE "FileDescription", "TTPMACRO" - VALUE "FileVersion", "4, 70, 0, 0" + VALUE "FileVersion", "4, 71, 0, 0" VALUE "InternalName", "TTPMACRO" VALUE "LegalCopyright", "Copyright (C) TeraTerm Project 2004-2011, T. Teranishi 1994-1998" VALUE "OriginalFilename", "TTPMACRO.EXE" VALUE "ProductName", "TTPMACRO" - VALUE "ProductVersion", "4, 70, 0, 0" + VALUE "ProductVersion", "4, 71, 0, 0" END END BLOCK "VarFileInfo" Modified: trunk/ttssh2/ttxssh/ttxssh.rc =================================================================== --- trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-30 14:09:13 UTC (rev 4602) +++ trunk/ttssh2/ttxssh/ttxssh.rc 2011-08-31 12:23:14 UTC (rev 4603) @@ -551,8 +551,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,57,0,0 - PRODUCTVERSION 2,57,0,0 + FILEVERSION 2,58,0,0 + PRODUCTVERSION 2,58,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -568,12 +568,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "TTXSSH" - VALUE "FileVersion", "2, 57, 0, 0" + VALUE "FileVersion", "2, 58, 0, 0" VALUE "InternalName", "TTXSSH" VALUE "LegalCopyright", "(C)2004-2011 TeraTerm Project, (C)1998-1999 Robert O'Callahan" VALUE "OriginalFilename", "TTXSSH.dll" VALUE "ProductName", "TTSSH" - VALUE "ProductVersion", "2, 57, 0, 0" + VALUE "ProductVersion", "2, 58, 0, 0" END END BLOCK "VarFileInfo" From svnnotify ＠ sourceforge.jp Wed Aug 31 21:24:04 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 21:24:04 +0900 Subject: [Ttssh2-commit] [4604] Release 4.71 Message-ID: <1314793444.032516.10057.nullmailer@users.sourceforge.jp> Revision: 4604 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4604 Author: maya Date: 2011-08-31 21:24:03 +0900 (Wed, 31 Aug 2011) Log Message: ----------- Release 4.71 Added Paths: ----------- tags/teraterm-4_71/ -------------- next part -------------- From svnnotify ＠ sourceforge.jp Wed Aug 31 22:17:52 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 22:17:52 +0900 Subject: [Ttssh2-commit] [4605] unfrozen Message-ID: <1314796672.673109.2416.nullmailer@users.sourceforge.jp> Revision: 4605 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4605 Author: maya Date: 2011-08-31 22:17:52 +0900 (Wed, 31 Aug 2011) Log Message: ----------- unfrozen Modified Paths: -------------- tags/teraterm-4_71/installer/teraterm.iss -------------- next part -------------- Modified: tags/teraterm-4_71/installer/teraterm.iss =================================================================== --- tags/teraterm-4_71/installer/teraterm.iss 2011-08-31 12:24:03 UTC (rev 4604) +++ tags/teraterm-4_71/installer/teraterm.iss 2011-08-31 13:17:52 UTC (rev 4605) @@ -1,6 +1,6 @@ #define AppName "Tera Term" #define AppVer "4.71" -;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); +#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); [Setup] AppCopyright=TeraTerm Project @@ -795,5 +795,5 @@ [InnoIDE_PreCompile] Name: makechm.bat -Name: build.bat; Parameters: rebuild -;Name: build.bat +;Name: build.bat; Parameters: rebuild +Name: build.bat From svnnotify ＠ sourceforge.jp Wed Aug 31 22:25:11 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 22:25:11 +0900 Subject: [Ttssh2-commit] [4606] revert r4605 Message-ID: <1314797111.722999.10407.nullmailer@users.sourceforge.jp> Revision: 4606 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4606 Author: maya Date: 2011-08-31 22:25:11 +0900 (Wed, 31 Aug 2011) Log Message: ----------- revert r4605 Modified Paths: -------------- tags/teraterm-4_71/installer/teraterm.iss -------------- next part -------------- Modified: tags/teraterm-4_71/installer/teraterm.iss =================================================================== --- tags/teraterm-4_71/installer/teraterm.iss 2011-08-31 13:17:52 UTC (rev 4605) +++ tags/teraterm-4_71/installer/teraterm.iss 2011-08-31 13:25:11 UTC (rev 4606) @@ -1,6 +1,6 @@ #define AppName "Tera Term" #define AppVer "4.71" -#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); +;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); [Setup] AppCopyright=TeraTerm Project @@ -795,5 +795,5 @@ [InnoIDE_PreCompile] Name: makechm.bat -;Name: build.bat; Parameters: rebuild -Name: build.bat +Name: build.bat; Parameters: rebuild +;Name: build.bat From svnnotify ＠ sourceforge.jp Wed Aug 31 22:25:24 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 22:25:24 +0900 Subject: [Ttssh2-commit] [4607] unfrozen Message-ID: <1314797124.803847.10445.nullmailer@users.sourceforge.jp> Revision: 4607 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4607 Author: maya Date: 2011-08-31 22:25:24 +0900 (Wed, 31 Aug 2011) Log Message: ----------- unfrozen Modified Paths: -------------- trunk/installer/teraterm.iss -------------- next part -------------- Modified: trunk/installer/teraterm.iss =================================================================== --- trunk/installer/teraterm.iss 2011-08-31 13:25:11 UTC (rev 4606) +++ trunk/installer/teraterm.iss 2011-08-31 13:25:24 UTC (rev 4607) @@ -1,6 +1,6 @@ #define AppName "Tera Term" #define AppVer "4.71" -;#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); +#define snapshot GetDateTimeString('yyyymmdd_hhnnss', '', ''); [Setup] AppCopyright=TeraTerm Project @@ -795,5 +795,5 @@ [InnoIDE_PreCompile] Name: makechm.bat -Name: build.bat; Parameters: rebuild -;Name: build.bat +;Name: build.bat; Parameters: rebuild +Name: build.bat From svnnotify ＠ sourceforge.jp Wed Aug 31 22:26:25 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 22:26:25 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MDhdICBUVExFZGl0b3Ig44KSIDEgLiAz?= =?utf-8?b?IOOBq+abtOaWsA==?= Message-ID: <1314797185.553290.12428.nullmailer@users.sourceforge.jp> Revision: 4608 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4608 Author: maya Date: 2011-08-31 22:26:25 +0900 (Wed, 31 Aug 2011) Log Message: ----------- TTLEditor を 1.3 に更新 Modified Paths: -------------- trunk/installer/teraterm.iss -------------- next part -------------- Modified: trunk/installer/teraterm.iss =================================================================== --- trunk/installer/teraterm.iss 2011-08-31 13:25:24 UTC (rev 4607) +++ trunk/installer/teraterm.iss 2011-08-31 13:26:25 UTC (rev 4608) @@ -74,7 +74,7 @@ Source: ..\cygterm\cyglaunch.exe; DestDir: {app}; Components: cygterm Source: ..\cygterm\cygterm+.tar.gz; DestDir: {app}; Components: cygterm Source: ..\libs\logmett\Setup_LogMeTT_2_9_9_1.exe; DestDir: {tmp}; Components: LogMeTT; Flags: deleteafterinstall -Source: ..\libs\logmett\Setup_TTLEditor_1_2_1.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall +Source: ..\libs\logmett\Setup_TTLEditor_1_3.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall Source: ..\ttpmenu\Release\ttpmenu.exe; DestDir: {app}; Components: TeraTerm_Menu; Flags: ignoreversion Source: release\ttmenu_readme-j.txt; DestDir: {app}; Components: TeraTerm_Menu Source: ..\TTProxy\Release\TTXProxy.dll; DestDir: {app}; Components: TTProxy; Flags: ignoreversion @@ -208,7 +208,7 @@ [Run] Filename: {app}\ttermpro.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_teraterm}; Components: TeraTerm Filename: {tmp}\Setup_LogMeTT_2_9_9_1.exe; Components: LogMeTT -Filename: {tmp}\Setup_TTLEditor_1_2_1.exe; Components: TTLEdit +Filename: {tmp}\Setup_TTLEditor_1_3.exe; Components: TTLEdit Filename: {app}\ttpmenu.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_ttmenu}; Components: TeraTerm_Menu Filename: {app}\Collector\Collector.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_collector}; Components: Collector From svnnotify ＠ sourceforge.jp Wed Aug 31 23:08:02 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 23:08:02 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MDldIFhNT0RFTTogIOmAgeS/oeaZgg==?= =?utf-8?b?44CB5Yid5Zue44Gu44OR44Kx44OD44OI44GMMuWbnumAgeOCieOCjOOCiw==?= =?utf-8?b?5ZWP6aGM44KS5L+u5q2j44GX44Gf44CC?= Message-ID: <1314799682.566529.26424.nullmailer@users.sourceforge.jp> Revision: 4609 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4609 Author: yutakapon Date: 2011-08-31 23:08:02 +0900 (Wed, 31 Aug 2011) Log Message: ----------- XMODEM: ??拭??????????宴????2?????????蕁??篆???????cf. http://logmett.com/forum/viewtopic.php?f=2&t=354 Modified Paths: -------------- trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html trunk/teraterm/ttpfile/xmodem.c -------------- next part -------------- Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2011-08-31 13:26:25 UTC (rev 4608) +++ trunk/doc/en/html/about/history.html 2011-08-31 14:08:02 UTC (rev 4609) @@ -31,6 +31,27 @@

                                          Tera Term

                                          +

                                          2011.xx.xx (Ver 4.72)

                                          + +

                                          2011.8.31 (Ver 4.71)

                                          • Changes Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2011-08-31 13:26:25 UTC (rev 4608) +++ trunk/doc/ja/html/about/history.html 2011-08-31 14:08:02 UTC (rev 4609) @@ -31,6 +31,27 @@

                                            Tera Term

                                            +

                                            2011.xx.xx (Ver 4.72)

                                            + +

                                            2011.8.31 (Ver 4.71)

                                            • ?? Modified: trunk/teraterm/ttpfile/xmodem.c =================================================================== --- trunk/teraterm/ttpfile/xmodem.c 2011-08-31 13:26:25 UTC (rev 4608) +++ trunk/teraterm/ttpfile/xmodem.c 2011-08-31 14:08:02 UTC (rev 4609) @@ -417,11 +417,10 @@ case CAN: break; case 0x43: - if ((xv->PktNum == 0) && (xv->PktNumOffset == 0)) { - if ((xv->XOpt == XoptCheck) && (xv->PktNumSent == 0)) + if ((xv->PktNum == 0) && (xv->PktNumOffset == 0) && (xv->PktNumSent == 0)) { + if ((xv->XOpt == XoptCheck)) XSetOpt(fv, xv, XoptCRC); - if (xv->XOpt != XoptCheck) - SendFlag = TRUE; + SendFlag = TRUE; } break; } From svnnotify ＠ sourceforge.jp Wed Aug 31 23:44:49 2011 From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp) Date: Wed, 31 Aug 2011 23:44:49 +0900 Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MTBdICDms6jph4jjga7ov73liqDjgao=?= =?utf-8?b?44Gp44CC?= Message-ID: <1314801889.843699.31635.nullmailer@users.sourceforge.jp> Revision: 4610 http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4610 Author: yutakapon Date: 2011-08-31 23:44:49 +0900 (Wed, 31 Aug 2011) Log Message: ----------- 羈????申?????? Modified Paths: -------------- trunk/doc/en/html/macro/command/break.html trunk/doc/en/html/macro/command/call.html trunk/doc/en/html/macro/command/end.html trunk/doc/en/html/macro/command/exit.html trunk/doc/en/html/macro/command/include.html trunk/doc/ja/html/macro/command/break.html trunk/doc/ja/html/macro/command/call.html trunk/doc/ja/html/macro/command/end.html trunk/doc/ja/html/macro/command/exit.html trunk/doc/ja/html/macro/command/include.html -------------- next part -------------- Modified: trunk/doc/en/html/macro/command/break.html =================================================================== --- trunk/doc/en/html/macro/command/break.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/en/html/macro/command/break.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -46,5 +46,12 @@ endwhile +

                                              Reference

                                              + +do, loop
                                              +for, next
                                              +until, enduntil
                                              +while, endwhile
                                              + Modified: trunk/doc/en/html/macro/command/call.html =================================================================== --- trunk/doc/en/html/macro/command/call.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/en/html/macro/command/call.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -43,5 +43,9 @@ return +

                                              Reference

                                              + +return
                                              + Modified: trunk/doc/en/html/macro/command/end.html =================================================================== --- trunk/doc/en/html/macro/command/end.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/en/html/macro/command/end.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -24,8 +24,15 @@

                                              Remarks

                                              -MACRO is also closed. +MACRO is also closed.
                                              +This command is not strictly equal to the exit command.

                                              +

                                              See also

                                              + + + Modified: trunk/doc/en/html/macro/command/exit.html =================================================================== --- trunk/doc/en/html/macro/command/exit.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/en/html/macro/command/exit.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -24,13 +24,15 @@

                                              Remarks

                                              -Exits the include file and returns to the main file. +Exits the include file and returns to the main file.
                                              +Quits the execution of the macro by using this command in the main file(equivalent of end command).

                                              See also

                                              Modified: trunk/doc/en/html/macro/command/include.html =================================================================== --- trunk/doc/en/html/macro/command/include.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/en/html/macro/command/include.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -55,7 +55,7 @@

                                              Reference

                                              Note: Loading a macro file
                                              +exit
                                              - Modified: trunk/doc/ja/html/macro/command/break.html =================================================================== --- trunk/doc/ja/html/macro/command/break.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/ja/html/macro/command/break.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -46,5 +46,12 @@ endwhile +

                                              ??/h2> + +do, loop
                                              +for, next
                                              +until, enduntil
                                              +while, endwhile
                                              + Modified: trunk/doc/ja/html/macro/command/call.html =================================================================== --- trunk/doc/ja/html/macro/command/call.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/ja/html/macro/command/call.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -43,5 +43,9 @@ return +

                                              ??/h2> + +return
                                              + Modified: trunk/doc/ja/html/macro/command/end.html =================================================================== --- trunk/doc/ja/html/macro/command/end.html 2011-08-31 14:08:02 UTC (rev 4609) +++ trunk/doc/ja/html/macro/command/end.html 2011-08-31 14:44:49 UTC (rev 4610) @@ -14,7 +14,7 @@

                                              end

                                              -TTL ?ﾀ??????B +????ﾀ??????????B 

                                              @@ -24,8 +24,15 @@
 
                                              ??
                                              
 
 
                                              
-MACRO ?????B
+MACRO ?????B
                                              
+exit?????????????
 
                                              
 
+
                                              ??/h2>
+
+
+
 
 

Modified: trunk/doc/ja/html/macro/command/exit.html
===================================================================
--- trunk/doc/ja/html/macro/command/exit.html	2011-08-31 14:08:02 UTC (rev 4609)
+++ trunk/doc/ja/html/macro/command/exit.html	2011-08-31 14:44:49 UTC (rev 4610)
@@ -24,13 +24,15 @@
 
                                              ??
                                              
 
 
                                              
-??????????????????????????
+??????????????????????????
                                              
+??????????????????ﾀ??????????iend?????????
 
                                              
 
 
                                              ??/h2>
 
 
 
 

Modified: trunk/doc/ja/html/macro/command/include.html
===================================================================
--- trunk/doc/ja/html/macro/command/include.html	2011-08-31 14:08:02 UTC (rev 4609)
+++ trunk/doc/ja/html/macro/command/include.html	2011-08-31 14:44:49 UTC (rev 4610)
@@ -55,6 +55,7 @@
 
                                              ??/h2>
 
 ?: ????????????
                                              
+exit
                                              
 
 
 

From svnnotify ＠ sourceforge.jp  Wed Aug 31 23:54:51 2011
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 31 Aug 2011 23:54:51 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzQ2MTFdICDph43oqIDjga7kv67mraPjgII=?=
Message-ID: <1314802491.361453.10807.nullmailer@users.sourceforge.jp>

Revision: 4611
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4611
Author:   yutakapon
Date:     2011-08-31 23:54:51 +0900 (Wed, 31 Aug 2011)

Log Message:
-----------
?????信罩ｃ?

Modified Paths:
--------------
    trunk/doc/ja/html/macro/command/ifthenelseif.html


-------------- next part --------------
Modified: trunk/doc/ja/html/macro/command/ifthenelseif.html
===================================================================
--- trunk/doc/ja/html/macro/command/ifthenelseif.html	2011-08-31 14:44:49 UTC (rev 4610)
+++ trunk/doc/ja/html/macro/command/ifthenelseif.html	2011-08-31 14:54:51 UTC (rev 4611)
@@ -67,7 +67,7 @@
 
                                              
 'then' ? 'if' ? 'elseif' ??????????????
                                              
 'elseif' ? 'else' ????????
                                              
-'endif' ??????
+'endif' ????
 
                                              
 
 
                                              ?