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)
downloadopenssh-git-35978210462d089a53a3e4764b8fb21e1963acba.tar.gz
- 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 4795f9a6..aa210591 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,9 @@
- note that -I is only available if support compiled in, and that it
isn't by default
feedback/ok djm@
+ - jmc@cvs.openbsd.org 2005/12/23 23:46:23
+ [ssh.1]
+ less mark up for -c;
20051220
- (dtucker) OpenBSD CVS Sync
@@ -3542,4 +3545,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4049 2005/12/24 03:56:29 djm Exp $
+$Id: ChangeLog,v 1.4050 2005/12/24 03:56:47 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 28633fff..71baf45f 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: ssh.1,v 1.229 2005/12/23 14:55:53 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.230 2005/12/23 23:46:23 jmc Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -186,24 +186,24 @@ Its use is strongly discouraged due to cryptographic weaknesses.
The default is
.Dq 3des .
.Pp
-For protocol version 2
+For protocol version 2,
.Ar cipher_spec
is a comma-separated list of ciphers
listed in order of preference.
-The supported ciphers are
-.Dq 3des-cbc ,
-.Dq aes128-cbc ,
-.Dq aes192-cbc ,
-.Dq aes256-cbc ,
-.Dq aes128-ctr ,
-.Dq aes192-ctr ,
-.Dq aes256-ctr ,
-.Dq arcfour128 ,
-.Dq arcfour256 ,
-.Dq arcfour ,
-.Dq blowfish-cbc ,
+The supported ciphers are:
+3des-cbc,
+aes128-cbc,
+aes192-cbc,
+aes256-cbc,
+aes128-ctr,
+aes192-ctr,
+aes256-ctr,
+arcfour128,
+arcfour256,
+arcfour,
+blowfish-cbc,
and
-.Dq cast128-cbc .
+cast128-cbc.
The default is:
.Bd -literal -offset indent
aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,