svnno****@sourc*****
svnno****@sourc*****
2015年 11月 15日 (日) 19:25:50 JST
Tera TermRevision: 6132
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6132
Author: maya
Date: 2015-11-15 19:25:50 +0900 (Sun, 15 Nov 2015)
Log Message:
-----------
SSH ホスト鍵の fingerprint の表示を、MD5 形式か SHA256 形式か選択できるようにした
https://osdn.jp/ticket/browse.php?group_id=1412&tid=35602
Modified Paths:
--------------
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
trunk/installer/release/lang/Simplified Chinese.lng
trunk/installer/release/lang/Traditional Chinese.lng
trunk/ttssh2/ttxssh/hosts.c
trunk/ttssh2/ttxssh/key.c
trunk/ttssh2/ttxssh/resource.h
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/English.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
[Tera Term]
DLG_SYSTEM_FONT=System,14,0
@@ -506,6 +506,7 @@
; dlg about
DLG_ABOUT_TITLE=About TTSSH
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=Server ID:
DLG_ABOUT_PROTOCOL=Using protocol:
DLG_ABOUT_ENCRYPTION=Encryption:
@@ -577,6 +578,7 @@
DLG_DIFFERENTKEY_WARNING=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.
DLG_DIFFERENTKEY_WARNING2=If you choose to add this new key to the known hosts list and continue, then you will not receive this warning again.
DLG_DIFFERENTKEY_FINGERPRINT=The server's host key fingerprint is:
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=&Replace the exist key with this new key
; dlg diff type key
@@ -584,6 +586,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=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.
DLG_DIFFERENTTYPEKEY_WARNING2=If you choose to add this new key to the known hosts list and continue, then you will not receive this warning again.
DLG_DIFFERENTTYPEKEY_FINGERPRINT=The server's host key fingerprint is:
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTTYPEKEY_ADD=&Add this machine and its key to the known hosts list
; dlg fwd edit
@@ -725,6 +728,7 @@
DLG_UNKNOWNHOST_WARNING=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.
DLG_UNKNOWNHOST_WARNING2=If you choose to add this machine to the known hosts list and continue, then you will not receive this warning again.
DLG_UNKNOWNHOST_FINGERPRINT=The server's host key fingerprint is:
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=&Add this machine and its key to the known hosts list
DLG_HOSTKEY_SSHFP_NOTFOUND=No host key fingerprint found in DNS.
@@ -736,6 +740,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/French.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
; Last translated (French language) by Francois MOCQ (Jul 21 2010)
[Tera Term]
@@ -507,6 +507,7 @@
; dlg about
DLG_ABOUT_TITLE=A propos de TTSSH
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=ID du serveur:
DLG_ABOUT_PROTOCOL=Protocole utilis\xE9:
DLG_ABOUT_ENCRYPTION=Cryptage:
@@ -577,6 +578,7 @@
DLG_DIFFERENTKEY_WARNING=Votre liste d'h\xF4te connus a une entr\xE9e pour le serveur "####################################", mais la machine contact\xE9e a pr\xE9sent\xE9 une CLE DIFFERENTE ! Une machine hostile pourrait se faire passer pour le serveur.
DLG_DIFFERENTKEY_WARNING2=Si vous choisissez d'ajouter la nouvelle cl\xE9 \xE0 votre liste et de continuer, vous ne recevrez plus cet avertissement.
DLG_DIFFERENTKEY_FINGERPRINT=L'empreinte de la cl\xE9 du serveur est:
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=&Remplacer la cl\xE9 actuelle avec cette nouvelle cl\xE9
; dlg diff type key
@@ -584,6 +586,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=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.
DLG_DIFFERENTTYPEKEY_WARNING2=Si vous choisissez d'ajouter la nouvelle cl\xE9 \xE0 votre liste et de continuer, vous ne recevrez plus cet avertissement.
DLG_DIFFERENTTYPEKEY_FINGERPRINT=L'empreinte de la cl\xE9 du serveur est:
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTTYPEKEY_ADD=&Ajouter cette machine et sa cl\xE9 \xE0 la liste des h\xF4tes connus
; dlg fwd edit
@@ -725,6 +728,7 @@
DLG_UNKNOWNHOST_WARNING=Il n'y a pas d'entr\xE9e pour le serveur "#####################################" dans votre liste d'h\xF4tes connus. La machine que vous avez contact\xE9e pourrait \xEAtre une machine hostile se faisant passer pour le serveur.
DLG_UNKNOWNHOST_WARNING2=Si vous choisissez d'ajouter cette machine \xE0 la liste d'h\xF4tes connus et de continuer, vous ne recevrez plus cet avertissement.
DLG_UNKNOWNHOST_FINGERPRINT=L'empreinte de la cl\xE9 du serveur est:
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=&Ajouter cette machine et sa cl\xE9 \xE0 la liste des h\xF4tes connus
DLG_HOSTKEY_SSHFP_NOTFOUND=No host key fingerprint found in DNS.
@@ -736,6 +740,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/German.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
; Last translated (German language) by Frederik Schwarzer (May 17 2010)
[Tera Term]
@@ -507,6 +507,7 @@
; dlg about
DLG_ABOUT_TITLE=\xDCber TTSSH
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=Server-ID:
DLG_ABOUT_PROTOCOL=Verwendetes Protokoll:
DLG_ABOUT_ENCRYPTION=Verschl\xFCsselung:
@@ -577,6 +578,7 @@
DLG_DIFFERENTKEY_WARNING=Der Server ("####################################") ist in der "known hosts"-Liste bereits mit einem anderen Schl\xFCssel eingetragen.
DLG_DIFFERENTKEY_WARNING2=Wenn Sie auf 'Continue' klicken, wird der Server in die Liste aufgenommen und die Fehlermeldung erscheint nicht mehr.
DLG_DIFFERENTKEY_FINGERPRINT=Der Fingerabdruck des Schl\xFCssels:
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=Den vorhanden Schl\xFCssel durch den neuen ersetzen.
; dlg diff type key
@@ -584,6 +586,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=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.
DLG_DIFFERENTTYPEKEY_WARNING2=Wenn Sie auf 'Continue' klicken, wird der Server in die Liste aufgenommen und die Fehlermeldung erscheint nicht mehr.
DLG_DIFFERENTTYPEKEY_FINGERPRINT=Der Fingerabdruck des Schl\xFCssels:
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTTYPEKEY_ADD=Den Server zur "known hosts"-Liste hinzuf\xFCgen.
; dlg fwd edit
@@ -724,6 +727,7 @@
DLG_UNKNOWNHOST_WARNING=Es gibt f\xFCr diesen Server ("#####################################") keinen Eintrag in der "known hosts"-Liste.
DLG_UNKNOWNHOST_WARNING2=Wenn Sie auf 'Continue' klicken, wird der Server in die Liste aufgenommen und die Fehlermeldung erscheint nicht mehr.
DLG_UNKNOWNHOST_FINGERPRINT=Der Fingerabdruck des Schl\xFCssels:
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=Den Server zur "known hosts"-Liste hinzuf\xFCgen.
DLG_HOSTKEY_SSHFP_NOTFOUND=No host key fingerprint found in DNS.
@@ -735,6 +739,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/Japanese.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
[Tera Term]
DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -506,6 +506,7 @@
; dlg about
DLG_ABOUT_TITLE=TTSSH\x82ɂ‚\xA2\x82\xC4
+DLG_ABOUT_FP_HASH_ALGORITHM=\x8C\xAE\x8Ew\x96\xE4\x83n\x83b\x83V\x83\x85\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
DLG_ABOUT_SERVERID=\x83T\x81[\x83oID:
DLG_ABOUT_PROTOCOL=\x83v\x83\x8D\x83g\x83R\x83\x8B\x82̃o\x81[\x83W\x83\x87\x83\x93:
DLG_ABOUT_ENCRYPTION=\x88Í\x86\x89\xBB\x95\xFB\x8E\xAE:
@@ -577,6 +578,7 @@
DLG_DIFFERENTKEY_WARNING=knows hosts\x83\x8A\x83X\x83g\x92\x86\x82̃T\x81[\x83o"####################################"\x82̃G\x83\x93\x83g\x83\x8A\x82\xC6, \x90ڑ\xB1\x90\xE6\x82̃z\x83X\x83g\x8C\xAE\x82\xAA *\x88\xEA\x92v\x82\xB5\x82Ă\xA2\x82܂\xB9\x82\xF1* \x88\xAB\x88ӂ\xF0\x8E\x9D\x82\xC1\x82\xBD\x83z\x83X\x83g\x82\xAA, \x90ڑ\xB1\x82\xB5\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9\x83T\x81[\x83o\x82̂ӂ\xE8\x82\xF0\x82\xB5\x82Ă\xA2\x82\xE9\x89”\\x90\xAB\x82\xE0\x82\xA0\x82\xE8\x82܂\xB7\x82̂\xC5, \x8F\\x95\xAA\x92\x8D\x88ӂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2.
DLG_DIFFERENTKEY_WARNING2=known hosts\x83\x8A\x83X\x83g\x82ɂ\xB1\x82̃z\x83X\x83g\x82\xF0\x92lj\xC1\x82\xB5\x82đ\xB1\x8Ds\x82\xB7\x82\xE9\x82\xC6, \x8E\x9F\x89炱\x82̌x\x8D\x90\x82͏o\x82Ȃ\xAD\x82Ȃ\xE8\x82܂\xB7.
DLG_DIFFERENTKEY_FINGERPRINT=\x83T\x81[\x83o\x91\xA4\x82̃z\x83X\x83g\x8C\xAE\x8Ew\x96\xE4:
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=\x8C\xAE\x8Ew\x96\xE4\x83n\x83b\x83V\x83\x85\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
DLG_DIFFERENTKEY_REPLACE=\x8A\xF9\x91\xB6\x82̌\xAE\x82\xF0, \x90V\x82\xB5\x82\xA2\x8C\xAE\x82ŏ㏑\x82\xAB\x82\xB7\x82\xE9(&R)
; dlg diff type key
@@ -584,6 +586,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=knows hosts\x83\x8A\x83X\x83g\x92\x86\x82̃T\x81[\x83o"####################################"\x82̃G\x83\x93\x83g\x83\x8A\x82\xC6, \x90ڑ\xB1\x90\xE6\x82̃z\x83X\x83g\x8C\xAE\x82̎\xED\x97ނ\xAA *\x88\xEA\x92v\x82\xB5\x82Ă\xA2\x82܂\xB9\x82\xF1* \x88\xAB\x88ӂ\xF0\x8E\x9D\x82\xC1\x82\xBD\x83z\x83X\x83g\x82\xAA, \x90ڑ\xB1\x82\xB5\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9\x83T\x81[\x83o\x82̂ӂ\xE8\x82\xF0\x82\xB5\x82Ă\xA2\x82\xE9\x89”\\x90\xAB\x82\xE0\x82\xA0\x82\xE8\x82܂\xB7\x82̂\xC5, \x8F\\x95\xAA\x92\x8D\x88ӂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2.
DLG_DIFFERENTTYPEKEY_WARNING2=known hosts\x83\x8A\x83X\x83g\x82ɂ\xB1\x82̃z\x83X\x83g\x82\xF0\x92lj\xC1\x82\xB5\x82đ\xB1\x8Ds\x82\xB7\x82\xE9\x82\xC6, \x8E\x9F\x89炱\x82̌x\x8D\x90\x82͏o\x82Ȃ\xAD\x82Ȃ\xE8\x82܂\xB7.
DLG_DIFFERENTTYPEKEY_FINGERPRINT=\x83T\x81[\x83o\x91\xA4\x82̃z\x83X\x83g\x8C\xAE\x8Ew\x96\xE4:
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=\x8C\xAE\x8Ew\x96\xE4\x83n\x83b\x83V\x83\x85\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
DLG_DIFFERENTTYPEKEY_ADD=\x82\xB1\x82̃z\x83X\x83g\x82\xF0known hosts\x83\x8A\x83X\x83g\x82ɒlj\xC1\x82\xB7\x82\xE9(&A)
; dlg fwd edit
@@ -725,6 +728,7 @@
DLG_UNKNOWNHOST_WARNING=known hosts\x83\x8A\x83X\x83g\x82ɃT\x81[\x83o"#####################################"\x82̃G\x83\x93\x83g\x83\x8A\x82͂\xA0\x82\xE8\x82܂\xB9\x82\xF1. \x88\xAB\x88ӂ\xF0\x8E\x9D\x82\xC1\x82\xBD\x83z\x83X\x83g\x82\xAA, \x90ڑ\xB1\x82\xB5\x82悤\x82Ƃ\xB5\x82Ă\xA2\x82\xE9\x83T\x81[\x83o\x82̂ӂ\xE8\x82\xF0\x82\xB5\x82Ă\xA2\x82\xE9\x89”\\x90\xAB\x82\xE0\x82\xA0\x82\xE8\x82܂\xB7\x82̂\xC5, \x8F\\x95\xAA\x92\x8D\x88ӂ\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81I
DLG_UNKNOWNHOST_WARNING2=known hosts\x83\x8A\x83X\x83g\x82̂\xB1\x82̃z\x83X\x83g\x82\xF0\x92lj\xC1\x82\xB5\x82đ\xB1\x8Ds\x82\xB7\x82\xE9\x82\xC6, \x8E\x9F\x89炱\x82̌x\x8D\x90\x82͏o\x82Ȃ\xAD\x82Ȃ\xE8\x82܂\xB7.
DLG_UNKNOWNHOST_FINGERPRINT=\x83T\x81[\x83o\x91\xA4\x82̃z\x83X\x83g\x8C\xAE\x8Ew\x96\xE4:
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=\x8C\xAE\x8Ew\x96\xE4\x83n\x83b\x83V\x83\x85\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
DLG_UNKNOWNHOST_ADD=\x82\xB1\x82̃z\x83X\x83g\x82\xF0known hosts\x83\x8A\x83X\x83g\x82ɒlj\xC1\x82\xB7\x82\xE9(&A)
DLG_HOSTKEY_SSHFP_NOTFOUND=DNS\x82Ō\xAE\x8Ew\x96\xE4\x8F\xEE\x95\xA9\x82‚\xA9\x82\xE8\x82܂\xB9\x82\xF1\x82ł\xB5\x82\xBD\x81B
@@ -736,6 +740,7 @@
DLG_HOSTKEY_ROTATION_TITLE=\x83T\x81[\x83o\x83z\x83X\x83g\x8C\xAE\x82̍X\x90V
DLG_HOSTKEY_ROTATION_WARNING=\x90ڑ\xB1\x90\xE6\x82̃T\x81[\x83o`%s'\x82\xA9\x82\xE7\x83z\x83X\x83g\x8C\xAE\x88ꗗ\x82\xF0\x8E\xF3\x90M\x82\xB5\x82܂\xB5\x82\xBD.\n\x8DX\x90V\x82\xB7\x82\xE9\x82\xC6, known hosts\x83\x8A\x83X\x83g\x82\xC9%u\x8C‚̐V\x82\xB5\x82\xA2\x83z\x83X\x83g\x8C\xAE\x82\xF0\x92lj\xC1\x82\xB5\x81A%u\x8C‚̔p\x8E~\x82\xB3\x82ꂽ\x83z\x83X\x83g\x8C\xAE\x82\xF0\x8D폜\x82\xB5\x82܂\xB7.\nknown hosts\x83\x8A\x83X\x83g\x82\xF0\x8DX\x90V\x82\xB5\x82܂\xB7\x82\xA9?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=\x8C\xAE\x8Ew\x96\xE4\x83n\x83b\x83V\x83\x85\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80:
DLG_HOSTKEY_ROTATION_ADD=%u\x8C‚̐V\x82\xB5\x82\xA2\x83z\x83X\x83g\x8C\xAE:
DLG_HOSTKEY_ROTATION_REMOVE=%u\x8C‚̔p\x8E~\x82\xB3\x82ꂽ\x83z\x83X\x83g\x8C\xAE:
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/Korean.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
; Last translated (Korean language) by Daehong Kim (Jul 25 2013)
[Tera Term]
@@ -507,6 +507,7 @@
; dlg about
DLG_ABOUT_TITLE=TTSSH\xBF\xA1 \xB4\xEB\xC7Ͽ\xA9
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=\xBC\xAD\xB9\xF6 ID:
DLG_ABOUT_PROTOCOL=\xC7\xC1\xB7\xCE\xC5\xE4\xC4\xDD \xBB\xE7\xBF\xEB:
DLG_ABOUT_ENCRYPTION=\xBE\xCFȣȭ:
@@ -578,6 +579,7 @@
DLG_DIFFERENTKEY_WARNING=\xB4\xE7\xBD\xC5\xC0\xC7 known-host \xB8\xF1\xB7\xCF\xC0\xBA \xBC\xAD\xB9\xF6 "####################################"\xBF\xA1 \xB4\xEB\xC7\xD1 \xC7\xF1\xC0\xBB \xB0\xA1\xC1\xF6\xB0\xED \xC0ֽ\xC0\xB4ϴ\xD9, \xC7\xCF\xC1\xF6\xB8\xB8 \xB4\xE7\xBD\xC5\xC0\xCC \xC1\xA2\xBC\xD3\xC7ߴ\xF8 \xC4\xC4ǻ\xC5ʹ\xC2 \xB4\xE7\xBD\xC5\xC0\xC7 known-host \xB8\xF1\xB7\xCF\xC0\xC7 \xB0Ͱ\xFA \xB4ٸ\xA5 Ű\xB8\xA6 \xB0\xA1\xC1\xF6\xB0\xED \xC0ֽ\xC0\xB4ϴ\xD9. \xBE\xC7\xC0\xC7\xC0\xFB \xC4\xC4ǻ\xC5Ͱ\xA1 \xC7ش\xE7 \xBC\xAD\xB9\xF6\xB8\xA6 \xC8䳻\xB3\xBB\xB4\xC2 \xB0\xCD\xC0\xCF \xBC\xF6 \xC0ֽ\xC0\xB4ϴ\xD9.
DLG_DIFFERENTKEY_WARNING2=\xB8\xB8\xBE\xE0 \xC0\xCC \xBB\xF5\xB7ο\xEE Ű\xB8\xA6 known-host \xB8\xF1\xB7Ͽ\xA1 \xC3߰\xA1\xC7ϵ\xB5\xB7\xCF \xBC\xB1\xC5\xC3\xC7ϰ\xED \xB0\xE8\xBC\xD3 \xC1\xF8\xC7\xE0\xC7ϴٸ\xE9, \xB4ٽô\xC2 \xB0\xE6\xB0\xED \xB8\xC3\xC1\xF6\xB8\xA6 \xB9\xDE\xC1\xF6 \xBEʽ\xC0\xB4ϴ\xD9.
DLG_DIFFERENTKEY_FINGERPRINT=\xC0\xCC \xBC\xAD\xB9\xF6\xC0\xC7 ȣ\xBD\xBAƮŰ \xC1\xF6\xB9\xAE\xC0\xBA:
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=\xB1\xE2\xC1\xB8 Ű\xB8\xA6 \xBB\xF5 Ű\xB7\xCE \xB1\xB3ü(&R)
; dlg diff type key
@@ -726,6 +728,7 @@
DLG_UNKNOWNHOST_WARNING=\xB4\xE7\xBD\xC5\xC0\xC7 known-host \xB8\xF1\xB7Ͽ\xA1\xB4\xC2 \xBC\xAD\xB9\xF6 "#####################################" \xC7\xF1\xC0\xCC \xBE\xF8\xBD\xC0\xB4ϴ\xD9. \xB4\xE7\xBD\xC5\xC0\xCC \xC1\xA2\xBC\xD3\xC7\xD1 \xC4\xC4ǻ\xC5ʹ\xC2 \xB1\xD7 \xBC\xAD\xB9\xF6\xB8\xA6 \xC8䳻\xB3\xBB\xB4\xC2 \xBE\xC7\xC0\xC7\xC0\xFB\xC0\xCE \xC4\xC4ǻ\xC5\xCD\xC0\xCF \xBC\xF6 \xC0ֽ\xC0\xB4ϴ\xD9.
DLG_UNKNOWNHOST_WARNING2=known-host \xB8\xF1\xB7Ͽ\xA1 \xC0\xCC \xC4\xC4ǻ\xC5\xA6 \xC3߰\xA1\xC7ϰ\xED \xB0\xE8\xBC\xD3 \xC1\xF8\xC7\xE0\xC7ϸ\xE9 \xB4ٽô\xC2 \xB0\xE6\xB0\xED \xB8\xC3\xC1\xF6\xB8\xA6 \xB9\xDE\xC1\xF6 \xBEʽ\xC0\xB4ϴ\xD9.
DLG_UNKNOWNHOST_FINGERPRINT=\xBC\xAD\xB9\xF6\xC0\xC7 ȣ\xBD\xBAƮŰ \xC1\xF6\xB9\xAE\xC0\xBA:
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=\xC0\xCC \xC4\xC4ǻ\xC5Ϳ\xCD Ű\xB8\xA6 known-host \xB8\xF1\xB7Ͽ\xA1 \xC3߰\xA1(&A)
DLG_HOSTKEY_SSHFP_NOTFOUND=DNS\xBF\xA1\xBC\xAD \xB9߰ߵ\xC8 ȣ\xBD\xBAƮŰ \xC1\xF6\xB9\xAE\xC0\xCC \xBE\xF8\xBD\xBF.
@@ -737,6 +740,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/Russian.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
; Last translated (Russian language) by Ryumik Sergey (Mar 14 2015)
[Tera Term]
@@ -507,6 +507,7 @@
; dlg \xE8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF
DLG_ABOUT_TITLE=\xC8\xED\xF4\xEE\xF0\xEC\xE0\xF6\xE8\xFF \xEE TTSSH
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=\xD1\xE5\xF0\xE2\xE5\xF0 ID:
DLG_ABOUT_PROTOCOL=\xCF\xF0\xEE\xF2\xEE\xEA\xEE\xEB:
DLG_ABOUT_ENCRYPTION=\xD8\xE8\xF4\xF0\xEE\xE2\xE0\xED\xE8\xE5:
@@ -578,6 +579,7 @@
DLG_DIFFERENTKEY_WARNING=\xC2\xE0\xF8 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2 \xED\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xE5\xED \xE4\xEB\xFF \xF1\xE5\xF0\xE2\xE5\xF0\xE0 "####################################", \xED\xEE \xE2\xE0\xEC \xE4\xE0\xEB\xE8 \xC4\xD0\xD3\xC3\xCE\xC9 \xCA\xCB\xDE\xD7, \xF7\xF2\xEE\xE1\xFB \xEF\xEE\xEF\xE0\xF1\xF2\xFC \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2. \xC2\xF0\xE0\xE6\xE4\xE5\xE1\xED\xFB\xE9 \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0 \xEC\xEE\xE6\xE5\xF2 \xEF\xF0\xE8\xF2\xE2\xEE\xF0\xFF\xF2\xFC\xF1\xFF \xF1\xE5\xF0\xE2\xE5\xF0\xEE\xEC!
DLG_DIFFERENTKEY_WARNING2=\xC5\xF1\xEB\xE8 \xE2\xFB \xE4\xEE\xE1\xE0\xE2\xE8\xF2\xE5 \xED\xEE\xE2\xFB\xE9 \xEA\xEB\xFE\xF7 \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2 \xE8 \xEF\xF0\xEE\xE4\xEE\xEB\xE6\xE8\xF2\xE5, \xF2\xEE \xED\xE5 \xE1\xF3\xE4\xE5\xF2\xE5 \xEF\xEE\xEB\xF3\xF7\xE0\xF2\xFC \xFD\xF2\xEE \xEF\xF0\xE5\xE4\xF3\xEF\xF0\xE5\xE6\xE4\xE5\xED\xE8\xE5.
DLG_DIFFERENTKEY_FINGERPRINT=\xCE\xF2\xEF\xE5\xF7\xE0\xF2\xEE\xEA \xEA\xEB\xFE\xF7\xE0 \xF1\xE5\xF0\xE2\xE5\xF0\xE0 \xF5\xEE\xF1\xF2\xE0:
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=&\xC7\xE0\xEC\xE5\xED\xE8\xF2\xFC \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xFE\xF9\xE8\xE9 \xEA\xEB\xFE\xF7 \xED\xEE\xE2\xFB\xEC \xEA\xEB\xFE\xF7\xEE\xEC
; dlg diff type key
@@ -585,6 +587,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=\xC2\xE0\xF8 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2 \xED\xE5\xE8\xE7\xE2\xE5\xF1\xF2\xE5\xED \xE4\xEB\xFF \xF1\xE5\xF0\xE2\xE5\xF0\xE0 "####################################", \xED\xEE \xE2\xE0\xEC \xE4\xE0\xEB\xE8 \xC4\xD0\xD3\xC3\xCE\xC9 \xD2\xC8\xCF \xCA\xCB\xDE\xD7\xC0, \xF7\xF2\xEE\xE1\xFB \xEF\xEE\xEF\xE0\xF1\xF2\xFC \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2. \xC2\xF0\xE0\xE6\xE4\xE5\xE1\xED\xFB\xE9 \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0 \xEC\xEE\xE6\xE5\xF2 \xEF\xF0\xE8\xF2\xE2\xEE\xF0\xFF\xF2\xFC\xF1\xFF \xF1\xE5\xF0\xE2\xE5\xF0\xEE\xEC!
DLG_DIFFERENTTYPEKEY_WARNING2=\xC5\xF1\xEB\xE8 \xE2\xFB \xE4\xEE\xE1\xE0\xE2\xE8\xF2\xE5 \xED\xEE\xE2\xFB\xE9 \xEA\xEB\xFE\xF7 \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2 \xE8 \xEF\xF0\xEE\xE4\xEE\xEB\xE6\xE8\xF2\xE5, \xF2\xEE \xED\xE5 \xE1\xF3\xE4\xE5\xF2\xE5 \xEF\xEE\xEB\xF3\xF7\xE0\xF2\xFC \xFD\xF2\xEE \xEF\xF0\xE5\xE4\xF3\xEF\xF0\xE5\xE6\xE4\xE5\xED\xE8\xE5.
DLG_DIFFERENTTYPEKEY_FINGERPRINT=\xCE\xF2\xEF\xE5\xF7\xE0\xF2\xEE\xEA \xEA\xEB\xFE\xF7\xE0 \xF1\xE5\xF0\xE2\xE5\xF0\xE0 \xF5\xEE\xF1\xF2\xE0:
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTTYPEKEY_ADD=&\xC4\xEE\xE1\xE0\xE2\xE8\xF2\xFC \xFD\xF2\xEE\xF2 \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0 \xE8 \xE5\xE3\xEE \xEA\xEB\xFE\xF7 \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2
; dlg fwd edit
@@ -726,6 +729,7 @@
DLG_UNKNOWNHOST_WARNING=\xCD\xE5\xF2 \xE7\xE0\xEF\xE8\xF1\xE8 \xE4\xEB\xFF \xF1\xE5\xF0\xE2\xE5\xF0\xE0 "####################################" \xE2 \xF1\xEF\xE8\xF1\xEA\xE5 \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2. \xC2\xF0\xE0\xE6\xE4\xE5\xE1\xED\xFB\xE9 \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0 \xEC\xEE\xE6\xE5\xF2 \xEF\xF0\xE8\xF2\xE2\xEE\xF0\xFF\xF2\xFC\xF1\xFF \xF1\xE5\xF0\xE2\xE5\xF0\xEE\xEC!
DLG_UNKNOWNHOST_WARNING2=\xC5\xF1\xEB\xE8 \xE2\xFB \xE4\xEE\xE1\xE0\xE2\xE8\xF2\xE5 \xFD\xF2\xEE\xF2 \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0 \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2 \xE8 \xEF\xF0\xEE\xE4\xEE\xEB\xE6\xE8\xF2\xE5, \xF2\xEE \xED\xE5 \xE1\xF3\xE4\xE5\xF2\xE5 \xEF\xEE\xEB\xF3\xF7\xE0\xF2\xFC \xFD\xF2\xEE \xEF\xF0\xE5\xE4\xF3\xEF\xF0\xE5\xE6\xE4\xE5\xED\xE8\xE5.
DLG_UNKNOWNHOST_FINGERPRINT=\xCA\xEB\xFE\xF7 \xF1\xE5\xF0\xE2\xE5\xF0\xE0 \xF5\xEE\xF1\xF2\xE0:
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=&\xC4\xEE\xE1\xE0\xE2\xFC\xF2\xE5 \xFD\xF2\xEE\xF2 \xEA\xEE\xEC\xEF\xFC\xFE\xF2\xE5\xF0 \xE8 \xE5\xE3\xEE \xEA\xEB\xFE\xF7 \xE2 \xF1\xEF\xE8\xF1\xEE\xEA \xE8\xE7\xE2\xE5\xF1\xF2\xED\xFB\xF5 \xF5\xEE\xF1\xF2\xEE\xE2
DLG_HOSTKEY_SSHFP_NOTFOUND=\xCD\xE5 \xED\xE0\xE9\xE4\xE5\xED \xEA\xEB\xFE\xF7 \xF5\xEE\xF1\xF2\xE0 \xE2 DNS.
@@ -737,6 +741,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
; Last translated (Simplified Chinese language) by LiShaohui (Nov 18 2013)
[Tera Term]
@@ -507,6 +507,7 @@
; dlg about
DLG_ABOUT_TITLE=\xB9\xD8\xD3\xDA TTSSH
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=\xB7\xFE\xCE\xF1\xC6\xF7ID\xA3\xBA
DLG_ABOUT_PROTOCOL=Э\xD2\xE9\xB0汾\xA3\xBA
DLG_ABOUT_ENCRYPTION=\xBC\xD3\xC3ܷ\xBD\xB0\xB8\xA3\xBA
@@ -578,6 +579,7 @@
DLG_DIFFERENTKEY_WARNING=\xB7\xFE\xCE\xF1\xC6\xF7"####################################"\xD2Ѵ\xE6\xD4\xDA\xD3\xDA\xD6\xF7\xBB\xFA\xC1б\xED\xD6У\xAC\xB5\xAB\xCA\xC7\xCCṩ\xC1\xCBһ\xB8\xF6\xB2\xBBͬ\xB5\xC4\xC3\xDCԿ\xA3\xAC\xD5\xE2\xBF\xC9\xC4\xDC\xCAǵжԷ\xBDαװ\xB5ġ\xA3
DLG_DIFFERENTKEY_WARNING2=\xBD\xAB\xB8÷\xFE\xCE\xF1\xC6\xF7\xBCӵ\xBD\xD2\xD1֪\xD6\xF7\xBB\xFA\xC1б\xED\xD6к\xAB\xB2\xBB\xD4\xD9\xCC\xE1ʾ\xB1\xBE\xBE\xAF\xB8档
DLG_DIFFERENTKEY_FINGERPRINT=\xB7\xFE\xCE\xF1\xC6\xF7\xC3\xDCԿָ\xCEƣ\xBA
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=ʹ\xD3\xC3\xD0µ\xC4\xC3\xDCԿ\xB8\xFC\xBB\xBB\xCF\xD6\xD3\xD0\xC3\xDCԿ(&R)
; dlg diff type key
@@ -585,6 +587,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=\xB7\xFE\xCE\xF1\xC6\xF7"####################################"\xD2Ѵ\xE6\xD4\xDA\xD3\xDA\xD6\xF7\xBB\xFA\xC1б\xED\xD6У\xAC\xB5\xAB\xCA\xC7\xCCṩ\xC1\xCBһ\xB8\xF6\xB2\xBBͬ\xB5\xC4\xC3\xDCԿ\xA3\xAC\xD5\xE2\xBF\xC9\xC4\xDC\xCAǵжԷ\xBDαװ\xB5ġ\xA3
DLG_DIFFERENTTYPEKEY_WARNING2=\xBD\xAB\xB8÷\xFE\xCE\xF1\xC6\xF7\xBCӵ\xBD\xD2\xD1֪\xD6\xF7\xBB\xFA\xC1б\xED\xD6к\xAB\xB2\xBB\xD4\xD9\xCC\xE1ʾ\xB1\xBE\xBE\xAF\xB8档
DLG_DIFFERENTTYPEKEY_FINGERPRINT=\xB7\xFE\xCE\xF1\xC6\xF7\xC3\xDCԿָ\xCEƣ\xBA
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTTYPEKEY_ADD=\xBCӵ\xBD\xD2\xD1֪\xD6\xF7\xBB\xFA\xC1б\xED\xD6\xD0(&A)
; dlg fwd edit
@@ -726,6 +729,7 @@
DLG_UNKNOWNHOST_WARNING=\xB7\xFE\xCE\xF1\xC6\xF7"#####################################"\xB2\xBB\xD4\xD9\xD2\xD1֪\xD6\xF7\xBB\xFA\xC1б\xED\xD6С\xA3\xCB\xFC\xBF\xC9\xC4\xDC\xCAǵжԷ\xFE\xCE\xF1\xC6\xF7αװ\xB5ģ\xAC\xC7\xEBС\xD0ģ\xA1
DLG_UNKNOWNHOST_WARNING2=\xBD\xAB\xB8÷\xFE\xCE\xF1\xC6\xF7\xBCӵ\xBD\xD2\xD1֪\xD6\xF7\xBB\xFA\xC1б\xED\xD6к\xAB\xB2\xBB\xD4\xD9\xCC\xE1ʾ\xB1\xBE\xBE\xAF\xB8档
DLG_UNKNOWNHOST_FINGERPRINT=\xB7\xFE\xCE\xF1\xC6\xF7\xB6\xCB\xD6\xF7\xBB\xFA\xC3\xDCԿָ\xCEƣ\xBA
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=\xBCӵ\xBD\xD2\xD1֪\xD6\xF7\xBB\xFA\xC1б\xED\xD6\xD0(&A)
DLG_HOSTKEY_SSHFP_NOTFOUND=DNS\xD6\xD0δ\xD5ҵ\xBD\xC3\xDCԿ\xB5\xC4ָ\xCE\xC6\xD0\xC5Ϣ\xA1\xA3
@@ -737,6 +741,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (Oct 10 2015)
+; Updated by TeraTerm Project (Nov 15 2015)
; Traditional Chinese Language by kikiqqp (Sep 20 2014)
[Tera Term]
@@ -507,6 +507,7 @@
; dlg about
DLG_ABOUT_TITLE=\xC3\xF6\xA9\xF3 TTSSH
+DLG_ABOUT_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_ABOUT_SERVERID=\xA6\xF8\xAAA\xBE\xB9ID\xA1G
DLG_ABOUT_PROTOCOL=\xA8\xF3\xA9w\xAA\xA9\xA5\xBB\xA1G
DLG_ABOUT_ENCRYPTION=\xA5[\xB1K\xA4\xE8\xAEסG
@@ -578,6 +579,7 @@
DLG_DIFFERENTKEY_WARNING=\xA6\xF8\xAAA\xBE\xB9"####################################"\xA4w\xA6s\xA6b\xA9\xF3\xA5D\xBE\xF7\xA6C\xAA\x{D924}\xA1A\xA6\xFD\xACO\xB4\xA3\xA8ѤF\xA4@\xADӤ\xA3\xA6P\xAA\xBA\xB1K\xC6_\xA1A\xB3o\xA5i\xAF\xE0\xACO\xB4c\xB7N\xA4H\xA4h\xA9Ұ\xB0\xB3y\xAA\xBA\xA1C
DLG_DIFFERENTKEY_WARNING2=\xB1N\xB8Ӧ\xF8\xAAA\xBE\xB9\xB0l\xA5[\xA8\xEC\xA4w\xAA\xBE\xA5D\xBE\xF7\xA6C\xAA\x{D924}\xAB\xE1\xA1A\xB1N\xA4\xA3\xA6A\xB4\xA3\xA5ܥ\xBBĵ\xA7i\xA1C
DLG_DIFFERENTKEY_FINGERPRINT=\xA6\xF8\xAAA\xBE\xB9\xB1K\xC6_\xAB\xFC\xAF\xBE\xA1G
+DLG_DIFFERENTKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTKEY_REPLACE=\xA8ϥηs\xAA\xBA\xB1K\xC6_\xA7{\xA6\xB3\xB1K\xC6_(&R)
; dlg diff type key
@@ -585,6 +587,7 @@
DLG_DIFFERENTTYPEKEY_WARNING=\xA6\xF8\xAAA\xBE\xB9"####################################"\xA4w\xA6s\xA6b\xA9\xF3\xA5D\xBE\xF7\xA6C\xAA\x{D924}\xA1A\xA6\xFD\xACO\xB4\xA3\xA8ѤF\xA4@\xADӤ\xA3\xA6P\xAA\xBA\xB1K\xC6_\xA1A\xB3o\xA5i\xAF\xE0\xACO\xB4c\xB7N\xA4H\xA4h\xA9Ұ\xB0\xB3y\xAA\xBA\xA1C
DLG_DIFFERENTTYPEKEY_WARNING2=\xB1N\xB8Ӧ\xF8\xAAA\xBE\xB9\xB0l\xA5[\xA8\xEC\xA4w\xAA\xBE\xA5D\xBE\xF7\xA6C\xAA\x{D924}\xAB\xE1\xA1A\xB1N\xA4\xA3\xA6A\xB4\xA3\xA5ܥ\xBBĵ\xA7i\xA1C
DLG_DIFFERENTTYPEKEY_FINGERPRINT=\xA6\xF8\xAAA\xBE\xB9\xB1K\xC6_\xAB\xFC\xAF\xBE\xA1G
+DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_DIFFERENTTYPEKEY_ADD=\xB0l\xA5[\xA8\xEC\xA4w\xAA\xBE\xA5D\xBE\xF7\xA6C\xAA\x{D924}(&A)
; dlg fwd edit
@@ -726,6 +729,7 @@
DLG_UNKNOWNHOST_WARNING=\xA6\xF8\xAAA\xBE\xB9"#####################################"\xA4\xA3\xA6A\xA4w\xAA\xBE\xA5D\xBE\xF7\xA6C\xAA\x{D924}\xA1C\xA5\xA6\xA5i\xAF\xE0\xACO\xBCĹ\xEF\xA6\xF8\xAAA\xBE\xB9\xB0\xB0\xB8˪\xBA\xA1A\xBDФp\xA4ߡI
DLG_UNKNOWNHOST_WARNING2=\xB1N\xB8Ӧ\xF8\xAAA\xBE\xB9\xB0l\xA5[\xA8\xEC\xA4w\xAA\xBE\xA5D\xBE\xF7\xA6C\xAA\x{D924}\xAB\xE1\xA1A\xB1N\xA4\xA3\xA6A\xB4\xA3\xA5ܥ\xBBĵ\xA7i\xA1C
DLG_UNKNOWNHOST_FINGERPRINT=\xA6\xF8\xAAA\xBE\xB9\xBAݥD\xBE\xF7\xB1K\xC6_\xAB\xFC\xAF\xBE\xA1G
+DLG_UNKNOWNHOST_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_UNKNOWNHOST_ADD=\xB0l\xA5[\xA8\xEC\xA4w\xAA\xBE\xA5D\xBE\xF7\xA6C\xAA\x{D924}(&A)
DLG_HOSTKEY_SSHFP_NOTFOUND=DNS\xA4\xA4\xA5\xBC\xA7\xE4\xA8\xEC\xB1K\xC6_\xAA\xBA\xAB\xFC\xAF\xBE\xB8\xEA\xB0T\xA1C
@@ -737,6 +741,7 @@
DLG_HOSTKEY_ROTATION_TITLE=Hostkey rotation
DLG_HOSTKEY_ROTATION_WARNING=You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?
+DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM=Fingerprint hash algorithm:
DLG_HOSTKEY_ROTATION_ADD=%u new key(s):
DLG_HOSTKEY_ROTATION_REMOVE=%u obsolete key(s):
Modified: trunk/ttssh2/ttxssh/hosts.c
===================================================================
--- trunk/ttssh2/ttxssh/hosts.c 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/ttssh2/ttxssh/hosts.c 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1074,13 +1074,36 @@
return HOSTS_compare_public_key(&pvar->hosts_state.hostkey, key);
}
+static void hosts_dlg_set_fingerprint(PTInstVar pvar, HWND dlg, digest_algorithm dgst_alg)
+{
+ char *fp = NULL;
+
+ // fingerprint\x82\xF0\x90ݒ肷\x82\xE9
+ switch (dgst_alg) {
+ case SSH_DIGEST_MD5:
+ fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_HEX, dgst_alg);
+ SendMessage(GetDlgItem(dlg, IDC_FINGER_PRINT), WM_SETTEXT, 0, (LPARAM)fp);
+ free(fp);
+ break;
+ case SSH_DIGEST_SHA256:
+ fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_BASE64, dgst_alg);
+ SendMessage(GetDlgItem(dlg, IDC_FINGER_PRINT), WM_SETTEXT, 0, (LPARAM)fp);
+ free(fp);
+ break;
+ }
+
+ // \x83r\x83W\x83\x85\x83A\x83\x8B\x89\xBBfingerprint\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
+ fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_RANDOMART, dgst_alg);
+ SendMessage(GetDlgItem(dlg, IDC_FP_RANDOMART), WM_SETTEXT, 0, (LPARAM)fp);
+ free(fp);
+}
+
static void init_hosts_dlg(PTInstVar pvar, HWND dlg)
{
char buf[1024];
char buf2[2048];
int i, j;
int ch;
- char *fp = NULL;
// static text\x82\xCC # \x95\x94\x95\xAA\x82\xF0\x83z\x83X\x83g\x96\xBC\x82ɒu\x8A\xB7\x82\xB7\x82\xE9
GetDlgItemText(dlg, IDC_HOSTWARNING, buf, sizeof(buf));
@@ -1096,16 +1119,10 @@
SetDlgItemText(dlg, IDC_HOSTWARNING, buf2);
- // fingerprint\x82\xF0\x90ݒ肷\x82\xE9
- fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_HEX, SSH_DIGEST_MD5);
- SendMessage(GetDlgItem(dlg, IDC_FINGER_PRINT), WM_SETTEXT, 0, (LPARAM)fp);
- free(fp);
+ SendMessage(GetDlgItem(dlg, IDC_FP_RANDOMART), WM_SETFONT, (WPARAM)GetStockObject(ANSI_FIXED_FONT), TRUE);
- // \x83r\x83W\x83\x85\x83A\x83\x8B\x89\xBBfingerprint\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9
- fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_RANDOMART, SSH_DIGEST_MD5);
- SendMessage(GetDlgItem(dlg, IDC_FP_RANDOMART), WM_SETTEXT, 0, (LPARAM)fp);
- SendMessage(GetDlgItem(dlg, IDC_FP_RANDOMART), WM_SETFONT, (WPARAM)GetStockObject(ANSI_FIXED_FONT), TRUE);
- free(fp);
+ CheckDlgButton(dlg, IDC_FP_HASH_ALG_MD5, TRUE);
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_MD5);
}
static int print_mp_int(char FAR * buf, unsigned char FAR * mp)
@@ -1922,6 +1939,9 @@
GetDlgItemText(dlg, IDC_HOSTFINGERPRINT, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_UNKNOWNHOST_FINGERPRINT", pvar, uimsg);
SetDlgItemText(dlg, IDC_HOSTFINGERPRINT, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_FP_HASH_ALG, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_UNKNOWNHOST_FP_HASH_ALGORITHM", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_FP_HASH_ALG, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_UNKNOWNHOST_ADD", pvar, uimsg);
SetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, pvar->ts->UIMsg);
@@ -1979,7 +1999,10 @@
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_FP_HASH_ALG, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_MD5, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_SHA256, 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));
SendDlgItemMessage(dlg, IDC_CONTINUE, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0));
@@ -2035,6 +2058,14 @@
return TRUE;
+ case IDC_FP_HASH_ALG_MD5:
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_MD5);
+ return TRUE;
+
+ case IDC_FP_HASH_ALG_SHA256:
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_SHA256);
+ return TRUE;
+
default:
return FALSE;
}
@@ -2074,6 +2105,9 @@
GetDlgItemText(dlg, IDC_HOSTFINGERPRINT, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_DIFFERENTKEY_FINGERPRINT", pvar, uimsg);
SetDlgItemText(dlg, IDC_HOSTFINGERPRINT, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_FP_HASH_ALG, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_DIFFERENTKEY_FP_HASH_ALGORITHM", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_FP_HASH_ALG, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_DIFFERENTKEY_REPLACE", pvar, uimsg);
SetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, pvar->ts->UIMsg);
@@ -2128,10 +2162,13 @@
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_HOSTSSHFPCHECK, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(dlg, IDC_HOSTSSHFPDNSSEC, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, 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_FP_HASH_ALG, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_MD5, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_SHA256, 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));
SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostsReplaceFont, MAKELPARAM(TRUE,0));
}
@@ -2185,6 +2222,14 @@
return TRUE;
+ case IDC_FP_HASH_ALG_MD5:
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_MD5);
+ return TRUE;
+
+ case IDC_FP_HASH_ALG_SHA256:
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_SHA256);
+ return TRUE;
+
default:
return FALSE;
}
@@ -2224,6 +2269,9 @@
GetDlgItemText(dlg, IDC_HOSTFINGERPRINT, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_DIFFERENTTYPEKEY_FINGERPRINT", pvar, uimsg);
SetDlgItemText(dlg, IDC_HOSTFINGERPRINT, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_FP_HASH_ALG, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_DIFFERENTTYPEKEY_FP_HASH_ALGORITHM", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_FP_HASH_ALG, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_DIFFERENTTYPEKEY_ADD", pvar, uimsg);
SetDlgItemText(dlg, IDC_ADDTOKNOWNHOSTS, pvar->ts->UIMsg);
@@ -2281,7 +2329,10 @@
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_FP_HASH_ALG, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_MD5, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_SHA256, 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));
SendDlgItemMessage(dlg, IDC_CONTINUE, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE,0));
@@ -2337,6 +2388,14 @@
return TRUE;
+ case IDC_FP_HASH_ALG_MD5:
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_MD5);
+ return TRUE;
+
+ case IDC_FP_HASH_ALG_SHA256:
+ hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_SHA256);
+ return TRUE;
+
default:
return FALSE;
}
Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/ttssh2/ttxssh/key.c 2015-11-15 10:25:50 UTC (rev 6132)
@@ -1989,6 +1989,56 @@
return (ret);
}
+static void hosts_updatekey_dlg_set_fingerprint(PTInstVar pvar, HWND dlg, digest_algorithm dgst_alg)
+{
+ char buf[1024];
+ char *fp;
+ size_t i;
+ struct hostkeys_update_ctx *ctx;
+
+ ctx = pvar->hostkey_ctx;
+
+ SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)"");
+ for (i = 0; i < ctx->nkeys; i++) {
+ if (ctx->keys_seen[i])
+ continue;
+ switch (dgst_alg) {
+ case SSH_DIGEST_MD5:
+ fp = key_fingerprint(ctx->keys[i], SSH_FP_HEX, dgst_alg);
+ break;
+ case SSH_DIGEST_SHA256:
+ fp = key_fingerprint(ctx->keys[i], SSH_FP_BASE64, dgst_alg);
+ break;
+ }
+ buf[0] = 0;
+ strcat_s(buf, sizeof(buf), get_sshname_from_key(ctx->keys[i]));
+ strcat_s(buf, sizeof(buf), " ");
+ strcat_s(buf, sizeof(buf), fp);
+ SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)buf);
+ SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)"\r\n");
+ free(fp);
+ }
+
+ SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)"");
+ for (i = 0; i < ctx->nold; i++) {
+ switch (dgst_alg) {
+ case SSH_DIGEST_MD5:
+ fp = key_fingerprint(ctx->old_keys[i], SSH_FP_HEX, dgst_alg);
+ break;
+ case SSH_DIGEST_SHA256:
+ fp = key_fingerprint(ctx->old_keys[i], SSH_FP_BASE64, dgst_alg);
+ break;
+ }
+ buf[0] = 0;
+ strcat_s(buf, sizeof(buf), get_sshname_from_key(ctx->old_keys[i]));
+ strcat_s(buf, sizeof(buf), " ");
+ strcat_s(buf, sizeof(buf), fp);
+ SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)buf);
+ SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)"\r\n");
+ free(fp);
+ }
+}
+
static BOOL CALLBACK hosts_updatekey_dlg_proc(HWND dlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
static HFONT DlgHostsAddFont;
@@ -1998,8 +2048,6 @@
char buf[1024];
char *host;
struct hostkeys_update_ctx *ctx;
- char *fp;
- size_t i;
char uimsg[MAX_UIMSG];
switch (msg) {
@@ -2021,38 +2069,23 @@
);
SetDlgItemText(dlg, IDC_HOSTKEY_MESSAGE, buf);
+ GetDlgItemText(dlg, IDC_FP_HASH_ALG, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_FP_HASH_ALGORITHM", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_FP_HASH_ALG, pvar->ts->UIMsg);
+
GetDlgItemText(dlg, IDC_ADDKEY_TEXT, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_ADD", pvar, uimsg);
_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, ctx->nnew);
SetDlgItemText(dlg, IDC_ADDKEY_TEXT, buf);
- for (i = 0; i < ctx->nkeys; i++) {
- if (ctx->keys_seen[i])
- continue;
- fp = key_fingerprint(ctx->keys[i], SSH_FP_HEX, SSH_DIGEST_MD5);
- buf[0] = 0;
- strcat_s(buf, sizeof(buf), get_sshname_from_key(ctx->keys[i]));
- strcat_s(buf, sizeof(buf), " ");
- strcat_s(buf, sizeof(buf), fp);
- SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)buf);
- SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)"\r\n");
- free(fp);
- }
GetDlgItemText(dlg, IDC_REMOVEKEY_TEXT, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_HOSTKEY_ROTATION_REMOVE", pvar, uimsg);
_snprintf_s(buf, sizeof(buf), _TRUNCATE, pvar->ts->UIMsg, ctx->nold);
SetDlgItemText(dlg, IDC_REMOVEKEY_TEXT, buf);
- for (i = 0; i < ctx->nold; i++) {
- fp = key_fingerprint(ctx->old_keys[i], SSH_FP_HEX, SSH_DIGEST_MD5);
- buf[0] = 0;
- strcat_s(buf, sizeof(buf), get_sshname_from_key(ctx->old_keys[i]));
- strcat_s(buf, sizeof(buf), " ");
- strcat_s(buf, sizeof(buf), fp);
- SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)buf);
- SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, EM_REPLACESEL, 0, (LPARAM)"\r\n");
- free(fp);
- }
+ CheckDlgButton(dlg, IDC_FP_HASH_ALG_MD5, TRUE);
+ hosts_updatekey_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_MD5);
+
GetDlgItemText(dlg, IDOK, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("BTN_YES", pvar, uimsg);
SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
@@ -2065,6 +2098,9 @@
if (UTIL_get_lang_font("DLG_TAHOMA_FONT", dlg, &logfont, &DlgHostsAddFont, pvar)) {
SendDlgItemMessage(dlg, IDC_HOSTKEY_MESSAGE, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDC_ADDKEY_TEXT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_MD5, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_SHA256, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDC_REMOVEKEY_TEXT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETFONT, (WPARAM)DlgHostsAddFont, MAKELPARAM(TRUE, 0));
@@ -2100,6 +2136,14 @@
return TRUE;
+ case IDC_FP_HASH_ALG_MD5:
+ hosts_updatekey_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_MD5);
+ return TRUE;
+
+ case IDC_FP_HASH_ALG_SHA256:
+ hosts_updatekey_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_SHA256);
+ return TRUE;
+
default:
return FALSE;
}
Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/ttssh2/ttxssh/resource.h 2015-11-15 10:25:50 UTC (rev 6132)
@@ -213,6 +213,9 @@
#define IDC_HOSTKEY_MESSAGE 1214
#define IDC_ADDKEY_TEXT 1215
#define IDC_REMOVEKEY_TEXT 1216
+#define IDC_FP_HASH_ALG 1217
+#define IDC_FP_HASH_ALG_MD5 1218
+#define IDC_FP_HASH_ALG_SHA256 1219
// Next default values for new objects
//
@@ -220,7 +223,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 113
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1217
+#define _APS_NEXT_CONTROL_VALUE 1220
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2015-11-15 10:25:50 UTC (rev 6132)
@@ -2633,49 +2633,15 @@
*major = *minor = *release = *build = 0;
}
-static void init_about_dlg(PTInstVar pvar, HWND dlg)
+static void about_dlg_set_abouttext(PTInstVar pvar, HWND dlg, digest_algorithm dgst_alg)
{
char buf[1024];
- int a, b, c, d;
- char uimsg[MAX_UIMSG];
char *fp = NULL;
- GetWindowText(dlg, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("DLG_ABOUT_TITLE", pvar, uimsg);
- SetWindowText(dlg, pvar->ts->UIMsg);
- GetDlgItemText(dlg, IDOK, uimsg, sizeof(uimsg));
- UTIL_get_lang_msg("BTN_OK", pvar, uimsg);
- SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
-
- // TTSSH\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.2.28 yutaka)
- get_file_version("ttxssh.dll", &a, &b, &c, &d);
- _snprintf_s(buf, sizeof(buf), _TRUNCATE,
- "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
- SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
-
- // OpenSSL\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.1.24 yutaka)
- // \x8F\xF0\x8C\x8F\x95\xB6\x92lj\xC1 (2005.5.11 yutaka)
- // OPENSSL_VERSION_TEXT \x83}\x83N\x83\x8D\x92\xE8\x8B`\x82ł͂Ȃ\xAD\x81A\x8A\x94\x82\xF0\x8Eg\x82\xC1\x82ăo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B(2013.11.24 yutaka)
- SendMessage(GetDlgItem(dlg, IDC_OPENSSL_VERSION), WM_SETTEXT, 0, (LPARAM)SSLeay_version(SSLEAY_VERSION));
-
- // zlib\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.5.11 yutaka)
-#ifdef ZLIB_VERSION
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "ZLib %s", ZLIB_VERSION);
-#else
- _snprintf(buf, sizeof(buf), "ZLib Unknown");
-#endif
- SendMessage(GetDlgItem(dlg, IDC_ZLIB_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
-
- // PuTTY\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2011.7.26 yutaka)
-#ifdef PUTTYVERSION
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, "PuTTY %s", PUTTYVERSION);
-#else
- _snprintf(buf, sizeof(buf), "PuTTY Unknown");
-#endif
- SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
-
// TTSSH\x83_\x83C\x83A\x83\x8D\x83O\x82ɕ\\x8E\xA6\x82\xB7\x82\xE9SSH\x82Ɋւ\xB7\x82\xE9\x8F\xEE\x95\xF1 (2004.10.30 yutaka)
if (pvar->socket != INVALID_SOCKET) {
+ SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETTEXT, 0, (LPARAM)(char FAR *)"");
+
if (SSHv1(pvar)) {
SSH_get_server_ID_info(pvar, buf, sizeof(buf));
UTIL_get_lang_msg("DLG_ABOUT_SERVERID", pvar, "Server ID:");
@@ -2715,10 +2681,10 @@
// add MAC algorithm (2004.12.17 yutaka)
buf[0] = '\0';
- strncat_s(buf, sizeof(buf), get_ssh2_mac_name(pvar->ctos_hmac) , _TRUNCATE);
+ strncat_s(buf, sizeof(buf), get_ssh2_mac_name(pvar->ctos_hmac), _TRUNCATE);
UTIL_get_lang_msg("DLG_ABOUT_TOSERVER", pvar, " to server,");
strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
- strncat_s(buf, sizeof(buf), get_ssh2_mac_name(pvar->stoc_hmac) , _TRUNCATE);
+ strncat_s(buf, sizeof(buf), get_ssh2_mac_name(pvar->stoc_hmac), _TRUNCATE);
UTIL_get_lang_msg("DLG_ABOUT_FROMSERVER", pvar, " from server");
strncat_s(buf, sizeof(buf), pvar->ts->UIMsg, _TRUNCATE);
append_about_text(dlg, "MAC:", buf);
@@ -2745,19 +2711,74 @@
}
// \x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82\xCCfingerprint\x82\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x81B
- // Random art\x82̕\\x8E\xA6\x82\xAA\x95\xF6\x82\xEA\x82Ă\xB5\x82܂\xA4\x82̂\xAA\x89ۑ\xE8\x81B
// (2014.5.1 yutaka)
- fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_HEX, SSH_DIGEST_MD5);
UTIL_get_lang_msg("DLG_ABOUT_FINGERPRINT", pvar, "Host key's fingerprint:");
- append_about_text(dlg, pvar->ts->UIMsg, fp);
- free(fp);
+ append_about_text(dlg, "", pvar->ts->UIMsg);
- fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_RANDOMART, SSH_DIGEST_MD5);
- append_about_text(dlg, "", fp);
+ switch (dgst_alg) {
+ case SSH_DIGEST_MD5:
+ fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_HEX, dgst_alg);
+ append_about_text(dlg, "", fp);
+ free(fp);
+ break;
+ case SSH_DIGEST_SHA256:
+ fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_BASE64, dgst_alg);
+ append_about_text(dlg, "", fp);
+ free(fp);
+ break;
+ }
+
+ fp = key_fingerprint(&pvar->hosts_state.hostkey, SSH_FP_RANDOMART, dgst_alg);
+ // \x96\x96\x94\xF6\x82ɉ\xFC\x8Ds\x82͕s\x97v\x82Ȃ̂\xC5 append_about_text() \x82͎g\x97p\x82\xB5\x82Ȃ\xA2
+ SendDlgItemMessage(dlg, IDC_ABOUTTEXT, EM_REPLACESEL, 0, (LPARAM)fp);
free(fp);
}
}
+static void init_about_dlg(PTInstVar pvar, HWND dlg)
+{
+ char buf[1024];
+ int a, b, c, d;
+ char uimsg[MAX_UIMSG];
+
+ GetWindowText(dlg, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_ABOUT_TITLE", pvar, uimsg);
+ SetWindowText(dlg, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_FP_HASH_ALG, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_ABOUT_FP_HASH_ALGORITHM", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_FP_HASH_ALG, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDOK, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("BTN_OK", pvar, uimsg);
+ SetDlgItemText(dlg, IDOK, pvar->ts->UIMsg);
+
+ // TTSSH\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.2.28 yutaka)
+ get_file_version("ttxssh.dll", &a, &b, &c, &d);
+ _snprintf_s(buf, sizeof(buf), _TRUNCATE,
+ "TTSSH\r\nTera Term Secure Shell extension, %d.%d", a, b);
+ SendMessage(GetDlgItem(dlg, IDC_TTSSH_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+
+ // OpenSSL\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.1.24 yutaka)
+ // \x8F\xF0\x8C\x8F\x95\xB6\x92lj\xC1 (2005.5.11 yutaka)
+ // OPENSSL_VERSION_TEXT \x83}\x83N\x83\x8D\x92\xE8\x8B`\x82ł͂Ȃ\xAD\x81A\x8A\x94\x82\xF0\x8Eg\x82\xC1\x82ăo\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B(2013.11.24 yutaka)
+ SendMessage(GetDlgItem(dlg, IDC_OPENSSL_VERSION), WM_SETTEXT, 0, (LPARAM)SSLeay_version(SSLEAY_VERSION));
+
+ // zlib\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2005.5.11 yutaka)
+#ifdef ZLIB_VERSION
+ _snprintf_s(buf, sizeof(buf), _TRUNCATE, "ZLib %s", ZLIB_VERSION);
+#else
+ _snprintf(buf, sizeof(buf), "ZLib Unknown");
+#endif
+ SendMessage(GetDlgItem(dlg, IDC_ZLIB_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+
+ // PuTTY\x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x90ݒ肷\x82\xE9 (2011.7.26 yutaka)
+#ifdef PUTTYVERSION
+ _snprintf_s(buf, sizeof(buf), _TRUNCATE, "PuTTY %s", PUTTYVERSION);
+#else
+ _snprintf(buf, sizeof(buf), "PuTTY Unknown");
+#endif
+ SendMessage(GetDlgItem(dlg, IDC_PUTTY_VERSION), WM_SETTEXT, 0, (LPARAM)buf);
+}
+
// WM_MOUSEWHEEL \x82\xCD winuser.h \x83w\x83b\x83_\x82Ő錾\x82\xB3\x82\xEA\x82Ă\xA2\x82܂\xB7\x82\xAA\x81A#define _WIN32_WINNT 0x0400 \x82\xAA\x90錾\x82\xB3\x82\xEA\x82Ă\xA2\x82Ȃ\xA2\x82ƔF\x8E\xAF\x82\xB3\x82\xEA\x82܂\xB9\x82\xF1\x81B
#define WM_MOUSEWHEEL 0x020A
#define WHEEL_DELTA 120
@@ -2825,6 +2846,9 @@
SendDlgItemMessage(dlg, IDC_WEBSITES, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_CRYPTOGRAPHY, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_CREDIT, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_MD5, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE, 0));
+ SendDlgItemMessage(dlg, IDC_FP_HASH_ALG_SHA256, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE, 0));
SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgAboutFont, MAKELPARAM(TRUE,0));
}
else {
@@ -2865,7 +2889,9 @@
SendDlgItemMessage(dlg, IDC_TTSSH_ICON, STM_SETICON, (WPARAM)hicon, 0);
}
- init_about_dlg((PTInstVar) lParam, dlg);
+ init_about_dlg(pvar, dlg);
+ CheckDlgButton(dlg, IDC_FP_HASH_ALG_MD5, TRUE);
+ about_dlg_set_abouttext(pvar, dlg, SSH_DIGEST_MD5);
SetFocus(GetDlgItem(dlg, IDOK));
// Edit control\x82\xF0\x83T\x83u\x83N\x83\x89\x83X\x89\xBB\x82\xB7\x82\xE9\x81B
@@ -2895,6 +2921,12 @@
DeleteObject(DlgAboutTextFont);
}
return TRUE;
+ case IDC_FP_HASH_ALG_MD5:
+ about_dlg_set_abouttext(pvar, dlg, SSH_DIGEST_MD5);
+ return TRUE;
+ case IDC_FP_HASH_ALG_SHA256:
+ about_dlg_set_abouttext(pvar, dlg, SSH_DIGEST_SHA256);
+ return TRUE;
}
break;
}
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2015-11-14 08:45:36 UTC (rev 6131)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2015-11-15 10:25:50 UTC (rev 6132)
@@ -26,23 +26,26 @@
// Dialog
//
-IDD_ABOUTDIALOG DIALOGEX 0, 0, 263, 285
+IDD_ABOUTDIALOG DIALOGEX 0, 0, 275, 332
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "About TTSSH"
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
LTEXT "Tera Term Secure Shell extension, ",IDC_TTSSH_VERSION,6,7,220,15
- ICON "",IDC_TTSSH_ICON,234,7,20,20
+ ICON "",IDC_TTSSH_ICON,248,7,20,20
LTEXT "Compatible with SSH protocol version 1.5 and 2.0",IDC_SSHVERSIONS,6,23,206,11
- LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2015 TeraTerm Project",IDC_INCLUDES,6,36,248,34
+ LTEXT "Includes:\r\nTTSSH 1.5.4, (C) 1998-2001 Robert O'Callahan roc+t****@cs*****\r\nIPv6 extention version 0.81, (C) 2000-2003 Jun-ya KATO kato****@win6*****\r\nSSH2 support, (C) 2004-2015 TeraTerm Project",IDC_INCLUDES,6,36,262,34
LTEXT "OpenSSL:",IDC_OPENSSL_VERSION,6,69,175,8
- LTEXT "zlib:",IDC_ZLIB_VERSION,6,78,181,8
- LTEXT "PuTTY:",IDC_PUTTY_VERSION,6,87,207,8
- LTEXT "TeraTerm Project: https://ttssh2.osdn.jp/",IDC_WEBSITES,6,99,248,13,SS_SUNKEN
- 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 | WS_VSCROLL | WS_HSCROLL
- DEFPUSHBUTTON "OK",IDOK,106,263,50,14
+ LTEXT "zlib:",IDC_ZLIB_VERSION,6,78,175,8
+ LTEXT "PuTTY:",IDC_PUTTY_VERSION,6,87,175,8
+ LTEXT "TeraTerm Project: https://ttssh2.osdn.jp/",IDC_WEBSITES,6,99,262,13,SS_SUNKEN
+ LTEXT "THIS EXTENSION INCORPORATES STRONG CRYPTOGRAPHY. POSESSION, USE, AND/OR EXPORT OF THIS EXTENSION MAY BE ILLEGAL IN YOUR COUNTRY.",IDC_CRYPTOGRAPHY,6,116,262,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,262,27
+ LTEXT "Fingerprint hash algorithm:",IDC_FP_HASH_ALG,6,171,100,8,0,WS_EX_RIGHT
+ CONTROL "&MD5",IDC_FP_HASH_ALG_MD5,"Button",BS_AUTORADIOBUTTON | WS_GROUP,110,171,30,10
+ CONTROL "&SHA256",IDC_FP_HASH_ALG_SHA256,"Button",BS_AUTORADIOBUTTON,145,171,40,10
+ EDITTEXT IDC_ABOUTTEXT,6,185,262,120,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ DEFPUSHBUTTON "OK",IDOK,112,310,50,14
END
IDD_SSHAUTH DIALOGEX 0, 0, 309, 262
@@ -163,40 +166,46 @@
PUSHBUTTON "Cancel",IDCANCEL,118,266,50,14
END
-IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 266
+IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 260, 276
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 "",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
+ 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,229,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,229,26
+ LTEXT "",IDC_HOSTSSHFPCHECK,15,72,229,16
+ LTEXT "",IDC_HOSTSSHFPDNSSEC,15,88,229,8
+ LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,100,229,8
+ LTEXT "Fingerprint hash algorithm:",IDC_FP_HASH_ALG,15,110,100,8,0,WS_EX_RIGHT
+ CONTROL "&MD5",IDC_FP_HASH_ALG_MD5,"Button",BS_AUTORADIOBUTTON,120,110,30,10
+ CONTROL "&SHA256",IDC_FP_HASH_ALG_SHA256,"Button",BS_AUTORADIOBUTTON,155,110,40,10
+ EDITTEXT IDC_FINGER_PRINT,15,120,229,12,ES_AUTOHSCROLL | ES_READONLY
+ EDITTEXT IDC_FP_RANDOMART,15,139,229,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,231,181,13
- DEFPUSHBUTTON "&Continue",IDC_CONTINUE,50,246,50,14,WS_GROUP
- PUSHBUTTON "&Disconnect",IDCANCEL,115,246,50,14,WS_GROUP
+ "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,241,221,13
+ DEFPUSHBUTTON "&Continue",IDC_CONTINUE,65,256,50,14,WS_GROUP
+ PUSHBUTTON "&Disconnect",IDCANCEL,145,256,50,14,WS_GROUP
END
-IDD_SSHDIFFERENTKEY DIALOGEX 0, 0, 215, 266
+IDD_SSHDIFFERENTKEY DIALOGEX 0, 0, 260, 276
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 "",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
+ 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,229,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,229,24
+ LTEXT "",IDC_HOSTSSHFPCHECK,15,72,229,16
+ LTEXT "",IDC_HOSTSSHFPDNSSEC,15,88,229,8
+ LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,100,229,8
+ LTEXT "Fingerprint hash algorithm:",IDC_FP_HASH_ALG,15,110,100,8,0,WS_EX_RIGHT
+ CONTROL "&MD5",IDC_FP_HASH_ALG_MD5,"Button",BS_AUTORADIOBUTTON,120,110,30,10
+ CONTROL "&SHA256",IDC_FP_HASH_ALG_SHA256,"Button",BS_AUTORADIOBUTTON,155,110,40,10
+ EDITTEXT IDC_FINGER_PRINT,15,120,229,12,ES_AUTOHSCROLL | ES_READONLY
+ EDITTEXT IDC_FP_RANDOMART,15,139,229,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,231,153,13
- PUSHBUTTON "&Continue",IDC_CONTINUE,50,246,50,14,WS_GROUP
- DEFPUSHBUTTON "&Disconnect",IDCANCEL,115,246,50,14,WS_GROUP
+ "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,241,221,13
+ PUSHBUTTON "&Continue",IDC_CONTINUE,65,256,50,14,WS_GROUP
+ DEFPUSHBUTTON "&Disconnect",IDCANCEL,145,256,50,14,WS_GROUP
END
IDD_SSHAUTHSETUP DIALOGEX 0, 0, 309, 228
@@ -374,22 +383,25 @@
EDITTEXT IDC_CONFIRM_PASSWD,67,56,99,14,ES_PASSWORD | ES_AUTOHSCROLL
END
-IDD_SSHDIFFERENTTYPEKEY DIALOGEX 0, 0, 215, 266
+IDD_SSHDIFFERENTTYPEKEY DIALOGEX 0, 0, 260, 276
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 "",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
+ 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,229,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,229,24
+ LTEXT "",IDC_HOSTSSHFPCHECK,15,72,229,16
+ LTEXT "",IDC_HOSTSSHFPDNSSEC,15,88,229,8
+ LTEXT "The server's host key fingerprint is:",IDC_HOSTFINGERPRINT,15,100,229,8
+ LTEXT "Fingerprint hash algorithm:",IDC_FP_HASH_ALG,15,110,100,8,0,WS_EX_RIGHT
+ CONTROL "&MD5",IDC_FP_HASH_ALG_MD5,"Button",BS_AUTORADIOBUTTON,120,110,30,10
+ CONTROL "&SHA256",IDC_FP_HASH_ALG_SHA256,"Button",BS_AUTORADIOBUTTON,155,110,40,10
+ EDITTEXT IDC_FINGER_PRINT,15,120,229,12,ES_AUTOHSCROLL | ES_READONLY
+ EDITTEXT IDC_FP_RANDOMART,15,139,229,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,231,181,13
- DEFPUSHBUTTON "&Continue",IDC_CONTINUE,50,246,50,14,WS_GROUP
- PUSHBUTTON "&Disconnect",IDCANCEL,115,246,50,14,WS_GROUP
+ "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,19,241,221,13
+ DEFPUSHBUTTON "&Continue",IDC_CONTINUE,65,256,50,14,WS_GROUP
+ PUSHBUTTON "&Disconnect",IDCANCEL,145,256,50,14,WS_GROUP
END
IDD_SFTP_DIALOG DIALOGEX 0, 0, 266, 150
@@ -401,18 +413,21 @@
EDITTEXT IDC_SFTP_CONSOLE,7,33,252,110,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL
END
-IDD_SSHUPDATE_HOSTKEY DIALOGEX 0, 0, 309, 216
+IDD_SSHUPDATE_HOSTKEY DIALOGEX 0, 0, 320, 216
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Hostkey rotation"
FONT 8, "Tahoma", 0, 0, 0x0
BEGIN
- LTEXT "You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?",IDC_HOSTKEY_MESSAGE,15,7,280,45
- LTEXT "%u new key(s):",IDC_ADDKEY_TEXT,7,66,295,8
- EDITTEXT IDC_ADDKEY_EDIT,7,78,295,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
- LTEXT "%u obsolete key(s):",IDC_REMOVEKEY_TEXT,7,130,295,8
- EDITTEXT IDC_REMOVEKEY_EDIT,7,142,295,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
- PUSHBUTTON "&Yes",IDOK,93,193,50,14
- DEFPUSHBUTTON "&No",IDCANCEL,165,193,50,14
+ LTEXT "You received the list of host keys from remote server `%s'.\nYou can choose to add %u new key(s) and remove %u obsolete key(s) from this machine to the known hosts list.\nAre you sure that you want to update known hosts file?",IDC_HOSTKEY_MESSAGE,15,7,290,45
+ LTEXT "Fingerprint hash algorithm:",IDC_FP_HASH_ALG,15,56,100,8,0,WS_EX_RIGHT
+ CONTROL "&MD5",IDC_FP_HASH_ALG_MD5,"Button",BS_AUTORADIOBUTTON,120,56,30,10
+ CONTROL "&SHA256",IDC_FP_HASH_ALG_SHA256,"Button",BS_AUTORADIOBUTTON,155,56,40,10
+ LTEXT "%u new key(s):",IDC_ADDKEY_TEXT,15,66,290,8
+ EDITTEXT IDC_ADDKEY_EDIT,15,78,290,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ LTEXT "%u obsolete key(s):",IDC_REMOVEKEY_TEXT,15,130,290,8
+ EDITTEXT IDC_REMOVEKEY_EDIT,15,142,290,44,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL | WS_HSCROLL
+ PUSHBUTTON "&Yes",IDOK,95,193,50,14
+ DEFPUSHBUTTON "&No",IDCANCEL,175,193,50,14
END
@@ -427,9 +442,9 @@
IDD_ABOUTDIALOG, DIALOG
BEGIN
LEFTMARGIN, 6
- RIGHTMARGIN, 254
+ RIGHTMARGIN, 268
TOPMARGIN, 7
- BOTTOMMARGIN, 277
+ BOTTOMMARGIN, 324
END
IDD_SSHAUTH, DIALOG
@@ -458,17 +473,17 @@
IDD_SSHUNKNOWNHOST, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 208
+ RIGHTMARGIN, 253
TOPMARGIN, 7
- BOTTOMMARGIN, 236
+ BOTTOMMARGIN, 270
END
IDD_SSHDIFFERENTKEY, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 208
+ RIGHTMARGIN, 253
TOPMARGIN, 7
- BOTTOMMARGIN, 236
+ BOTTOMMARGIN, 270
END
IDD_SSHAUTHSETUP, DIALOG
@@ -538,9 +553,9 @@
IDD_SSHDIFFERENTTYPEKEY, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 208
+ RIGHTMARGIN, 253
TOPMARGIN, 7
- BOTTOMMARGIN, 236
+ BOTTOMMARGIN, 270
END
IDD_SFTP_DIALOG, DIALOG
@@ -554,7 +569,7 @@
IDD_SSHUPDATE_HOSTKEY, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 302
+ RIGHTMARGIN, 314
TOPMARGIN, 7
BOTTOMMARGIN, 207
END