From: djm Date: Sat, 24 Dec 2005 03:56:47 +0000 (+0000) Subject: - jmc@cvs.openbsd.org 2005/12/23 23:46:23 X-Git-Tag: V_4_3_P1~71 X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/025fc42ee52afe7063476101d089cf727c997eca - jmc@cvs.openbsd.org 2005/12/23 23:46:23 [ssh.1] less mark up for -c; --- diff --git a/ChangeLog b/ChangeLog index 37f22c3a..d851ba9b 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 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,