summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-12-24 14:56:47 +1100
committerDamien Miller <djm@mindrot.org>2005-12-24 14:56:47 +1100
commit35978210462d089a53a3e4764b8fb21e1963acba (patch)
tree50f37df759b5232ce33c6015127a9d0c1cf6af73
parent2142ba0769a2ddd69bcde786a78e83045216acae (diff)
- jmc@cvs.openbsd.org 2005/12/23 23:46:23
[ssh.1] less mark up for -c;
-rw-r--r--ChangeLog5
-rw-r--r--ssh.130
2 files changed, 19 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 4795f9a62..aa210591e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
4420051220 4720051220
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 $
diff --git a/ssh.1 b/ssh.1
index 28633fff1..71baf45f5 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.
186The default is 186The default is
187.Dq 3des . 187.Dq 3des .
188.Pp 188.Pp
189For protocol version 2 189For protocol version 2,
190.Ar cipher_spec 190.Ar cipher_spec
191is a comma-separated list of ciphers 191is a comma-separated list of ciphers
192listed in order of preference. 192listed in order of preference.
193The supported ciphers are 193The supported ciphers are:
194.Dq 3des-cbc , 1943des-cbc,
195.Dq aes128-cbc , 195aes128-cbc,
196.Dq aes192-cbc , 196aes192-cbc,
197.Dq aes256-cbc , 197aes256-cbc,
198.Dq aes128-ctr , 198aes128-ctr,
199.Dq aes192-ctr , 199aes192-ctr,
200.Dq aes256-ctr , 200aes256-ctr,
201.Dq arcfour128 , 201arcfour128,
202.Dq arcfour256 , 202arcfour256,
203.Dq arcfour , 203arcfour,
204.Dq blowfish-cbc , 204blowfish-cbc,
205and 205and
206.Dq cast128-cbc . 206cast128-cbc.
207The default is: 207The default is:
208.Bd -literal -offset indent 208.Bd -literal -offset indent
209aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, 209aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,