• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision6267 (tree)
Time2016-01-19 12:21:37
Author(del#1144)

Log Message

r6266 のドキュメントの修正
r6263 で追加されたアルゴリズムを追加

Change Summary

Incremental Difference

--- trunk/doc/en/html/menu/setup-ssh.html (revision 6266)
+++ trunk/doc/en/html/menu/setup-ssh.html (revision 6267)
@@ -155,14 +155,26 @@
155155 <td>ecdh-sha2-nistp521</td>
156156 </tr>
157157 <tr>
158- <td>ED25519</td>
158+ <td>diffie-hellman-group14-sha256</td>
159159 </tr>
160160 <tr>
161- <td>RSA</td>
161+ <td>diffie-hellman-group15-sha256</td>
162162 </tr>
163163 <tr>
164- <td>DSA</td>
164+ <td>diffie-hellman-group1-sha256</td>
165165 </tr>
166+ <tr>
167+ <td>diffie-hellman-group-exchange-sha256</td>
168+ </tr>
169+ <tr>
170+ <td>diffie-hellman-group-exchange-sha1</td>
171+ </tr>
172+ <tr>
173+ <td>diffie-hellman-group14-sha1</td>
174+ </tr>
175+ <tr>
176+ <td>diffie-hellman-group1-sha1</td>
177+ </tr>
166178 </table>
167179 </dd>
168180
@@ -199,20 +211,6 @@
199211 <dd>
200212 Specify the type of host key for SSH2 with the order.<br>
201213 &lt;Host keys below this line are disabled&gt;
202- <table border="1">
203- <tr>
204- <td>zlib@openssh.com</td>
205- <!--td>遅延圧縮(認証完了後に圧縮を開始する)</td-->
206- </tr>
207- <tr>
208- <td>zlib</td>
209- <td></td>
210- </tr>
211- <tr>
212- <td>none</td>
213- <td>圧縮なし</td>
214- </tr>
215- </table>
216214 </dd>
217215
218216 <dt id="CompressionOrder">Compression order (SSH2 only)</dt>
@@ -228,6 +226,20 @@
228226 with a high-speed link such as ADSL or FTTH).<br>
229227 By using SSH1 protocol, when the Compression level is 0, the packet compression is disabled, or the Compression level is over 1, the compression is enabled. <br>
230228 By using SSH2 protocol, use the Compression order to enable the packet compression. And then, set the Compression level to 1 over.
229+ <table border="1">
230+ <tr>
231+ <td>zlib@openssh.com</td>
232+ <!--td>遅延圧縮(認証完了後に圧縮を開始する)</td-->
233+ </tr>
234+ <tr>
235+ <td>zlib</td>
236+ <td></td>
237+ </tr>
238+ <tr>
239+ <td>none</td>
240+ <td>圧縮なし</td>
241+ </tr>
242+ </table>
231243 </dd>
232244 </dl>
233245 </body>
--- trunk/doc/ja/html/menu/setup-ssh.html (revision 6266)
+++ trunk/doc/ja/html/menu/setup-ssh.html (revision 6267)
@@ -153,14 +153,26 @@
153153 <td>ecdh-sha2-nistp521</td>
154154 </tr>
155155 <tr>
156- <td>ED25519</td>
156+ <td>diffie-hellman-group14-sha256</td>
157157 </tr>
158158 <tr>
159- <td>RSA</td>
159+ <td>diffie-hellman-group15-sha256</td>
160160 </tr>
161161 <tr>
162- <td>DSA</td>
162+ <td>diffie-hellman-group1-sha256</td>
163163 </tr>
164+ <tr>
165+ <td>diffie-hellman-group-exchange-sha256</td>
166+ </tr>
167+ <tr>
168+ <td>diffie-hellman-group-exchange-sha1</td>
169+ </tr>
170+ <tr>
171+ <td>diffie-hellman-group14-sha1</td>
172+ </tr>
173+ <tr>
174+ <td>diffie-hellman-group1-sha1</td>
175+ </tr>
164176 </table>
165177 </dd>
166178
@@ -199,17 +211,23 @@
199211 &lt;Host keys below this line are disabled&gt;以下の暗号は使用されません。
200212 <table border="1">
201213 <tr>
202- <td>zlib@openssh.com</td>
203- <td>遅延圧縮(認証完了後に圧縮を開始する)</td>
214+ <td>ecdh-sha2-nistp256</td>
204215 </tr>
205216 <tr>
206- <td>zlib</td>
207- <td></td>
217+ <td>ecdh-sha2-nistp384</td>
208218 </tr>
209219 <tr>
210- <td>none</td>
211- <td>圧縮なし</td>
220+ <td>ecdh-sha2-nistp521</td>
212221 </tr>
222+ <tr>
223+ <td>ED25519</td>
224+ </tr>
225+ <tr>
226+ <td>RSA</td>
227+ </tr>
228+ <tr>
229+ <td>DSA</td>
230+ </tr>
213231 </table>
214232 </dd>
215233
@@ -226,6 +244,20 @@
226244 (但し、ADSL や FTTH 等高速な回線ではレスポンスが悪くなる場合もあります。)<br>
227245 SSH1 の場合は、Compression level が 0 であれば圧縮が無効、1 以上であれば圧縮が有効になります。<br>
228246 SSH2 の場合は、Compression order で圧縮を有効にします。そのうえで Compression level を 1 以上にすると圧縮が有効になります。
247+ <table border="1">
248+ <tr>
249+ <td>zlib@openssh.com</td>
250+ <td>遅延圧縮(認証完了後に圧縮を開始する)</td>
251+ </tr>
252+ <tr>
253+ <td>zlib</td>
254+ <td></td>
255+ </tr>
256+ <tr>
257+ <td>none</td>
258+ <td>圧縮なし</td>
259+ </tr>
260+ </table>
229261 </dd>
230262 </dl>
231263 </body>
Show on old repository browser