diff options
author | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-01-01 17:15:23 +0000 |
commit | 99b402ea4c8457b0a3cafff37f5b3410a8dc6476 (patch) | |
tree | 1d24ce54c9981ea8cbb4c5a9309964a0e4c4b320 /sshd_config.0 | |
parent | 87552344215a38d3a2b0d4d63dc151e05978bbe1 (diff) | |
parent | 54af7a4ae8d455791a631bdfaade4b64436ae16a (diff) |
import openssh-5.2p1-gsskex-all-20090726.patch
Diffstat (limited to 'sshd_config.0')
-rw-r--r-- | sshd_config.0 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sshd_config.0 b/sshd_config.0 index 15a6c9004..067f757de 100644 --- a/sshd_config.0 +++ b/sshd_config.0 | |||
@@ -122,9 +122,9 @@ DESCRIPTION | |||
122 | ``arcfour256'', ``arcfour'', ``blowfish-cbc'', and | 122 | ``arcfour256'', ``arcfour'', ``blowfish-cbc'', and |
123 | ``cast128-cbc''. The default is: | 123 | ``cast128-cbc''. The default is: |
124 | 124 | ||
125 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour128, | 125 | aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128, |
126 | arcfour256,arcfour,aes192-cbc,aes256-cbc,aes128-ctr, | 126 | aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,aes192-cbc, |
127 | aes192-ctr,aes256-ctr | 127 | aes256-cbc,arcfour |
128 | 128 | ||
129 | ClientAliveCountMax | 129 | ClientAliveCountMax |
130 | Sets the number of client alive messages (see below) which may be | 130 | Sets the number of client alive messages (see below) which may be |
@@ -337,13 +337,14 @@ DESCRIPTION | |||
337 | example, ``192.0.2.0/33'' and ``192.0.2.0/8'' respectively. | 337 | example, ``192.0.2.0/33'' and ``192.0.2.0/8'' respectively. |
338 | 338 | ||
339 | Only a subset of keywords may be used on the lines following a | 339 | Only a subset of keywords may be used on the lines following a |
340 | Match keyword. Available keywords are AllowTcpForwarding, | 340 | Match keyword. Available keywords are AllowAgentForwarding, |
341 | Banner, ChrootDirectory, ForceCommand, GatewayPorts, | 341 | AllowTcpForwarding, Banner, ChrootDirectory, ForceCommand, |
342 | GSSAPIAuthentication, HostbasedAuthentication, | 342 | GatewayPorts, GSSAPIAuthentication, HostbasedAuthentication, |
343 | KbdInteractiveAuthentication, KerberosAuthentication, | 343 | KbdInteractiveAuthentication, KerberosAuthentication, |
344 | MaxAuthTries, MaxSessions, PasswordAuthentication, PermitOpen, | 344 | MaxAuthTries, MaxSessions, PasswordAuthentication, |
345 | PermitRootLogin, RhostsRSAAuthentication, RSAAuthentication, | 345 | PermitEmptyPasswords, PermitOpen, PermitRootLogin, |
346 | X11DisplayOffset, X11Forwarding, and X11UseLocalHost. | 346 | RhostsRSAAuthentication, RSAAuthentication, X11DisplayOffset, |
347 | X11Forwarding and X11UseLocalHost. | ||
347 | 348 | ||
348 | MaxAuthTries | 349 | MaxAuthTries |
349 | Specifies the maximum number of authentication attempts permitted | 350 | Specifies the maximum number of authentication attempts permitted |
@@ -627,4 +628,4 @@ AUTHORS | |||
627 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support | 628 | versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support |
628 | for privilege separation. | 629 | for privilege separation. |
629 | 630 | ||
630 | OpenBSD 4.4 July 2, 2008 10 | 631 | OpenBSD 4.5 February 22, 2009 10 |