[4313] SSH2 では、SSH1 と同じ server key / host key というの組み合わせではなく、鍵交換の時だけ一時的に使われる client key / server key となるので表記を変更 (Ttssh2-commit) - Tera Term

Revision: 4313
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4313
Author:   maya
Date:     2011-02-17 00:48:49 +0900 (Thu, 17 Feb 2011)

Log Message:
-----------
SSH2 ã§ã¯ã€SSH1 ã¨åŒã˜ server key/host key ã¨ã„ã†ã®çµ„ã¿åˆã‚ã›ã§ã¯ãªãã€éµäº¤æ›ã®æ™‚ã ã‘ä¸€æ™‚çš„ã«ä½¿ã‚ã‚Œã‚‹ client key/server key ã¨ãªã‚‹ã®ã§è¡¨è¨˜ã‚’å¤‰æ›´

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/ttssh2/ttxssh/crypt.c
    trunk/ttssh2/ttxssh/ttxssh.c


-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================

--- trunk/installer/release/lang/English.lng	2011-02-16 15:13:50 UTC (rev 4312)
+++ trunk/installer/release/lang/English.lng	2011-02-16 15:48:49 UTC (rev 4313)
@@ -456,6 +456,7 @@
 DLG_ABOUT_PROTOCOL=Using protocol:
 DLG_ABOUT_ENCRYPTION=Encryption:
 DLG_ABOUT_SERVERKEY=Server keys:
+DLG_ABOUT_KEXKEY=Key exchange keys:
 DLG_ABOUT_AUTH=Authentication:
 DLG_ABOUT_COMP=Compression:
 DLG_ABOUT_CLIENTID=Client ID:
@@ -465,6 +466,7 @@
 DLG_ABOUT_COMPDELAY=Delayed Compression:
 DLG_ABOUT_CIPHER_INFO=%s to server, %s from server
 DLG_ABOUT_KEY_INFO=%d-bit server key, %d-bit host key
+DLG_ABOUT_KEY_INFO2=%d-bit client key, %d-bit server key
 DLG_ABOUT_KEY_NONE=None
 DLG_ABOUT_COMP_INFO=level %d; ratio %.1f (%ld:%ld)
 DLG_ABOUT_COMP_INFO2=level %d

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2011-02-16 15:13:50 UTC (rev 4312)
+++ trunk/installer/release/lang/French.lng	2011-02-16 15:48:49 UTC (rev 4313)
@@ -456,6 +456,7 @@
 DLG_ABOUT_PROTOCOL=Protocole utilisé:
 DLG_ABOUT_ENCRYPTION=Cryptage:
 DLG_ABOUT_SERVERKEY=Clé du serveur:
+DLG_ABOUT_KEXKEY=Key exchange keys:
 DLG_ABOUT_AUTH=Authentication:
 DLG_ABOUT_COMP=Compression:
 DLG_ABOUT_CLIENTID=ID Client:
@@ -465,6 +466,7 @@
 DLG_ABOUT_COMPDELAY=Compression retardée:
 DLG_ABOUT_CIPHER_INFO=%s vers le serveur, %s depuis le server
 DLG_ABOUT_KEY_INFO=%d-bit clé serveur, %d-bit clé hôte
+DLG_ABOUT_KEY_INFO2=%d-bit client key, %d-bit server key
 DLG_ABOUT_KEY_NONE=Aucun
 DLG_ABOUT_COMP_INFO=niveau %d; ratio %.1f (%ld:%ld)
 DLG_ABOUT_COMP_INFO2=niveau %d

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2011-02-16 15:13:50 UTC (rev 4312)
+++ trunk/installer/release/lang/German.lng	2011-02-16 15:48:49 UTC (rev 4313)
@@ -456,6 +456,7 @@
 DLG_ABOUT_PROTOCOL=Verwendetes Protokoll:
 DLG_ABOUT_ENCRYPTION=Verschlüsselung:
 DLG_ABOUT_SERVERKEY=Server-Schlüssel:
+DLG_ABOUT_KEXKEY=Key exchange keys:
 DLG_ABOUT_AUTH=Authentifikation:
 DLG_ABOUT_COMP=Kompression:
 DLG_ABOUT_CLIENTID=Client-ID:
@@ -464,7 +465,8 @@
 DLG_ABOUT_FROMSERVER=" vom Server"
 DLG_ABOUT_COMPDELAY=Delayed Compression:
 DLG_ABOUT_CIPHER_INFO=%s zum Server, %s vom Server
