scmno****@osdn*****
scmno****@osdn*****
2018年 4月 19日 (木) 20:58:01 JST
Tera TermRevision: 7101
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7101
Author: doda
Date: 2018-04-19 20:58:00 +0900 (Thu, 19 Apr 2018)
Log Message:
-----------
keyboard-interactive 認証の表記を修正 #38004
併せて /passwd=keyboard-interactive を追加
Ticket Links:
------------
http://sourceforge.jp/projects/ttssh2/tracker/detail/38004
Modified Paths:
--------------
trunk/doc/en/html/commandline/ttssh.html
trunk/doc/en/html/menu/setup-sshauth.html
trunk/doc/en/html/usage/ssh.html
trunk/doc/ja/html/commandline/ttssh.html
trunk/doc/ja/html/menu/setup-sshauth.html
trunk/doc/ja/html/usage/ssh.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/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
trunk/installer/release/lang/Simplified Chinese.lng
trunk/installer/release/lang/Traditional Chinese.lng
trunk/ttssh2/ttxssh/auth.c
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/doc/en/html/commandline/ttssh.html
===================================================================
--- trunk/doc/en/html/commandline/ttssh.html 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/doc/en/html/commandline/ttssh.html 2018-04-19 11:58:00 UTC (rev 7101)
@@ -82,7 +82,8 @@
<ul>
<li><span class="syntax">password</span> Password Authentication</li>
<li><span class="syntax">publickey</span> Public Key Authentication</li>
- <li><span class="syntax">challenge</span> Challenge/Response(Keyboard-interactive) Authentication</li>
+ <li><span class="syntax">challenge</span> SSH1:Challenge/Response(TIS) Authentication / SSH2:Keyboard-interactive Authentication</li>
+ <li><span class="syntax">keyboard-interactive</span> Same as the challenge</li>
<li><span class="syntax">pageant</span> Public Key Authentication with Pageant</li>
</ul></dd>
Modified: trunk/doc/en/html/menu/setup-sshauth.html
===================================================================
--- trunk/doc/en/html/menu/setup-sshauth.html 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/doc/en/html/menu/setup-sshauth.html 2018-04-19 11:58:00 UTC (rev 7101)
@@ -68,7 +68,7 @@
<li>
<dl>
- <dt>Use challenge/response to log in (SSH1:TIS, SSH2:keyboard-interactive)</dt>
+ <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
<dd>
<dl>
<dt>SSH1</dt>
Modified: trunk/doc/en/html/usage/ssh.html
===================================================================
--- trunk/doc/en/html/usage/ssh.html 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/doc/en/html/usage/ssh.html 2018-04-19 11:58:00 UTC (rev 7101)
@@ -32,7 +32,8 @@
</ul>
</li>
<li>rhosts authentication for SSH1</li>
- <li>challenge/response (SSH1), keyboard-interactive (SSH2) authentication</li>
+ <li>challenge/response(TIS) authentication for SSH1</li>
+ <li>keyboard-interactive authentication for SSH2</li>
</ul>
In this document, we will describe Password authentication and Key-pair authentication which would be most widely used.
</p>
@@ -60,7 +61,7 @@
NOTE: The password can not be sent as plain text like TELNET protocol because the SSH packet including the password data is encrypted.</li>
<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>
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>
- <li>When the keyboard-interactive authentication is used, check the [Use challenge/response to log in(keyboard-interactive)] and input your user name.<br>
+ <li>When the keyboard-interactive authentication is used, check the [Use keyboard-interactive to log in] and input your user name.<br>
Next, the dialog with the server prompt and string is shown and input your password.</li>
<li>When the Pageant is used, check the [Use Pageant] and input your user name.</li>
</ul>
Modified: trunk/doc/ja/html/commandline/ttssh.html
===================================================================
--- trunk/doc/ja/html/commandline/ttssh.html 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/doc/ja/html/commandline/ttssh.html 2018-04-19 11:58:00 UTC (rev 7101)
@@ -82,7 +82,8 @@
<ul>
<li><span class="syntax">password</span> \x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F\xD8</li>
<li><span class="syntax">publickey</span> \x8C\xF6\x8AJ\x8C\xAE\x94F\x8F\xD8</li>
- <li><span class="syntax">challenge</span> \x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X(\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u)\x94F\x8F\xD8</li>
+ <li><span class="syntax">challenge</span> SSH1:\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X(TIS)\x94F\x8F\xD8 / SSH2:\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F\xD8</li>
+ <li><span class="syntax">keyboard-interactive</span> challenge \x82Ɠ\xAF\x82\xB6</li>
<li><span class="syntax">pageant</span> Pageant \x82\xF0\x97p\x82\xA2\x82\xBD\x8C\xF6\x8AJ\x8C\xAE\x94F\x8F\xD8</li>
</ul></dd>
Modified: trunk/doc/ja/html/menu/setup-sshauth.html
===================================================================
--- trunk/doc/ja/html/menu/setup-sshauth.html 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/doc/ja/html/menu/setup-sshauth.html 2018-04-19 11:58:00 UTC (rev 7101)
@@ -68,7 +68,7 @@
<li>
<dl>
- <dt>Use challenge/response to log in (SSH1:TIS, SSH2:keyboard-interactive)</dt>
+ <dt>Use SSH1:challenge/response(TIS) / SSH2:keyboard-interactive to log in</dt>
<dd>
<dl>
<dt>SSH1</dt>
Modified: trunk/doc/ja/html/usage/ssh.html
===================================================================
--- trunk/doc/ja/html/usage/ssh.html 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/doc/ja/html/usage/ssh.html 2018-04-19 11:58:00 UTC (rev 7101)
@@ -31,7 +31,8 @@
</ul>
</li>
<li>SSH1 \x82ɂ\xA8\x82\xAF\x82\xE9 rhosts \x94F\x8F\xD8</li>
- <li>challenge/response (SSH1), keyboard-interactive (SSH2) \x94F\x8F\xD8</li>
+ <li>SSH1 \x82ɂ\xA8\x82\xAF\x82\xE9 challenge/response(TIS) \x94F\x8F\xD8</li>
+ <li>SHS2 \x82ɂ\xA8\x82\xAF\x82\xE9 keyboard-interactive \x94F\x8F\xD8</li>
</ul>
\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B\x82\xB1\x82\xB1\x82ł͎\xF9\x97v\x82\xAA\x91\xBD\x82\xA2\x82Ǝv\x82\xED\x82\xEA\x82\xE9\x94F\x8Fؕ\xFB\x96@\x82ɂ‚\xA2\x82ĐG\x82ꂽ\x82\xA2\x82Ǝv\x82\xA2\x82܂\xB7\x81B
</p>
@@ -59,7 +60,7 @@
\x81\xA6\x83p\x83X\x83\x8F\x81[\x83h\x91\x97\x90M\x8E\x9E\x82\xCC SSH \x83p\x83P\x83b\x83g\x82͈Í\x86\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9\x82̂ŁATELNET \x82̂悤\x82Ƀp\x83X\x83\x8F\x81[\x83h\x82\xAA\x95\xBD\x95\xB6\x82ő\x97\x90M\x82\xB3\x82\xEA\x82邱\x82Ƃ͂\xA0\x82\xE8\x82܂\xB9\x82\xF1\x81B</li>
<li>\x8C\xF6\x8AJ\x8C\xAE\x94F\x8F\xF0\x97p\x82\xA2\x82\xE9\x8Fꍇ\x82́A\x8Fォ\x82\xE72\x94Ԗڂ́uUse RSA/DSA/ECDSA/ED25519 key to log in\x81v\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x82‚\xAF\x81A\x81uPrivate key file:\x81v\x83{\x83^\x83\x93\x82\xF0\x89\x9F\x82\xB5\x82Ĕ閧\x83L\x81[\x82̃t\x83@\x83C\x83\x8B\x82\xF0\x8Ew\x92肵\x82܂\xB7\x81B\x82\xBB\x82̌テ\x81[\x83U\x96\xBC\x82Ɣ閧\x83L\x81[\x82̃p\x83X\x83t\x83\x8C\x81[\x83Y\x82\xF0\x93\xFC\x97͂\xB5\x82ă\x8D\x83O\x83C\x83\x93\x82\xB5\x82܂\xB7\x81B<br>
\x81\xA6OpenSSH \x8C`\x8E\xAE\x82̂ق\xA9\x81ATTSSH 2.63(Tera Term 4.76) \x88ȍ~\x82ł\xCD PuTTY \x8C`\x8E\xAE\x81ESECSH(ssh.com) \x8C`\x8E\xAE\x82\xCC SSH2 \x94閧\x8C\xAE\x82ɑΉ\x9E\x82\xB5\x82Ă\xA2\x82܂\xB7\x81B</li>
- <li>keyboard-interactive\x94F\x8F\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8Fꍇ\x82́uUse challange/response to log in(keyboard-interactive)\x81v\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x82‚\xAF\x81A\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x93\xFC\x97͂\xB5\x82܂\xB7\x81B<br>
+ <li>keyboard-interactive\x94F\x8F\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8Fꍇ\x82́uUse keyboard-interactive to log in\x81v\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x82‚\xAF\x81A\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x93\xFC\x97͂\xB5\x82܂\xB7\x81B<br>
\x83T\x81[\x83o\x82\xA9\x82\xE7\x82̃v\x83\x8D\x83\x93\x83v\x83g\x82ƕ\xB6\x8E\x9A\x97\xF1\x82\xF0\x93\xFC\x97͂\xB7\x82\xE9\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x82̂ŁA\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x93\xFC\x97͂\xB5\x82܂\xB7\x81B</li>
<li>Pageant \x82\xF0\x97p\x82\xA2\x82ĔF\x8F\xB7\x82\xE9\x8Fꍇ\x82́uUse Pageant\x81v\x82Ƀ`\x83F\x83b\x83N\x82\xF0\x82‚\xAF\x81A\x83\x86\x81[\x83U\x96\xBC\x82\xF0\x93\xFC\x97͂\xB5\x82܂\xB7\x81B</li>
</ul>
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/English.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -563,8 +563,8 @@
DLG_AUTH_METHOD_PASSWORD=Use p&lain password to log in
DLG_AUTH_METHOD_RSA=Use &RSA/DSA/ECDSA/ED25519 key to log in
DLG_AUTH_METHOD_RHOST=Use r&hosts to log in (SSH1)
-DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response to log in(&TIS)
-DLG_AUTH_METHOD_CHALLENGE2=Use &challenge/response to log in(keyboard-interactive)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=Use P&ageant to log in
DLG_AUTH_PRIVATEKEY=Private &key file:
DLG_AUTH_LOCALUSER=Local &user name:
@@ -579,7 +579,7 @@
DLG_AUTHSETUP_METHOD_PASSWORD=Use p&lain password to log in
DLG_AUTHSETUP_METHOD_RSA=Use &RSA/DSA/ECDSA/ED25519 key to log in
DLG_AUTHSETUP_METHOD_RHOST=Use r&hosts to log in (SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=Use challenge/response to log in (SSH1:&TIS, SSH2:keyboard-interactive)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=Use P&ageant
DLG_AUTHSETUP_PRIVATEKEY=Private &key file:
DLG_AUTHSETUP_LOCALUSER=Local &user name:
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/French.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -564,8 +564,10 @@
DLG_AUTH_METHOD_PASSWORD=Utiliser mot de passe pour la connexion
DLG_AUTH_METHOD_RSA=Utiliser cl\xE9 &RSA/DSA/ECDSA/ED25519 pour la connexion
DLG_AUTH_METHOD_RHOST=Utiser r&hosts pour la connexion (SSH1)
-DLG_AUTH_METHOD_CHALLENGE1=Utiliser challenge/r\xE9ponse pour la connexion(&TIS)
-DLG_AUTH_METHOD_CHALLENGE2=Utiliser &challenge/r\xE9ponse pour la connexion(clavier)
+;DLG_AUTH_METHOD_CHALLENGE1=Utiliser challenge/r\xE9ponse pour la connexion(&TIS)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+;DLG_AUTH_METHOD_CHALLENGE2=Utiliser &challenge/r\xE9ponse pour la connexion(clavier)
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=Utiliser P&ageant pour la connexion
DLG_AUTH_PRIVATEKEY=Fichier cl\xE9 priv\xE9e
DLG_AUTH_LOCALUSER=Nom d'utilisateur local:
@@ -580,7 +582,8 @@
DLG_AUTHSETUP_METHOD_PASSWORD=Util. mot de passe pour la conn.
DLG_AUTHSETUP_METHOD_RSA=Util. cl\xE9 &RSA/DSA/ECDSA/ED25519 pour conn.
DLG_AUTHSETUP_METHOD_RHOST=Util. r&hosts pour conn.(SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=Utiliser challenge/r\xE9ponse pour la connexion (SSH1:&TIS, SSH2:clavier)
+;DLG_AUTHSETUP_METHOD_CHALLENGE=Utiliser challenge/r\xE9ponse pour la connexion (SSH1:&TIS, SSH2:clavier)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=Utiliser P&ageant
DLG_AUTHSETUP_PRIVATEKEY=Fichier cl\xE9 priv\xE9e:
DLG_AUTHSETUP_LOCALUSER=Nom d'utilisateur local:
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/German.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -564,8 +564,10 @@
DLG_AUTH_METHOD_PASSWORD=Passwortauthentifikation verwenden
DLG_AUTH_METHOD_RSA=DSA/RSA/ECDSA/ED25519-Schl\xFCssel verwenden
DLG_AUTH_METHOD_RHOST=rhosts verwenden (SSH1)
-DLG_AUTH_METHOD_CHALLENGE1=Benutze challenge/response (TIS)
-DLG_AUTH_METHOD_CHALLENGE2=Benutze challenge/response (keyboard-interactive)
+;DLG_AUTH_METHOD_CHALLENGE1=Benutze challenge/response (TIS)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+;DLG_AUTH_METHOD_CHALLENGE2=Benutze challenge/response (keyboard-interactive)
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=Benutze Pageant
DLG_AUTH_PRIVATEKEY=Schl\xFCssel:
DLG_AUTH_LOCALUSER=Lokaler Benutzername:
@@ -580,7 +582,8 @@
DLG_AUTHSETUP_METHOD_PASSWORD=Passwortauthentifikation verwenden
DLG_AUTHSETUP_METHOD_RSA=DSA/RSA/ECDSA/ED25519-Schl\xFCssel verwenden
DLG_AUTHSETUP_METHOD_RHOST=rhosts verwenden (SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=Benutze challenge/response (SSH1:&TIS, SSH2:keyboard-interactive)
+;DLG_AUTHSETUP_METHOD_CHALLENGE=Benutze challenge/response (SSH1:&TIS, SSH2:keyboard-interactive)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=Use P&ageant
DLG_AUTHSETUP_PRIVATEKEY=Schl\xFCssel:
DLG_AUTHSETUP_LOCALUSER=Lokaler Benutzername:
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/Japanese.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -563,8 +563,8 @@
DLG_AUTH_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
DLG_AUTH_METHOD_RSA=&RSA/DSA/ECDSA/ED25519\x8C\xAE\x82\xF0\x8Eg\x82\xA4
DLG_AUTH_METHOD_RHOST=r&hosts(SSH1)\x82\xF0\x8Eg\x82\xA4
-DLG_AUTH_METHOD_CHALLENGE1=\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xF0\x8Eg\x82\xA4(&TIS)
-DLG_AUTH_METHOD_CHALLENGE2=\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xF0\x8Eg\x82\xA4(\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u)(&C)
+DLG_AUTH_METHOD_CHALLENGE1=\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xD8(&TIS)\x82\xF0\x8Eg\x82\xA4
+DLG_AUTH_METHOD_CHALLENGE2=\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F\xF0\x8Eg\x82\xA4(&I)
DLG_AUTH_METHOD_PAGEANT=P&ageant\x82\xF0\x8Eg\x82\xA4
DLG_AUTH_PRIVATEKEY=\x94閧\x8C\xAE(&K):
DLG_AUTH_LOCALUSER=\x83\x8D\x81[\x83J\x83\x8B\x82̃\x86\x81[\x83U\x96\xBC(&U):
@@ -579,7 +579,7 @@
DLG_AUTHSETUP_METHOD_PASSWORD=\x83v\x83\x8C\x83C\x83\x93\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x8Eg\x82\xA4(&L)
DLG_AUTHSETUP_METHOD_RSA=&RSA/DSA/ECDSA/ED25519\x8C\xAE\x82\xF0\x8Eg\x82\xA4
DLG_AUTHSETUP_METHOD_RHOST=r&hosts\x82\xF0\x8Eg\x82\xA4(SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xF0\x8Eg\x82\xA4(SSH1:TIS, SSH2:\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u)(&T)
+DLG_AUTHSETUP_METHOD_CHALLENGE=SSH1:\x83`\x83\x83\x83\x8C\x83\x93\x83W\x83\x8C\x83X\x83|\x83\x93\x83X\x94F\x8F\xD8(&TIS)/SSH2:\x83L\x81[\x83{\x81[\x83h\x83C\x83\x93\x83^\x83\x89\x83N\x83e\x83B\x83u\x94F\x8F\xF0\x8Eg\x82\xA4
DLG_AUTHSETUP_METHOD_PAGEANT=P&ageant\x82\xF0\x8Eg\x82\xA4
DLG_AUTHSETUP_PRIVATEKEY=\x94閧\x8C\xAE(&K):
DLG_AUTHSETUP_LOCALUSER=\x83\x8D\x81[\x83J\x83\x8B\x82̃\x86\x81[\x83U\x96\xBC(&U):
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/Korean.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -564,8 +564,10 @@
DLG_AUTH_METHOD_PASSWORD=\xC0Ϲ\xDD\xC5ؽ\xBAƮ \xBE\xCFȣ \xB7α\xD7\xC0\xCE(&L)
DLG_AUTH_METHOD_RSA=RSA/DSA/ECDSA/ED25519 Ű \xB7α\xD7\xC0\xCE(&R)
DLG_AUTH_METHOD_RHOST=rhosts \xB7α\xD7\xC0\xCE(SSH1)(&H)
-DLG_AUTH_METHOD_CHALLENGE1=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(TIS)(&T)
-DLG_AUTH_METHOD_CHALLENGE2=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(TIS)(Ű\xBA\xB8\xB5\xE5 \xC0Է\xC2)(&C)
+;DLG_AUTH_METHOD_CHALLENGE1=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(TIS)(&T)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+;DLG_AUTH_METHOD_CHALLENGE2=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(TIS)(Ű\xBA\xB8\xB5\xE5 \xC0Է\xC2)(&C)
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=Pageant \xBB\xE7\xBF\xEB(&A)
DLG_AUTH_PRIVATEKEY=\xB0\xB3\xC0\xCEŰ(&K):
DLG_AUTH_LOCALUSER=\xC1\xF6\xBF\xAA \xBB\xE7\xBF\xEB\xC0\xDA\xC0̸\xA7(&U):
@@ -580,7 +582,8 @@
DLG_AUTHSETUP_METHOD_PASSWORD=\xC0Ϲ\xDD\xC5ؽ\xBAƮ \xBE\xCFȣ \xB7α\xD7\xC0\xCE(&L)
DLG_AUTHSETUP_METHOD_RSA=RSA/DSA/ECDSA/ED25519 Ű \xB7α\xD7\xC0\xCE(&R)
DLG_AUTHSETUP_METHOD_RHOST=rhosts \xB7α\xD7\xC0\xCE(SSH1)(&H)
-DLG_AUTHSETUP_METHOD_CHALLENGE=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(SSH1:TIS, SSH2:Ű\xBA\xB8\xB5\xE5 \xC0Է\xC2)(&T)
+;DLG_AUTHSETUP_METHOD_CHALLENGE=\xBDõ\xB5/\xC0\xC0\xB4\xE4 \xB7α\xD7\xC0\xCE(SSH1:TIS, SSH2:Ű\xBA\xB8\xB5\xE5 \xC0Է\xC2)(&T)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=Pageant \xBB\xE7\xBF\xEB(&A)
DLG_AUTHSETUP_PRIVATEKEY=\xB0\xB3\xC0\xCEŰ(&K):
DLG_AUTHSETUP_LOCALUSER=\xC1\x{1BFABB}\xE7 \xBF\xEB\xC0\xDA\xC0̸\xA7(&U):
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/Russian.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -564,8 +564,10 @@
DLG_AUTH_METHOD_PASSWORD=&\xC2\xF5\xEE\xE4 \xF1 \xEF\xF0\xEE\xF1\xF2\xFB\xEC \xEF\xE0\xF0\xEE\xEB\xE5\xEC
DLG_AUTH_METHOD_RSA=&\xC2\xF5\xEE\xE4 \xF1 \xEA\xEB\xFE\xF7\xEE\xEC RSA/DSA/ECDSA/ED25519
DLG_AUTH_METHOD_RHOST=\xC2\xF5\xEE\xE4 \xF1 r&hosts (SSH1)
-DLG_AUTH_METHOD_CHALLENGE1=\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xE2\xF5\xEE\xE4\xE0 \xE7\xE0\xEF\xF0\xEE\xF1/\xEE\xF2\xE2\xE5\xF2 (&TIS)
-DLG_AUTH_METHOD_CHALLENGE2=&\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xE2\xF5\xEE\xE4\xE0 \xE7\xE0\xEF\xF0\xEE\xF1/\xEE\xF2\xE2\xE5\xF2 (\xF1 \xEA\xEB\xE0\xE2\xE8\xE0\xF2\xF3\xF0\xFB)
+;DLG_AUTH_METHOD_CHALLENGE1=\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xE2\xF5\xEE\xE4\xE0 \xE7\xE0\xEF\xF0\xEE\xF1/\xEE\xF2\xE2\xE5\xF2 (&TIS)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+;DLG_AUTH_METHOD_CHALLENGE2=&\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xE2\xF5\xEE\xE4\xE0 \xE7\xE0\xEF\xF0\xEE\xF1/\xEE\xF2\xE2\xE5\xF2 (\xF1 \xEA\xEB\xE0\xE2\xE8\xE0\xF2\xF3\xF0\xFB)
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=&\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC Pageant
DLG_AUTH_PRIVATEKEY=&\xC7\xE0\xEA\xF0\xFB\xF2\xFB\xE9 \xEA\xEB\xFE\xF7
DLG_AUTH_LOCALUSER=&\xD1\xEA\xF0\xFB\xF2\xEE\xE5 \xE8\xEC\xFF:
@@ -580,7 +582,8 @@
DLG_AUTHSETUP_METHOD_PASSWORD=&\xC2\xF5\xEE\xE4 \xF1 \xEF\xF0\xEE\xF1\xF2\xFB\xEC \xEF\xE0\xF0\xEE\xEB\xE5\xEC
DLG_AUTHSETUP_METHOD_RSA=&\xC2\xF5\xEE\xE4 \xF1 \xEA\xEB\xFE\xF7\xEE\xEC RSA/DSA/ECDSA/ED25519
DLG_AUTHSETUP_METHOD_RHOST=&\xC2\xF5\xEE\xE4 \xF1 rhosts (SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xE2\xF5\xEE\xE4\xE0 \xE7\xE0\xEF\xF0\xEE\xF1/\xEE\xF2\xE2\xE5\xF2 (SSH1:&TIS, SSH2:\xF1 \xEA\xEB\xE0\xE2\xE8\xE0\xF2\xF3\xF0\xFB)
+;DLG_AUTHSETUP_METHOD_CHALLENGE=\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC \xE4\xEB\xFF \xE2\xF5\xEE\xE4\xE0 \xE7\xE0\xEF\xF0\xEE\xF1/\xEE\xF2\xE2\xE5\xF2 (SSH1:&TIS, SSH2:\xF1 \xEA\xEB\xE0\xE2\xE8\xE0\xF2\xF3\xF0\xFB)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=&\xC8\xF1\xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xFC Pageant
DLG_AUTHSETUP_PRIVATEKEY=&\xC7\xE0\xEA\xF0\xFB\xF2\xFB\xE9 \xEA\xEB\xFE\xF7:
DLG_AUTHSETUP_LOCALUSER=&\xD1\xEA\xF0\xFB\xF2\xEE\xE5 \xE8\xEC\xFF \xEF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFF:
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -564,8 +564,10 @@
DLG_AUTH_METHOD_PASSWORD=ʹ\xD3ü\xC4\xC3\xDC\xC2\xEB\xC0\xB4\xB5\xC7¼(&L)
DLG_AUTH_METHOD_RSA=ʹ\xD3\xC3 &RSA/DSA/ECDSA/ED25519 \xC3\xDCԿ\xB5\xC7¼
DLG_AUTH_METHOD_RHOST=ʹ\xD3\xC3 r&hosts \xB5\xC7¼(SSH1)
-DLG_AUTH_METHOD_CHALLENGE1=ʹ\xD3\xC3\xCC\xF4ս/Ӧ\xB4\xF0\xB7\xBDʽ\xB5\xC7¼(&TIS)
-DLG_AUTH_METHOD_CHALLENGE2=ʹ\xD3\xC3\xCC\xF4ս/Ӧ\xB4\xF0\xB7\xBDʽ\xB5\xC7¼(\xBC\xFC\xC5̽\xBB\xBB\xA5)(&C)
+;DLG_AUTH_METHOD_CHALLENGE1=ʹ\xD3\xC3\xCC\xF4ս/Ӧ\xB4\xF0\xB7\xBDʽ\xB5\xC7¼(&TIS)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+;DLG_AUTH_METHOD_CHALLENGE2=ʹ\xD3\xC3\xCC\xF4ս/Ӧ\xB4\xF0\xB7\xBDʽ\xB5\xC7¼(\xBC\xFC\xC5̽\xBB\xBB\xA5)(&C)
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=ʹ\xD3\xC3 P&ageant \xB5\xC7¼
DLG_AUTH_PRIVATEKEY=\xC3\xDCԿ\xCEļ\xFE(&K)\xA3\xBA
DLG_AUTH_LOCALUSER=\xB1\xBE\xB5\xD8\xD3û\xA7\xC3\xFB(&U)\xA3\xBA
@@ -580,7 +582,8 @@
DLG_AUTHSETUP_METHOD_PASSWORD=ʹ\xD3ü\xC4\xC3\xDC\xC2\xEB\xC0\xB4\xB5\xC7¼(&L)
DLG_AUTHSETUP_METHOD_RSA=ʹ\xD3\xC3 &RSA/DSA/ECDSA/ED25519 \xC3\xDCԿ\xB5\xC7¼
DLG_AUTHSETUP_METHOD_RHOST=ʹ\xD3\xC3 r&hosts \xB5\xC7¼(SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=ʹ\xD3\xC3\xCC\xF4ս/Ӧ\xB4\xF0\xB7\xBDʽ\xB5\xC7¼(SSH1\xA3\xBATIS\xA3\xACSSH2\xA3\xBA\xBC\xFC\xC5̽\xBB\xBB\xA5)(&T)
+;DLG_AUTHSETUP_METHOD_CHALLENGE=ʹ\xD3\xC3\xCC\xF4ս/Ӧ\xB4\xF0\xB7\xBDʽ\xB5\xC7¼(SSH1\xA3\xBATIS\xA3\xACSSH2\xA3\xBA\xBC\xFC\xC5̽\xBB\xBB\xA5)(&T)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=ʹ\xD3\xC3P&ageant
DLG_AUTHSETUP_PRIVATEKEY=\xC3\xDCԿ\xCEļ\xFE(&K)\xA3\xBA
DLG_AUTHSETUP_LOCALUSER=\xB1\xBE\xB5\xD8\xD3û\xA7\xC3\xFB(&U)\xA3\xBA
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2018-04-19 11:58:00 UTC (rev 7101)
@@ -564,8 +564,10 @@
DLG_AUTH_METHOD_PASSWORD=\xA8ϥ\xCE²\xB3檺\xB1K\xBDX\xA8ӵn\xBF\xFD(&L)
DLG_AUTH_METHOD_RSA=\xA8ϥ\xCE &RSA/DSA/ECDSA/ED25519 \xB1K\xC6_\xB5n\xBF\xFD
DLG_AUTH_METHOD_RHOST=\xA8ϥ\xCE r&hosts \xB5n\xBF\xFD(SSH1)
-DLG_AUTH_METHOD_CHALLENGE1=\xA8ϥοԸ\xDF/\xC0\xB3\xB5\xAA\xA4覡\xB5n\xBF\xFD(&TIS)
-DLG_AUTH_METHOD_CHALLENGE2=\xA8ϥοԸ\xDF/\xC0\xB3\xB5\xAA\xA4覡\xB5n\xBF\xFD(\xC1\xE4\xBDL\xA5椬)(&C)
+;DLG_AUTH_METHOD_CHALLENGE1=\xA8ϥοԸ\xDF/\xC0\xB3\xB5\xAA\xA4覡\xB5n\xBF\xFD(&TIS)
+DLG_AUTH_METHOD_CHALLENGE1=Use challenge/response(&TIS) to log in
+;DLG_AUTH_METHOD_CHALLENGE2=\xA8ϥοԸ\xDF/\xC0\xB3\xB5\xAA\xA4覡\xB5n\xBF\xFD(\xC1\xE4\xBDL\xA5椬)(&C)
+DLG_AUTH_METHOD_CHALLENGE2=Use keyboard-&interactive to log in
DLG_AUTH_METHOD_PAGEANT=\xA8ϥ\xCE P&ageant \xB5n\xBF\xFD
DLG_AUTH_PRIVATEKEY=\xB1K\xC6_\xA4\xE5\xA5\xF3(&K)\xA1G
DLG_AUTH_LOCALUSER=\xA5\xBB\xA6a\xA5Τ\xE1\xA6W(&U)\xA1G
@@ -580,7 +582,8 @@
DLG_AUTHSETUP_METHOD_PASSWORD=\xA8ϥ\xCE²\xB3檺\xB1K\xBDX\xA8ӵn\xBF\xFD(&L)
DLG_AUTHSETUP_METHOD_RSA=\xA8ϥ\xCE &RSA/DSA/ECDSA/ED25519 \xB1K\xC6_\xB5n\xBF\xFD
DLG_AUTHSETUP_METHOD_RHOST=\xA8ϥ\xCE r&hosts \xB5n\xBF\xFD(SSH1)
-DLG_AUTHSETUP_METHOD_CHALLENGE=\xA8ϥάD\xBE\xD4/\xC0\xB3\xB5\xAA\xA4覡\xB5n\xBF\xFD(SSH1\xA1GTIS\xA1ASSH2\xA1G\xC1\xE4\xBDL\xA5椬)(&T)
+;DLG_AUTHSETUP_METHOD_CHALLENGE=\xA8ϥάD\xBE\xD4/\xC0\xB3\xB5\xAA\xA4覡\xB5n\xBF\xFD(SSH1\xA1GTIS\xA1ASSH2\xA1G\xC1\xE4\xBDL\xA5椬)(&T)
+DLG_AUTHSETUP_METHOD_CHALLENGE=Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in
DLG_AUTHSETUP_METHOD_PAGEANT=\xA8ϥ\xCEP&ageant
DLG_AUTHSETUP_PRIVATEKEY=\xB1K\xC6_\xA4\xE5\xA5\xF3(&K)\xA1G
DLG_AUTHSETUP_LOCALUSER=\xA5\xBB\xA6a\xA5Τ\xE1\xA6W(&U)\xA1G
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/ttssh2/ttxssh/auth.c 2018-04-19 11:58:00 UTC (rev 7101)
@@ -255,11 +255,11 @@
// SSH \x83o\x81[\x83W\x83\x87\x83\x93\x82ɂ\xE6\x82\xC1\x82\xC4 TIS \x82̃\x89\x83x\x83\x8B\x82\xF0\x8F\x91\x82\xAB\x8A\xB7\x82\xA6
if (pvar->settings.ssh_protocol_version == 1) {
UTIL_get_lang_msg("DLG_AUTH_METHOD_CHALLENGE1", pvar,
- "Use challenge/response to log in(&TIS)");
+ "Use challenge/response(&TIS) to log in");
SetDlgItemText(dlg, IDC_SSHUSETIS, pvar->ts->UIMsg);
} else {
UTIL_get_lang_msg("DLG_AUTH_METHOD_CHALLENGE2", pvar,
- "Use &challenge/response to log in(keyboard-interactive)");
+ "Use keyboard-&interactive to log in");
SetDlgItemText(dlg, IDC_SSHUSETIS, pvar->ts->UIMsg);
}
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2018-04-19 11:58:00 UTC (rev 7101)
@@ -1946,7 +1946,10 @@
//pvar->auth_state.cur_cred.method = SSH_AUTH_PASSWORD;
pvar->ssh2_authmethod = SSH_AUTH_PASSWORD;
- // /auth=challenge \x82\xF0\x92lj\xC1 (2007.10.5 maya)
+ } else if (_stricmp(option + 6, "keyboard-interactive") == 0) { // keyboard-interactive\x94F\x8F\xD8
+ //pvar->auth_state.cur_cred.method = SSH_AUTH_TIS;
+ pvar->ssh2_authmethod = SSH_AUTH_TIS;
+
} else if (_stricmp(option + 6, "challenge") == 0) { // keyboard-interactive\x94F\x8F\xD8
//pvar->auth_state.cur_cred.method = SSH_AUTH_TIS;
pvar->ssh2_authmethod = SSH_AUTH_TIS;
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2018-04-19 11:57:55 UTC (rev 7100)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2018-04-19 11:58:00 UTC (rev 7101)
@@ -67,7 +67,7 @@
CONTROL "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,122,152,10
CONTROL "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,149,99,10
- CONTROL "Use challenge/response to log in (SSH1:&TIS, SSH2:keyboard-interactive)",IDC_SSHUSETIS,
+ CONTROL "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,193,276,10
CONTROL "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,219,276,10
PUSHBUTTON "Private &key file:",IDC_CHOOSERSAFILE,169,120,58,14,WS_GROUP
@@ -223,7 +223,7 @@
CONTROL "Use &RSA/DSA/ECDSA/ED25519 key to log in",IDC_SSHUSERSA,
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,73,152,10
CONTROL "Use r&hosts to log in (SSH1)",IDC_SSHUSERHOSTS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,100,99,10
- CONTROL "Use challenge/response to log in (SSH1:&TIS, SSH2:keyboard-interactive)",IDC_SSHUSETIS,
+ CONTROL "Use SSH1:challenge/response(&TIS) / SSH2:keyboard-interactive to log in",IDC_SSHUSETIS,
"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,144,278,10
CONTROL "Use P&ageant to log in",IDC_SSHUSEPAGEANT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,171,278,10
PUSHBUTTON "Private &key file:",IDC_CHOOSERSAFILE,169,72,58,14,WS_GROUP