mirror of git://anongit.mindrot.org/openssh.git
- jmc@cvs.openbsd.org 2009/03/19 15:15:09
[ssh.1] for "Ciphers", just point the reader to the keyword in ssh_config(5), just as we do for "MACs": this stops us getting out of sync when the lists change; fixes documentation/6102, submitted by Peter J. Philipp alternative fix proposed by djm ok markus
This commit is contained in:
parent
72efd74d2f
commit
3a6a51f387
|
@ -3,6 +3,14 @@
|
|||
- markus@cvs.openbsd.org 2009/03/17 21:37:00
|
||||
[ssh.c]
|
||||
pass correct argv[0] to openlog(); ok djm@
|
||||
- jmc@cvs.openbsd.org 2009/03/19 15:15:09
|
||||
[ssh.1]
|
||||
for "Ciphers", just point the reader to the keyword in ssh_config(5), just
|
||||
as we do for "MACs": this stops us getting out of sync when the lists
|
||||
change;
|
||||
fixes documentation/6102, submitted by Peter J. Philipp
|
||||
alternative fix proposed by djm
|
||||
ok markus
|
||||
|
||||
20090616
|
||||
- (dtucker) [configure.ac defines.h] Bug #1607: handle the case where fsid_t
|
||||
|
|
27
ssh.1
27
ssh.1
|
@ -34,8 +34,8 @@
|
|||
.\" (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.282 2009/02/12 03:44:25 djm Exp $
|
||||
.Dd $Mdocdate: February 12 2009 $
|
||||
.\" $OpenBSD: ssh.1,v 1.283 2009/03/19 15:15:09 jmc Exp $
|
||||
.Dd $Mdocdate: March 19 2009 $
|
||||
.Dt SSH 1
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -191,26 +191,9 @@ For protocol version 2,
|
|||
.Ar cipher_spec
|
||||
is a comma-separated list of ciphers
|
||||
listed in order of preference.
|
||||
The supported ciphers are:
|
||||
3des-cbc,
|
||||
aes128-cbc,
|
||||
aes192-cbc,
|
||||
aes256-cbc,
|
||||
aes128-ctr,
|
||||
aes192-ctr,
|
||||
aes256-ctr,
|
||||
arcfour128,
|
||||
arcfour256,
|
||||
arcfour,
|
||||
blowfish-cbc,
|
||||
and
|
||||
cast128-cbc.
|
||||
The default is:
|
||||
.Bd -literal -offset indent
|
||||
aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128,
|
||||
arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr,
|
||||
aes192-ctr,aes256-ctr
|
||||
.Ed
|
||||
See the
|
||||
.Cm Ciphers
|
||||
keyword for more information.
|
||||
.It Fl D Xo
|
||||
.Sm off
|
||||
.Oo Ar bind_address : Oc
|
||||
|
|
Loading…
Reference in New Issue