Tera TermRevision: 7893
https://osdn.net/projects/ttssh2/scm/svn/commits/7893
Author: yutakapon
Date: 2019-07-29 16:09:16 +0900 (Mon, 29 Jul 2019)
Log Message:
-----------
SSH1接続で、rhosts認証ができなくなっていた問題を修正した。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2019-07-29 03:18:48 UTC (rev 7892)
+++ trunk/doc/en/html/about/history.html 2019-07-29 07:09:16 UTC (rev 7893)
@@ -3165,6 +3165,7 @@
<ul>
<li>SSH2: When SSH communication is slow by using port forwarding, an application fault is occurred due to increase memory consumption.</li>
<li>SSH1: When the destination port number is other than 22, an application fault may be occurred after the host key is newly written to known_hosts file.</li>
+ <li>SSH1: The rhosts authentication could not be performed at all.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2019-07-29 03:18:48 UTC (rev 7892)
+++ trunk/doc/ja/html/about/history.html 2019-07-29 07:09:16 UTC (rev 7893)
@@ -3171,6 +3171,7 @@
<ul>
<li>SSH2: \x83|\x81[\x83g\x93]\x91\x97\x82\xC5SSH\x92ʐM\x82\xAA\x92x\x82\xA2\x8Fꍇ\x82ɂ\xA8\x82\xA2\x82āA\x8F\xC1\x94\x83\x82\x83\x8A\x82\xAA\x94\xEC\x91剻\x82\xB5\x82ăA\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>SSH1: \x90ڑ\xB1\x90\xE6\x82̃|\x81[\x83g\x94ԍ\x86\x82\xAA22\x88ȊO\x82ŁA\x90V\x8BK\x82\xC9known_hosts\x83t\x83@\x83C\x83\x8B\x82փz\x83X\x83g\x8C\xAE\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82ގ\x9E\x81A\x83A\x83v\x83\x8A\x82\xAA\x97\x8E\x82\xBF\x82邱\x82Ƃ\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li>SSH1: rhosts\x94F\x8F\xAA\x82ł\xAB\x82Ȃ\xAD\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2019-07-29 03:18:48 UTC (rev 7892)
+++ trunk/ttssh2/ttxssh/ssh.c 2019-07-29 07:09:16 UTC (rev 7893)
@@ -2530,7 +2530,10 @@
if (grab_payload(pvar, challenge_bytes)) {
unsigned char *outmsg = begin_send_packet(pvar, SSH_CMSG_AUTH_RSA_RESPONSE, 16);
- if (pvar->auth_state.cur_cred.method == SSH_AUTH_RSA) {
+ // rhosts\x94F\x8F\xD8(SSH1)\x82\xAA\x82ł\xAB\x82\xE9\x82悤\x82\xC9 SSH_AUTH_RHOSTS_RSA \x82\xF0\x8F\xF0\x8C\x8F\x82ɒlj\xC1\x82\xB7\x82\xE9\x81B
+ if (pvar->auth_state.cur_cred.method == SSH_AUTH_RSA ||
+ pvar->auth_state.cur_cred.method == SSH_AUTH_RHOSTS_RSA
+ ) {
if (CRYPT_generate_RSA_challenge_response
(pvar, pvar->ssh_state.payload + 2, challenge_bytes, outmsg)) {