diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd_config.5 | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -6,6 +6,9 @@ | |||
6 | [ssh-rsa.c] | 6 | [ssh-rsa.c] |
7 | backout last change, since it violates pkcs#1 | 7 | backout last change, since it violates pkcs#1 |
8 | switch to share/misc/license.template | 8 | switch to share/misc/license.template |
9 | - djm@cvs.openbsd.org 2003/06/20 05:47:58 | ||
10 | [sshd_config.5] | ||
11 | sync description of protocol 2 cipher proposal; ok markus | ||
9 | - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. | 12 | - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. |
10 | - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before | 13 | - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before |
11 | testing its value. | 14 | testing its value. |
@@ -572,4 +575,4 @@ | |||
572 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 575 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
573 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 576 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
574 | 577 | ||
575 | $Id: ChangeLog,v 1.2819 2003/06/22 10:45:15 dtucker Exp $ | 578 | $Id: ChangeLog,v 1.2820 2003/06/22 10:46:53 dtucker Exp $ |
diff --git a/sshd_config.5 b/sshd_config.5 index 522911a39..dfd3565a6 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: sshd_config.5,v 1.19 2003/06/10 09:12:12 jmc Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.20 2003/06/20 05:47:58 djm Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -139,7 +139,7 @@ The default is | |||
139 | .Pp | 139 | .Pp |
140 | .Bd -literal | 140 | .Bd -literal |
141 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, | 141 | ``aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour, |
142 | aes192-cbc,aes256-cbc'' | 142 | aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr'' |
143 | .Ed | 143 | .Ed |
144 | .It Cm ClientAliveInterval | 144 | .It Cm ClientAliveInterval |
145 | Sets a timeout interval in seconds after which if no data has been received | 145 | Sets a timeout interval in seconds after which if no data has been received |