-DLG_ABOUT_KEY_INFO=%d-Bit-Server-Schlüssel, %d-Bit-Client-Schlüssel
+DLG_ABOUT_KEY_INFO=%d-bit server key, %d-bit host key
+DLG_ABOUT_KEY_INFO2=%d-Bit-Client-Schlüssel, %d-Bit-Server-Schlüssel
 DLG_ABOUT_KEY_NONE=Keiner
 DLG_ABOUT_COMP_INFO=level %d; ratio %.1f (%ld:%ld)
 DLG_ABOUT_COMP_INFO2=level %d

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2011-02-16 15:13:50 UTC (rev 4312)
+++ trunk/installer/release/lang/Japanese.lng	2011-02-16 15:48:49 UTC (rev 4313)
@@ -456,6 +456,7 @@
 DLG_ABOUT_PROTOCOL=ƒvƒƒgƒRƒ‹‚Ìƒo[ƒWƒ‡ƒ“:
 DLG_ABOUT_ENCRYPTION=ˆÃ†‰»•ûŽ®:
 DLG_ABOUT_SERVERKEY=ƒT[ƒoŒ®:
+DLG_ABOUT_KEXKEY=Œ®ŒðŠ·‚ÌŒ®:
 DLG_ABOUT_AUTH=”FØ•ûŽ®:
 DLG_ABOUT_COMP=ˆ³kó‹µ:
 DLG_ABOUT_CLIENTID=ƒNƒ‰ƒCƒAƒ“ƒgID:
@@ -465,6 +466,7 @@
 DLG_ABOUT_COMPDELAY=’x‰„ˆ³kó‹µ:
 DLG_ABOUT_CIPHER_INFO=%s ‚ÅƒT[ƒo‚Ö, %s ‚ÅƒT[ƒo‚©‚ç
 DLG_ABOUT_KEY_INFO=%d-bit server key, %d-bit host key
+DLG_ABOUT_KEY_INFO2=%d-bit client key, %d-bit server key
 DLG_ABOUT_KEY_NONE=None
 DLG_ABOUT_COMP_INFO=ƒŒƒxƒ‹ %d; ˆ³k”ä %.1f (%ld:%ld)
 DLG_ABOUT_COMP_INFO2=ƒŒƒxƒ‹ %d

Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2011-02-16 15:13:50 UTC (rev 4312)
+++ trunk/ttssh2/ttxssh/crypt.c	2011-02-16 15:48:49 UTC (rev 4313)
@@ -1737,11 +1737,11 @@
 			            BN_num_bits(pvar->crypt_state.host_key.RSA_key->n));
 		}
 	} else { // SSH2
-			UTIL_get_lang_msg("DLG_ABOUT_KEY_INFO", pvar,
-			                  "%d-bit server key, %d-bit host key");
+			UTIL_get_lang_msg("DLG_ABOUT_KEY_INFO2", pvar,
+			                  "%d-bit client key, %d-bit server key");
 			_snprintf_s(dest, len, _TRUNCATE, pvar->ts->UIMsg,
-			            pvar->server_key_bits,
-			            pvar->client_key_bits);
+			            pvar->client_key_bits,
+			            pvar->server_key_bits);
 	}
 }
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2011-02-16 15:13:50 UTC (rev 4312)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2011-02-16 15:48:49 UTC (rev 4313)
@@ -2260,7 +2260,7 @@
 			UTIL_get_lang_msg("DLG_ABOUT_ENCRYPTION", pvar, "Encryption:");
 			append_about_text(dlg, pvar->ts->UIMsg, buf);
 			CRYPT_get_server_key_info(pvar, buf, sizeof(buf));
-			UTIL_get_lang_msg("DLG_ABOUT_SERVERKEY", pvar, "Server keys:");
+			UTIL_get_lang_msg("DLG_ABOUT_KEXKEY", pvar, "Key exchange keys:");
 			append_about_text(dlg, pvar->ts->UIMsg, buf);
 
 			AUTH_get_auth_info(pvar, buf, sizeof(buf));


Tera Term

[Ttssh2-commit] [4313] SSH2 では、SSH1 と同じ server key / host key というの組み合わせではなく、鍵交換の時だけ一時的に使われる client key / server key となるので表記を変更