diff options
| author | Christian Weisgerber <naddy@cvs.openbsd.org> | 2009-01-24 17:10:23 +0000 |
|---|---|---|
| committer | Christian Weisgerber <naddy@cvs.openbsd.org> | 2009-01-24 17:10:23 +0000 |
| commit | 5a7f13116b5709a5546b2fba263aa2146ae4e26c (patch) | |
| tree | fefd909be7ee5637ce85db8d0be744d44139ad90 /usr.bin/ssh | |
| parent | 212fb1d9978903081fbfb20dbfda652e0f6f8e5f (diff) | |
sync list of preferred ciphers; ok djm@
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 10 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index abc3b0b16bc..376d928a19a 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -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_config.5,v 1.115 2008/11/04 08:22:13 djm Exp $ -.Dd $Mdocdate: November 4 2008 $ +.\" $OpenBSD: ssh_config.5,v 1.116 2009/01/24 17:10:22 naddy Exp $ +.Dd $Mdocdate: January 24 2009 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -204,9 +204,9 @@ and .Dq cast128-cbc . The default is: .Bd -literal -offset 3n -aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, -arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr, -aes192-ctr,aes256-ctr +aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, +aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc, +aes256-cbc,arcfour .Ed .It Cm ClearAllForwardings Specifies that all local, remote, and dynamic port forwardings diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index f5bf084c1da..23c1505f890 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -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: sshd_config.5,v 1.99 2008/12/30 00:46:56 okan Exp $ -.Dd $Mdocdate: December 30 2008 $ +.\" $OpenBSD: sshd_config.5,v 1.100 2009/01/24 17:10:22 naddy Exp $ +.Dd $Mdocdate: January 24 2009 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -240,9 +240,9 @@ and .Dq cast128-cbc . The default is: .Bd -literal -offset 3n -aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, -arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr, -aes192-ctr,aes256-ctr +aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, +aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc, +aes256-cbc,arcfour .Ed .It Cm ClientAliveCountMax Sets the number of client alive messages (see below) which may be |