diff options
author | Damien Miller <djm@mindrot.org> | 2005-12-24 14:56:47 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-12-24 14:56:47 +1100 |
commit | 35978210462d089a53a3e4764b8fb21e1963acba (patch) | |
tree | 50f37df759b5232ce33c6015127a9d0c1cf6af73 | |
parent | 2142ba0769a2ddd69bcde786a78e83045216acae (diff) |
- jmc@cvs.openbsd.org 2005/12/23 23:46:23
[ssh.1]
less mark up for -c;
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 30 |
2 files changed, 19 insertions, 16 deletions
@@ -40,6 +40,9 @@ | |||
40 | - note that -I is only available if support compiled in, and that it | 40 | - note that -I is only available if support compiled in, and that it |
41 | isn't by default | 41 | isn't by default |
42 | feedback/ok djm@ | 42 | feedback/ok djm@ |
43 | - jmc@cvs.openbsd.org 2005/12/23 23:46:23 | ||
44 | [ssh.1] | ||
45 | less mark up for -c; | ||
43 | 46 | ||
44 | 20051220 | 47 | 20051220 |
45 | - (dtucker) OpenBSD CVS Sync | 48 | - (dtucker) OpenBSD CVS Sync |
@@ -3542,4 +3545,4 @@ | |||
3542 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3545 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3543 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3546 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3544 | 3547 | ||
3545 | $Id: ChangeLog,v 1.4049 2005/12/24 03:56:29 djm Exp $ | 3548 | $Id: ChangeLog,v 1.4050 2005/12/24 03:56:47 djm Exp $ |
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh.1,v 1.229 2005/12/23 14:55:53 jmc Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.230 2005/12/23 23:46:23 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -186,24 +186,24 @@ Its use is strongly discouraged due to cryptographic weaknesses. | |||
186 | The default is | 186 | The default is |
187 | .Dq 3des . | 187 | .Dq 3des . |
188 | .Pp | 188 | .Pp |
189 | For protocol version 2 | 189 | For protocol version 2, |
190 | .Ar cipher_spec | 190 | .Ar cipher_spec |
191 | is a comma-separated list of ciphers | 191 | is a comma-separated list of ciphers |
192 | listed in order of preference. | 192 | listed in order of preference. |
193 | The supported ciphers are | 193 | The supported ciphers are: |
194 | .Dq 3des-cbc , | 194 | 3des-cbc, |
195 | .Dq aes128-cbc , | 195 | aes128-cbc, |
196 | .Dq aes192-cbc , | 196 | aes192-cbc, |
197 | .Dq aes256-cbc , | 197 | aes256-cbc, |
198 | .Dq aes128-ctr , | 198 | aes128-ctr, |
199 | .Dq aes192-ctr , | 199 | aes192-ctr, |
200 | .Dq aes256-ctr , | 200 | aes256-ctr, |
201 | .Dq arcfour128 , | 201 | arcfour128, |
202 | .Dq arcfour256 , | 202 | arcfour256, |
203 | .Dq arcfour , | 203 | arcfour, |
204 | .Dq blowfish-cbc , | 204 | blowfish-cbc, |
205 | and | 205 | and |
206 | .Dq cast128-cbc . | 206 | cast128-cbc. |
207 | The default is: | 207 | The default is: |
208 | .Bd -literal -offset indent | 208 | .Bd -literal -offset indent |
209 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, | 209 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, |