May 25, 2018 updates: Privacy Policy
  • R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7101 (tree)
Time2018-04-19 20:58:00
Authordoda

Log Message

keyboard-interactive 認証の表記を修正 #38004

併せて /passwd=keyboard-interactive を追加

Change Summary

Incremental Difference

--- trunk/doc/ja/html/menu/setup-sshauth.html (revision 7100)
+++ trunk/doc/ja/html/menu/setup-sshauth.html (revision 7101)
@@ -68,7 +68,7 @@
6868
6969 <li>
7070 <dl>
71- <dt>Use challenge/response to log in (SSH1:TIS, SSH2:keyboard-interactive)</dt>
71+ <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
7272 <dd>
7373 <dl>
7474 <dt>SSH1</dt>
--- trunk/doc/ja/html/usage/ssh.html (revision 7100)
+++ trunk/doc/ja/html/usage/ssh.html (revision 7101)
@@ -31,7 +31,8 @@
3131 </ul>
3232 </li>
3333 <li>SSH1 における rhosts 認証</li>
34- <li>challenge/response (SSH1), keyboard-interactive (SSH2) 認証</li>
34+ <li>SSH1 における challenge/response(TIS) 認証</li>
35+ <li>SHS2 における keyboard-interactive 認証</li>
3536 </ul>
3637 があります。ここでは需要が多いと思われる認証方法について触れたいと思います。
3738 </p>
@@ -59,7 +60,7 @@
5960 ※パスワード送信時の SSH パケットは暗号化されているので、TELNET のようにパスワードが平文で送信されることはありません。</li>
6061 <li>公開鍵認証を用いる場合は、上から2番目の「Use RSA/DSA/ECDSA/ED25519 key to log in」にチェックをつけ、「Private key file:」ボタンを押して秘密キーのファイルを指定します。その後ユーザ名と秘密キーのパスフレーズを入力してログインします。<br>
6162 ※OpenSSH 形式のほか、TTSSH 2.63(Tera Term 4.76) 以降では PuTTY 形式・SECSH(ssh.com) 形式の SSH2 秘密鍵に対応しています。</li>
62- <li>keyboard-interactive認証を使用する場合は「Use challange/response to log in(keyboard-interactive)」にチェックをつけ、ユーザ名を入力します。<br>
63+ <li>keyboard-interactive認証を使用する場合は「Use keyboard-interactive to log in」にチェックをつけ、ユーザ名を入力します。<br>
6364 サーバからのプロンプトと文字列を入力するダイアログが表示されるので、パスワードを入力します。</li>
6465 <li>Pageant を用いて認証する場合は「Use Pageant」にチェックをつけ、ユーザ名を入力します。</li>
6566 </ul>
--- trunk/doc/ja/html/commandline/ttssh.html (revision 7100)
+++ trunk/doc/ja/html/commandline/ttssh.html (revision 7101)
@@ -82,7 +82,8 @@
8282 <ul>
8383 <li><span class="syntax">password</span> パスワード認証</li>
8484 <li><span class="syntax">publickey</span> 公開鍵認証</li>
85- <li><span class="syntax">challenge</span> チャレンジレスポンス(キーボードインタラクティブ)認証</li>
85+ <li><span class="syntax">challenge</span> SSH1:チャレンジレスポンス(TIS)認証 / SSH2:キーボードインタラクティブ認証</li>
86+ <li><span class="syntax">keyboard-interactive</span> challenge と同じ</li>
8687 <li><span class="syntax">pageant</span> Pageant を用いた公開鍵認証</li>
8788 </ul></dd>
8889
--- trunk/doc/en/html/commandline/ttssh.html (revision 7100)
+++ trunk/doc/en/html/commandline/ttssh.html (revision 7101)
@@ -82,7 +82,8 @@
8282 <ul>
8383 <li><span class="syntax">password</span> Password Authentication</li>
8484 <li><span class="syntax">publickey</span> Public Key Authentication</li>
85- <li><span class="syntax">challenge</span> Challenge/Response(Keyboard-interactive) Authentication</li>
85+ <li><span class="syntax">challenge</span> SSH1:Challenge/Response(TIS) Authentication / SSH2:Keyboard-interactive Authentication</li>
86+ <li><span class="syntax">keyboard-interactive</span> Same as the challenge</li>
8687 <li><span class="syntax">pageant</span> Public Key Authentication with Pageant</li>
8788 </ul></dd>
8889
--- trunk/doc/en/html/menu/setup-sshauth.html (revision 7100)
+++ trunk/doc/en/html/menu/setup-sshauth.html (revision 7101)
@@ -68,7 +68,7 @@
6868
6969 <li>
7070 <dl>
71- <dt>Use challenge/response to log in (SSH1:TIS, SSH2:keyboard-interactive)</dt>
71+ <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
7272 <dd>
7373 <dl>
7474 <dt>SSH1</dt>
--- trunk/doc/en/html/usage/ssh.html (revision 7100)
+++ trunk/doc/en/html/usage/ssh.html (revision 7101)
@@ -32,7 +32,8 @@
3232 </ul>
3333 </li>
3434 <li>rhosts authentication for SSH1</li>
35- <li>challenge/response (SSH1), keyboard-interactive (SSH2) authentication</li>
35+ <li>challenge/response(TIS) authentication for SSH1</li>
36+ <li>keyboard-interactive authentication for SSH2</li>
3637 </ul>
3738 In this document, we will describe Password authentication and Key-pair authentication which would be most widely used.
3839 </p>
@@ -60,7 +61,7 @@
6061 NOTE: The password can not be sent as plain text like TELNET protocol because the SSH packet including the password data is encrypted.</li>
6162 <li>When using public key authentication, check [RSA/DSA/ECDSA/ED25519 key to log in] (second from the top line) and click [Private key file:] to specify Private key file. Then type in username and Private key pass phrase.<br>
6263 Note: TTSSH 2.63(Tera Term 4.76) later can support the PuTTY format and SECSH(ssh.com) format of the SSH2 private key.</li>
63- <li>When the keyboard-interactive authentication is used, check the [Use challenge/response to log in(keyboard-interactive)] and input your user name.<br>
64+ <li>When the keyboard-interactive authentication is used, check the [Use keyboard-interactive to log in] and input your user name.<br>
6465 Next, the dialog with the server prompt and string is shown and input your password.</li>
6566 <li>When the Pageant is used, check the [Use Pageant] and input your user name.</li>
6667 </ul>
--- trunk/ttssh2/ttxssh/ttxssh.c (revision 7100)
+++ trunk/ttssh2/ttxssh/ttxssh.c (revision 7101)
@@ -1946,7 +1946,10 @@
19461946 //pvar->auth_state.cur_cred.method = SSH_AUTH_PASSWORD;
19471947 pvar->ssh2_authmethod = SSH_AUTH_PASSWORD;
19481948
1949- // /auth=challenge を追加 (2007.10.5 maya)
1949+ } else if (_stricmp(option + 6, "keyboard-interactive") == 0) { // keyboard-interactive認証
1950+ //pvar->auth_state.cur_cred.method = SSH_AUTH_TIS;
1951+ pvar->ssh2_authmethod = SSH_AUTH_TIS;
1952+
19501953 } else if (_stricmp(option + 6, "challenge") == 0) { // keyboard-interactive認証
19511954 //pvar->auth_state.cur_cred.method = SSH_AUTH_TIS;
19521955 pvar->ssh2_authmethod = SSH_AUTH_TIS;
--- trunk/ttssh2/ttxssh/auth.c (revision 7100)
+++ trunk/ttssh2/ttxssh/auth.c (revision 7101)
@@ -255,11 +255,11 @@
255255 // SSH バージョンによって TIS のラベルを書き換え
256256 if (pvar->settings.ssh_protocol_version == 1) {
257257 UTIL_get_lang_msg("DLG_AUTH_METHOD_CHALLENGE1", pvar,
258- "Use challenge/response to log in(&TIS)");
258+ "Use challenge/response(&TIS) to log in");
259259 SetDlgItemText(dlg, IDC_SSHUSETIS, pvar->ts->UIMsg);
260260 } else {
261261 UTIL_get_lang_msg("DLG_AUTH_METHOD_CHALLENGE2", pvar,
262- "Use &challenge/response to log in(keyboard-interactive)");
262+ "Use keyboard-&interactive to log in");
263263 SetDlgItemText(dlg, IDC_SSHUSETIS, pvar->ts->UIMsg);
264264 }
265265
Show on old repository browser