[Ttssh2-commit] [4080] SSH2 認証で、サーバが認証方式を返さなかったときにアプリケーションが落ちる問題を修正した。

svnno****@sourc***** svnno****@sourc*****
2010年 9月 2日 (木) 01:20:47 JST


Revision: 4080
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4080
Author:   maya
Date:     2010-09-02 01:20:47 +0900 (Thu, 02 Sep 2010)

Log Message:
-----------
SSH2 認証で、サーバが認証方式を返さなかったときにアプリケーションが落ちる問題を修正した。
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=22981

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    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/ssh.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/doc/en/html/about/history.html	2010-09-01 16:20:47 UTC (rev 4080)
@@ -45,10 +45,11 @@
     </ul>
   </li -->
 
-  <!-- li>Misc
+  <li>Misc
     <ul>
+      <li>upgraded TTSSH version supporting SSH2 to <a href="#ttssh_2.55">2.55</a></li>
     </ul>
-  </li -->
+  </li>
 
 </ul>
 
@@ -1553,6 +1554,15 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.55">2010.x.xx (Ver 2.55 unreleased)</a></h3>
+<ul class="history">
+  <li>Bug fixes
+    <ul>
+      <!--li>SSH2 ”FØ‚ŁAƒT[ƒo‚ª”FØ•ûŽ®‚ð•Ô‚³‚È‚©‚Á‚½‚Æ‚«‚ɃAƒvƒŠƒP[ƒVƒ‡ƒ“‚ª—Ž‚¿‚é–â‘è‚ðC³‚µ‚½B</li-->
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.54">2010.8.31 (Ver 2.54)</a></h3>
 <ul class="history">
   <li>Bug fixes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/doc/ja/html/about/history.html	2010-09-01 16:20:47 UTC (rev 4080)
@@ -44,10 +44,11 @@
     </ul>
   </li -->
 
-  <!-- li>‚»‚Ì‘¼
+  <li>‚»‚Ì‘¼
     <ul>
+      <li><a href="#ttssh_2.55">SSH2‘ΉžTTSSH(2.55)</a>‚֍·‚µ‘Ö‚¦‚½B</li>
     </ul>
-  </li -->
+  </li>
 
 </ul>
 
@@ -1554,6 +1555,15 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
+<h3><a name="ttssh_2.55">2010.x.xx (Ver 2.55 unreleased)</a></h3>
+<ul class="history">
+  <li>ƒoƒOC³
+    <ul>
+      <li>SSH2 ”FØ‚ŁAƒT[ƒo‚ª”FØ•ûŽ®‚ð•Ô‚³‚È‚©‚Á‚½‚Æ‚«‚ɃAƒvƒŠƒP[ƒVƒ‡ƒ“‚ª—Ž‚¿‚é–â‘è‚ðC³‚µ‚½B</li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="ttssh_2.54">2010.8.31 (Ver 2.54)</a></h3>
 <ul class="history">
   <li>ƒoƒOC³

Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/installer/release/lang/English.lng	2010-09-01 16:20:47 UTC (rev 4080)
@@ -726,6 +726,7 @@
 MSG_SSH_DECRYPT_RSA_ERROR=An error occurred while decrypting the RSA challenge.\nPerhaps the key file is corrupted.
 MSG_SSH_UNSUPPORT_AUTH_METHOD_ERROR=Internal error: unsupported authentication method
 MSG_SSH_AUTH_FAILURE_ERROR=SSH2 autologin error: user authentication failed.
+MSG_SSH_SERVER_NO_AUTH_METHOD_ERROR=The server doesn't have valid authentication method.
 MSG_SSH_SERVER_UNSUPPORT_AUTH_METHOD_ERROR=\nAuthentication method is not supported by server.
 MSG_SSH_CHANNEL_OPEN_ERROR=SSH2_MSG_CHANNEL_OPEN_FAILURE was received.\nchannel [%d]: reason: %s(%d) message: %s
 MSG_SSH_NO_FREE_CHANNEL=Could not open new channel. TTSSH is already opening too many channels.

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/installer/release/lang/French.lng	2010-09-01 16:20:47 UTC (rev 4080)
@@ -725,6 +725,7 @@
 MSG_SSH_DECRYPT_RSA_ERROR=Une erreur est survenue pendant le decryptage du challenge RSA.\nIl est possible que le fichier clé soit corrompu.
 MSG_SSH_UNSUPPORT_AUTH_METHOD_ERROR=Erreur interne: méthode d'authentification non supportée
 MSG_SSH_AUTH_FAILURE_ERROR=erreur auto-logging SSH2: L'authentification de l'utilisateur a échoué.
+MSG_SSH_SERVER_NO_AUTH_METHOD_ERROR=The server doesn't have valid authentication method.
 MSG_SSH_SERVER_UNSUPPORT_AUTH_METHOD_ERROR=\nLa méthode d'authentification n'est pas supportée par le serveur.
 MSG_SSH_CHANNEL_OPEN_ERROR=Un message SSH2 d'erreur d'ouverture de canal a été reçu.\ncanal [%d]: cause: %s(%d) message: %s
 MSG_SSH_NO_FREE_CHANNEL=Impossible d'ouvrir un nouveau canal. TTSSH tente actuellement d'ouvrir trop de canaux.

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/installer/release/lang/German.lng	2010-09-01 16:20:47 UTC (rev 4080)
@@ -723,6 +723,7 @@
 MSG_SSH_DECRYPT_RSA_ERROR=An error occurred while decrypting the RSA challenge.\nPerhaps the key file is corrupted.
 MSG_SSH_UNSUPPORT_AUTH_METHOD_ERROR=Internal error: unsupported authentication method
 MSG_SSH_AUTH_FAILURE_ERROR=SSH2 autologin error: user authentication failed.
+MSG_SSH_SERVER_NO_AUTH_METHOD_ERROR=The server doesn't have valid authentication method.
 MSG_SSH_SERVER_UNSUPPORT_AUTH_METHOD_ERROR=\nAuthentication method is not supported by server.
 MSG_SSH_CHANNEL_OPEN_ERROR=SSH2_MSG_CHANNEL_OPEN_FAILURE was received.\nchannel [%d]: reason: %s(%d) message: %s
 MSG_SSH_NO_FREE_CHANNEL=Could not open new channel. TTSSH is already opening too many channels.

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/installer/release/lang/Japanese.lng	2010-09-01 16:20:47 UTC (rev 4080)
@@ -726,6 +726,7 @@
 MSG_SSH_DECRYPT_RSA_ERROR=RSA •œ†’†‚ɃGƒ‰[‚ª”­¶‚µ‚Ü‚µ‚½. \nŒ®ƒtƒ@ƒCƒ‹‚ªŒë‚è, ‚Ü‚½‚Í”j‘¹‚µ‚Ä‚¢‚éê‡‚ª‚ ‚è‚Ü‚·.
 MSG_SSH_UNSUPPORT_AUTH_METHOD_ERROR=“à•”ƒGƒ‰[: ƒTƒ|[ƒgŠO‚Ì”FØ•û–@
 MSG_SSH_AUTH_FAILURE_ERROR=SSH2Ž©“®ƒƒOƒCƒ“ƒGƒ‰[: ƒ†[ƒU[”FØ‚ªŽ¸”s‚µ‚Ü‚µ‚½.
+MSG_SSH_SERVER_NO_AUTH_METHOD_ERROR=ƒT[ƒo‚É—LŒø‚È”FØ•ûŽ®‚ª‚ ‚è‚Ü‚¹‚ñ.
 MSG_SSH_SERVER_UNSUPPORT_AUTH_METHOD_ERROR=\nƒT[ƒo‚ŃTƒ|[ƒg‚³‚ê‚Ä‚¢‚È‚¢”FØ•û–@‚Å‚·.
 MSG_SSH_CHANNEL_OPEN_ERROR=SSH2_MSG_CHANNEL_OPEN_FAILURE ‚ðŽóM‚µ‚Ü‚µ‚½. \nƒ`ƒƒƒlƒ‹ [%d]: ——R: %s(%d) ƒƒbƒZ[ƒW: %s
 MSG_SSH_NO_FREE_CHANNEL=V‚µ‚¢ƒ`ƒƒƒlƒ‹‚ðŠJ‚¯‚Ü‚¹‚ñ. ƒ`ƒƒƒlƒ‹‚ª‚·‚ׂĎg—p’†‚Å‚·.

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2010-09-01 14:00:04 UTC (rev 4079)
+++ trunk/ttssh2/ttxssh/ssh.c	2010-09-01 16:20:47 UTC (rev 4080)
@@ -7285,6 +7285,14 @@
 	partial = data[0];
 	data += 1;
 
+	// —LŒø‚È”FØ•ûŽ®‚ª‚È‚¢ê‡
+	if (cstring == NULL) {
+		UTIL_get_lang_msg("MSG_SSH_SERVER_NO_AUTH_METHOD_ERROR", pvar,
+		                  "SSH2 auth error: The server doesn't have valid authentication method.");
+		notify_fatal_error(pvar, pvar->ts->UIMsg);
+		return FALSE;
+	}
+
 	// tryed_ssh2_authlist ‚ª FALSE ‚̏ꍇ‚́A‚Ü‚¾”FØ‚ðŽŽs‚ð‚µ‚Ä‚¢‚È‚¢B
 	if (!pvar->tryed_ssh2_authlist) {
 		int type = 0;



Ttssh2-commit メーリングリストの案内