Tera TermRevision: 7894
https://osdn.net/projects/ttssh2/scm/svn/commits/7894
Author: yutakapon
Date: 2019-07-29 16:11:39 +0900 (Mon, 29 Jul 2019)
Log Message:
-----------
trunkからリビジョン7893をマージ:
SSH1接続で、rhosts認証ができなくなっていた問題を修正した。
........
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c
Property Changed:
----------------
branches/openssl_1_1_1_v2/
-------------- next part --------------
Index: branches/openssl_1_1_1_v2
===================================================================
--- branches/openssl_1_1_1_v2 2019-07-29 07:09:16 UTC (rev 7893)
+++ branches/openssl_1_1_1_v2 2019-07-29 07:11:39 UTC (rev 7894)
Property changes on: branches/openssl_1_1_1_v2
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
/branches/drag_and_drop:7130,7139,7141,7143-7147
/branches/ssh_ed25519:5495-5544
/branches/vs2015_warn:6194-6285
-/tags/teraterm-4_89:6182
\ No newline at end of property
+/tags/teraterm-4_89:6182
+/trunk:7893
\ No newline at end of property
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c 2019-07-29 07:09:16 UTC (rev 7893)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c 2019-07-29 07:11:39 UTC (rev 7894)
@@ -2508,7 +2508,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)) {